diff options
Diffstat (limited to 'grpc/src/core')
588 files changed, 34221 insertions, 15173 deletions
diff --git a/grpc/src/core/ext/filters/client_channel/backup_poller.cc b/grpc/src/core/ext/filters/client_channel/backup_poller.cc index 1b770895..ad7f8921 100644 --- a/grpc/src/core/ext/filters/client_channel/backup_poller.cc +++ b/grpc/src/core/ext/filters/client_channel/backup_poller.cc @@ -89,7 +89,7 @@ static void backup_poller_shutdown_unref(backup_poller* p) { } } -static void done_poller(void* arg, grpc_error* /*error*/) { +static void done_poller(void* arg, grpc_error_handle /*error*/) { backup_poller_shutdown_unref(static_cast<backup_poller*>(arg)); } @@ -112,7 +112,7 @@ static void g_poller_unref() { } } -static void run_poller(void* arg, grpc_error* error) { +static void run_poller(void* arg, grpc_error_handle error) { backup_poller* p = static_cast<backup_poller*>(arg); if (error != GRPC_ERROR_NONE) { if (error != GRPC_ERROR_CANCELLED) { @@ -127,7 +127,7 @@ static void run_poller(void* arg, grpc_error* error) { backup_poller_shutdown_unref(p); return; } - grpc_error* err = + grpc_error_handle err = grpc_pollset_work(p->pollset, nullptr, grpc_core::ExecCtx::Get()->Now()); gpr_mu_unlock(p->pollset_mu); GRPC_LOG_IF_ERROR("Run client channel backup poller", err); diff --git a/grpc/src/core/ext/filters/client_channel/channel_connectivity.cc b/grpc/src/core/ext/filters/client_channel/channel_connectivity.cc index 4ebb976e..e5ec5c5f 100644 --- a/grpc/src/core/ext/filters/client_channel/channel_connectivity.cc +++ b/grpc/src/core/ext/filters/client_channel/channel_connectivity.cc @@ -1,28 +1,23 @@ -/* - * - * Copyright 2015 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 2015 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/lib/surface/channel.h" -#include <inttypes.h> - -#include <grpc/support/alloc.h> #include <grpc/support/log.h> #include "src/core/ext/filters/client_channel/client_channel.h" @@ -32,195 +27,205 @@ grpc_connectivity_state grpc_channel_check_connectivity_state( grpc_channel* channel, int try_to_connect) { - /* forward through to the underlying client channel */ - grpc_channel_element* client_channel_elem = - grpc_channel_stack_last_element(grpc_channel_get_channel_stack(channel)); grpc_core::ApplicationCallbackExecCtx callback_exec_ctx; grpc_core::ExecCtx exec_ctx; - grpc_connectivity_state state; GRPC_API_TRACE( "grpc_channel_check_connectivity_state(channel=%p, try_to_connect=%d)", 2, (channel, try_to_connect)); - if (GPR_LIKELY(client_channel_elem->filter == &grpc_client_channel_filter)) { - state = grpc_client_channel_check_connectivity_state(client_channel_elem, - try_to_connect); - - return state; + // Forward through to the underlying client channel. + grpc_core::ClientChannel* client_channel = + grpc_core::ClientChannel::GetFromChannel(channel); + if (GPR_UNLIKELY(client_channel == nullptr)) { + gpr_log(GPR_ERROR, + "grpc_channel_check_connectivity_state called on something that is " + "not a client channel"); + return GRPC_CHANNEL_SHUTDOWN; } - gpr_log(GPR_ERROR, - "grpc_channel_check_connectivity_state called on something that is " - "not a client channel, but '%s'", - client_channel_elem->filter->name); + return client_channel->CheckConnectivityState(try_to_connect); +} - return GRPC_CHANNEL_SHUTDOWN; +int grpc_channel_num_external_connectivity_watchers(grpc_channel* channel) { + grpc_core::ClientChannel* client_channel = + grpc_core::ClientChannel::GetFromChannel(channel); + if (client_channel == nullptr) { + gpr_log(GPR_ERROR, + "grpc_channel_num_external_connectivity_watchers called on " + "something that is not a client channel"); + return 0; + } + return client_channel->NumExternalConnectivityWatchers(); } -typedef enum { - WAITING, - READY_TO_CALL_BACK, - CALLING_BACK_AND_FINISHED, -} callback_phase; +int grpc_channel_support_connectivity_watcher(grpc_channel* channel) { + return grpc_core::ClientChannel::GetFromChannel(channel) != nullptr; +} +namespace grpc_core { namespace { -struct state_watcher { - gpr_mu mu; - callback_phase phase; - grpc_closure on_complete; - grpc_closure on_timeout; - grpc_closure watcher_timer_init; - grpc_timer alarm; - grpc_connectivity_state state; - grpc_completion_queue* cq; - grpc_cq_completion completion_storage; - grpc_channel* channel; - grpc_error* error; - void* tag; -}; -} // namespace - -static void delete_state_watcher(state_watcher* w) { - grpc_channel_element* client_channel_elem = grpc_channel_stack_last_element( - grpc_channel_get_channel_stack(w->channel)); - if (client_channel_elem->filter == &grpc_client_channel_filter) { - GRPC_CHANNEL_INTERNAL_UNREF(w->channel, "watch_channel_connectivity"); - } else { - abort(); - } - gpr_mu_destroy(&w->mu); - gpr_free(w); -} -static void finished_completion(void* pw, grpc_cq_completion* /*ignored*/) { - bool should_delete = false; - state_watcher* w = static_cast<state_watcher*>(pw); - gpr_mu_lock(&w->mu); - switch (w->phase) { - case WAITING: - case READY_TO_CALL_BACK: - GPR_UNREACHABLE_CODE(return ); - case CALLING_BACK_AND_FINISHED: - should_delete = true; - break; +class StateWatcher { + public: + StateWatcher(grpc_channel* channel, grpc_completion_queue* cq, void* tag, + grpc_connectivity_state last_observed_state, + gpr_timespec deadline) + : channel_(channel), cq_(cq), tag_(tag), state_(last_observed_state) { + GPR_ASSERT(grpc_cq_begin_op(cq, tag)); + GRPC_CHANNEL_INTERNAL_REF(channel, "watch_channel_connectivity"); + GRPC_CLOSURE_INIT(&on_complete_, WatchComplete, this, nullptr); + GRPC_CLOSURE_INIT(&on_timeout_, TimeoutComplete, this, nullptr); + auto* watcher_timer_init_state = new WatcherTimerInitState( + this, grpc_timespec_to_millis_round_up(deadline)); + ClientChannel* client_channel = ClientChannel::GetFromChannel(channel); + GPR_ASSERT(client_channel != nullptr); + client_channel->AddExternalConnectivityWatcher( + grpc_polling_entity_create_from_pollset(grpc_cq_pollset(cq)), &state_, + &on_complete_, watcher_timer_init_state->closure()); } - gpr_mu_unlock(&w->mu); - if (should_delete) { - delete_state_watcher(w); + ~StateWatcher() { + GRPC_CHANNEL_INTERNAL_UNREF(channel_, "watch_channel_connectivity"); } -} - -static void partly_done(state_watcher* w, bool due_to_completion, - grpc_error* error) { - bool end_op = false; - void* end_op_tag = nullptr; - grpc_error* end_op_error = nullptr; - grpc_completion_queue* end_op_cq = nullptr; - grpc_cq_completion* end_op_completion_storage = nullptr; - if (due_to_completion) { - grpc_timer_cancel(&w->alarm); - } else { - grpc_channel_element* client_channel_elem = grpc_channel_stack_last_element( - grpc_channel_get_channel_stack(w->channel)); - grpc_client_channel_watch_connectivity_state( - client_channel_elem, - grpc_polling_entity_create_from_pollset(grpc_cq_pollset(w->cq)), - nullptr, &w->on_complete, nullptr); - } + private: + // A fire-and-forget object used to delay starting the timer until the + // ClientChannel actually starts the watch. + class WatcherTimerInitState { + public: + WatcherTimerInitState(StateWatcher* state_watcher, grpc_millis deadline) + : state_watcher_(state_watcher), deadline_(deadline) { + GRPC_CLOSURE_INIT(&closure_, WatcherTimerInit, this, nullptr); + } - gpr_mu_lock(&w->mu); + grpc_closure* closure() { return &closure_; } - if (due_to_completion) { - if (GRPC_TRACE_FLAG_ENABLED(grpc_trace_operation_failures)) { - GRPC_LOG_IF_ERROR("watch_completion_error", GRPC_ERROR_REF(error)); + private: + static void WatcherTimerInit(void* arg, grpc_error_handle /*error*/) { + auto* self = static_cast<WatcherTimerInitState*>(arg); + grpc_timer_init(&self->state_watcher_->timer_, self->deadline_, + &self->state_watcher_->on_timeout_); + delete self; } - GRPC_ERROR_UNREF(error); - error = GRPC_ERROR_NONE; - } else { - if (error == GRPC_ERROR_NONE) { - error = GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "Timed out waiting for connection state change"); - } else if (error == GRPC_ERROR_CANCELLED) { - error = GRPC_ERROR_NONE; + + StateWatcher* state_watcher_; + grpc_millis deadline_; + grpc_closure closure_; + }; + + enum CallbackPhase { kWaiting, kReadyToCallBack, kCallingBackAndFinished }; + + // Called when the completion is returned to the CQ. + static void FinishedCompletion(void* arg, grpc_cq_completion* /*ignored*/) { + auto* self = static_cast<StateWatcher*>(arg); + bool should_delete = false; + { + MutexLock lock(&self->mu_); + switch (self->phase_) { + case kWaiting: + case kReadyToCallBack: + GPR_UNREACHABLE_CODE(return ); + case kCallingBackAndFinished: + should_delete = true; + } } + if (should_delete) delete self; } - switch (w->phase) { - case WAITING: - GRPC_ERROR_REF(error); - w->error = error; - w->phase = READY_TO_CALL_BACK; - break; - case READY_TO_CALL_BACK: - if (error != GRPC_ERROR_NONE) { - GPR_ASSERT(!due_to_completion); - GRPC_ERROR_UNREF(w->error); - GRPC_ERROR_REF(error); - w->error = error; + + void PartlyDone(bool due_to_completion, grpc_error_handle error) { + bool end_op = false; + void* end_op_tag = nullptr; + grpc_error_handle end_op_error = GRPC_ERROR_NONE; + grpc_completion_queue* end_op_cq = nullptr; + grpc_cq_completion* end_op_completion_storage = nullptr; + if (due_to_completion) { + grpc_timer_cancel(&timer_); + } else { + grpc_core::ClientChannel* client_channel = + grpc_core::ClientChannel::GetFromChannel(channel_); + GPR_ASSERT(client_channel != nullptr); + client_channel->CancelExternalConnectivityWatcher(&on_complete_); + } + { + MutexLock lock(&mu_); + if (due_to_completion) { + if (GRPC_TRACE_FLAG_ENABLED(grpc_trace_operation_failures)) { + GRPC_LOG_IF_ERROR("watch_completion_error", GRPC_ERROR_REF(error)); + } + GRPC_ERROR_UNREF(error); + error = GRPC_ERROR_NONE; + } else { + if (error == GRPC_ERROR_NONE) { + error = GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "Timed out waiting for connection state change"); + } else if (error == GRPC_ERROR_CANCELLED) { + error = GRPC_ERROR_NONE; + } + } + switch (phase_) { + case kWaiting: + GRPC_ERROR_REF(error); + error_ = error; + phase_ = kReadyToCallBack; + break; + case kReadyToCallBack: + if (error != GRPC_ERROR_NONE) { + GPR_ASSERT(!due_to_completion); + GRPC_ERROR_UNREF(error_); + GRPC_ERROR_REF(error); + error_ = error; + } + phase_ = kCallingBackAndFinished; + end_op = true; + end_op_cq = cq_; + end_op_tag = tag_; + end_op_error = error_; + end_op_completion_storage = &completion_storage_; + break; + case kCallingBackAndFinished: + GPR_UNREACHABLE_CODE(return ); } - w->phase = CALLING_BACK_AND_FINISHED; - end_op = true; - end_op_cq = w->cq; - end_op_tag = w->tag; - end_op_error = w->error; - end_op_completion_storage = &w->completion_storage; - break; - case CALLING_BACK_AND_FINISHED: - GPR_UNREACHABLE_CODE(return ); - break; + } + if (end_op) { + grpc_cq_end_op(end_op_cq, end_op_tag, end_op_error, FinishedCompletion, + this, end_op_completion_storage); + } + GRPC_ERROR_UNREF(error); } - gpr_mu_unlock(&w->mu); - if (end_op) { - grpc_cq_end_op(end_op_cq, end_op_tag, end_op_error, finished_completion, w, - end_op_completion_storage); + static void WatchComplete(void* arg, grpc_error_handle error) { + auto* self = static_cast<StateWatcher*>(arg); + self->PartlyDone(/*due_to_completion=*/true, GRPC_ERROR_REF(error)); } - GRPC_ERROR_UNREF(error); -} - -static void watch_complete(void* pw, grpc_error* error) { - partly_done(static_cast<state_watcher*>(pw), true, GRPC_ERROR_REF(error)); -} + static void TimeoutComplete(void* arg, grpc_error_handle error) { + auto* self = static_cast<StateWatcher*>(arg); + self->PartlyDone(/*due_to_completion=*/false, GRPC_ERROR_REF(error)); + } -static void timeout_complete(void* pw, grpc_error* error) { - partly_done(static_cast<state_watcher*>(pw), false, GRPC_ERROR_REF(error)); -} + grpc_channel* channel_; + grpc_completion_queue* cq_; + void* tag_; -int grpc_channel_num_external_connectivity_watchers(grpc_channel* channel) { - grpc_channel_element* client_channel_elem = - grpc_channel_stack_last_element(grpc_channel_get_channel_stack(channel)); - return grpc_client_channel_num_external_connectivity_watchers( - client_channel_elem); -} + grpc_connectivity_state state_; -typedef struct watcher_timer_init_arg { - state_watcher* w; - gpr_timespec deadline; -} watcher_timer_init_arg; + grpc_cq_completion completion_storage_; -static void watcher_timer_init(void* arg, grpc_error* /*error_ignored*/) { - watcher_timer_init_arg* wa = static_cast<watcher_timer_init_arg*>(arg); + grpc_closure on_complete_; + grpc_timer timer_; + grpc_closure on_timeout_; - grpc_timer_init(&wa->w->alarm, grpc_timespec_to_millis_round_up(wa->deadline), - &wa->w->on_timeout); - gpr_free(wa); -} + Mutex mu_; + CallbackPhase phase_ ABSL_GUARDED_BY(mu_) = kWaiting; + grpc_error_handle error_ ABSL_GUARDED_BY(mu_) = GRPC_ERROR_NONE; +}; -int grpc_channel_support_connectivity_watcher(grpc_channel* channel) { - grpc_channel_element* client_channel_elem = - grpc_channel_stack_last_element(grpc_channel_get_channel_stack(channel)); - return client_channel_elem->filter != &grpc_client_channel_filter ? 0 : 1; -} +} // namespace +} // namespace grpc_core void grpc_channel_watch_connectivity_state( grpc_channel* channel, grpc_connectivity_state last_observed_state, gpr_timespec deadline, grpc_completion_queue* cq, void* tag) { - grpc_channel_element* client_channel_elem = - grpc_channel_stack_last_element(grpc_channel_get_channel_stack(channel)); grpc_core::ApplicationCallbackExecCtx callback_exec_ctx; grpc_core::ExecCtx exec_ctx; - state_watcher* w = static_cast<state_watcher*>(gpr_malloc(sizeof(*w))); - GRPC_API_TRACE( "grpc_channel_watch_connectivity_state(" "channel=%p, last_observed_state=%d, " @@ -230,35 +235,5 @@ void grpc_channel_watch_connectivity_state( 7, (channel, (int)last_observed_state, deadline.tv_sec, deadline.tv_nsec, (int)deadline.clock_type, cq, tag)); - - GPR_ASSERT(grpc_cq_begin_op(cq, tag)); - - gpr_mu_init(&w->mu); - GRPC_CLOSURE_INIT(&w->on_complete, watch_complete, w, - grpc_schedule_on_exec_ctx); - GRPC_CLOSURE_INIT(&w->on_timeout, timeout_complete, w, - grpc_schedule_on_exec_ctx); - w->phase = WAITING; - w->state = last_observed_state; - w->cq = cq; - w->tag = tag; - w->channel = channel; - w->error = nullptr; - - watcher_timer_init_arg* wa = static_cast<watcher_timer_init_arg*>( - gpr_malloc(sizeof(watcher_timer_init_arg))); - wa->w = w; - wa->deadline = deadline; - GRPC_CLOSURE_INIT(&w->watcher_timer_init, watcher_timer_init, wa, - grpc_schedule_on_exec_ctx); - - if (client_channel_elem->filter == &grpc_client_channel_filter) { - GRPC_CHANNEL_INTERNAL_REF(channel, "watch_channel_connectivity"); - grpc_client_channel_watch_connectivity_state( - client_channel_elem, - grpc_polling_entity_create_from_pollset(grpc_cq_pollset(cq)), &w->state, - &w->on_complete, &w->watcher_timer_init); - } else { - abort(); - } + new grpc_core::StateWatcher(channel, cq, tag, last_observed_state, deadline); } diff --git a/grpc/src/core/ext/filters/client_channel/client_channel.cc b/grpc/src/core/ext/filters/client_channel/client_channel.cc index 048cd204..3bbec5ea 100644 --- a/grpc/src/core/ext/filters/client_channel/client_channel.cc +++ b/grpc/src/core/ext/filters/client_channel/client_channel.cc @@ -51,7 +51,7 @@ #include "src/core/ext/filters/client_channel/proxy_mapper_registry.h" #include "src/core/ext/filters/client_channel/resolver_registry.h" #include "src/core/ext/filters/client_channel/resolver_result_parsing.h" -#include "src/core/ext/filters/client_channel/retry_throttle.h" +#include "src/core/ext/filters/client_channel/retry_filter.h" #include "src/core/ext/filters/client_channel/service_config.h" #include "src/core/ext/filters/client_channel/service_config_call_data.h" #include "src/core/ext/filters/client_channel/subchannel.h" @@ -61,7 +61,6 @@ #include "src/core/lib/channel/connected_channel.h" #include "src/core/lib/channel/status_util.h" #include "src/core/lib/gpr/string.h" -#include "src/core/lib/gprpp/manual_constructor.h" #include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/iomgr/polling_entity.h" @@ -81,335 +80,23 @@ // Client channel filter // -// By default, we buffer 256 KiB per RPC for retries. -// TODO(roth): Do we have any data to suggest a better value? -#define DEFAULT_PER_RPC_RETRY_BUFFER_SIZE (256 << 10) - -// This value was picked arbitrarily. It can be changed if there is -// any even moderately compelling reason to do so. -#define RETRY_BACKOFF_JITTER 0.2 - -// Max number of batches that can be pending on a call at any given -// time. This includes one batch for each of the following ops: -// recv_initial_metadata -// send_initial_metadata -// recv_message -// send_message -// recv_trailing_metadata -// send_trailing_metadata -#define MAX_PENDING_BATCHES 6 - -// Channel arg containing a pointer to the ChannelData object. -#define GRPC_ARG_CLIENT_CHANNEL_DATA "grpc.internal.client_channel_data" - -// Channel arg containing a pointer to the RetryThrottleData object. -#define GRPC_ARG_RETRY_THROTTLE_DATA "grpc.internal.retry_throttle_data" - namespace grpc_core { using internal::ClientChannelGlobalParsedConfig; using internal::ClientChannelMethodParsedConfig; using internal::ClientChannelServiceConfigParser; -using internal::ServerRetryThrottleData; TraceFlag grpc_client_channel_call_trace(false, "client_channel_call"); TraceFlag grpc_client_channel_routing_trace(false, "client_channel_routing"); -namespace { - -// -// ChannelData definition -// - -class LoadBalancedCall; - -class ChannelData { - public: - struct ResolverQueuedCall { - grpc_call_element* elem; - ResolverQueuedCall* next = nullptr; - }; - struct LbQueuedCall { - LoadBalancedCall* lb_call; - LbQueuedCall* next = nullptr; - }; - - static grpc_error* Init(grpc_channel_element* elem, - grpc_channel_element_args* args); - static void Destroy(grpc_channel_element* elem); - static void StartTransportOp(grpc_channel_element* elem, - grpc_transport_op* op); - static void GetChannelInfo(grpc_channel_element* elem, - const grpc_channel_info* info); - - bool deadline_checking_enabled() const { return deadline_checking_enabled_; } - bool enable_retries() const { return enable_retries_; } - size_t per_rpc_retry_buffer_size() const { - return per_rpc_retry_buffer_size_; - } - grpc_channel_stack* owning_stack() const { return owning_stack_; } - - // Note: Does NOT return a new ref. - grpc_error* disconnect_error() const { - return disconnect_error_.Load(MemoryOrder::ACQUIRE); - } - - Mutex* resolution_mu() const { return &resolution_mu_; } - // These methods all require holding resolution_mu_. - void AddResolverQueuedCall(ResolverQueuedCall* call, - grpc_polling_entity* pollent); - void RemoveResolverQueuedCall(ResolverQueuedCall* to_remove, - grpc_polling_entity* pollent); - bool received_service_config_data() const { - return received_service_config_data_; - } - grpc_error* resolver_transient_failure_error() const { - return resolver_transient_failure_error_; - } - RefCountedPtr<ServiceConfig> service_config() const { - return service_config_; - } - ConfigSelector* config_selector() const { return config_selector_.get(); } - RefCountedPtr<DynamicFilters> dynamic_filters() const { - return dynamic_filters_; - } - - Mutex* data_plane_mu() const { return &data_plane_mu_; } - // These methods all require holding data_plane_mu_. - LoadBalancingPolicy::SubchannelPicker* picker() const { - return picker_.get(); - } - void AddLbQueuedCall(LbQueuedCall* call, grpc_polling_entity* pollent); - void RemoveLbQueuedCall(LbQueuedCall* to_remove, - grpc_polling_entity* pollent); - RefCountedPtr<ConnectedSubchannel> GetConnectedSubchannelInDataPlane( - SubchannelInterface* subchannel) const; - - WorkSerializer* work_serializer() const { return work_serializer_.get(); } - - grpc_connectivity_state CheckConnectivityState(bool try_to_connect); - - void AddExternalConnectivityWatcher(grpc_polling_entity pollent, - grpc_connectivity_state* state, - grpc_closure* on_complete, - grpc_closure* watcher_timer_init) { - new ExternalConnectivityWatcher(this, pollent, state, on_complete, - watcher_timer_init); - } - - void RemoveExternalConnectivityWatcher(grpc_closure* on_complete, - bool cancel) { - ExternalConnectivityWatcher::RemoveWatcherFromExternalWatchersMap( - this, on_complete, cancel); - } - - int NumExternalConnectivityWatchers() const { - MutexLock lock(&external_watchers_mu_); - return static_cast<int>(external_watchers_.size()); - } - - void AddConnectivityWatcher( - grpc_connectivity_state initial_state, - OrphanablePtr<AsyncConnectivityStateWatcherInterface> watcher); - void RemoveConnectivityWatcher( - AsyncConnectivityStateWatcherInterface* watcher); - - private: - class SubchannelWrapper; - class ClientChannelControlHelper; - class ConnectivityWatcherAdder; - class ConnectivityWatcherRemover; - - // Represents a pending connectivity callback from an external caller - // via grpc_client_channel_watch_connectivity_state(). - class ExternalConnectivityWatcher : public ConnectivityStateWatcherInterface { - public: - ExternalConnectivityWatcher(ChannelData* chand, grpc_polling_entity pollent, - grpc_connectivity_state* state, - grpc_closure* on_complete, - grpc_closure* watcher_timer_init); - - ~ExternalConnectivityWatcher() override; - - // Removes the watcher from the external_watchers_ map. - static void RemoveWatcherFromExternalWatchersMap(ChannelData* chand, - grpc_closure* on_complete, - bool cancel); - - void Notify(grpc_connectivity_state state, - const absl::Status& /* status */) override; - - void Cancel(); - - private: - // Adds the watcher to state_tracker_. Consumes the ref that is passed to it - // from Start(). - void AddWatcherLocked(); - void RemoveWatcherLocked(); - - ChannelData* chand_; - grpc_polling_entity pollent_; - grpc_connectivity_state initial_state_; - grpc_connectivity_state* state_; - grpc_closure* on_complete_; - grpc_closure* watcher_timer_init_; - Atomic<bool> done_{false}; - }; - - class ResolverResultHandler : public Resolver::ResultHandler { - public: - explicit ResolverResultHandler(ChannelData* chand) : chand_(chand) { - GRPC_CHANNEL_STACK_REF(chand_->owning_stack_, "ResolverResultHandler"); - } - - ~ResolverResultHandler() override { - if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_routing_trace)) { - gpr_log(GPR_INFO, "chand=%p: resolver shutdown complete", chand_); - } - GRPC_CHANNEL_STACK_UNREF(chand_->owning_stack_, "ResolverResultHandler"); - } - - void ReturnResult(Resolver::Result result) override { - chand_->OnResolverResultChangedLocked(std::move(result)); - } - - void ReturnError(grpc_error* error) override { - chand_->OnResolverErrorLocked(error); - } - - private: - ChannelData* chand_; - }; - - ChannelData(grpc_channel_element_args* args, grpc_error** error); - ~ChannelData(); - - // Note: All methods with "Locked" suffix must be invoked from within - // work_serializer_. - - void OnResolverResultChangedLocked(Resolver::Result result); - void OnResolverErrorLocked(grpc_error* error); - - void CreateOrUpdateLbPolicyLocked( - RefCountedPtr<LoadBalancingPolicy::Config> lb_policy_config, - Resolver::Result result); - OrphanablePtr<LoadBalancingPolicy> CreateLbPolicyLocked( - const grpc_channel_args& args); - - void UpdateStateAndPickerLocked( - grpc_connectivity_state state, const absl::Status& status, - const char* reason, - std::unique_ptr<LoadBalancingPolicy::SubchannelPicker> picker); - - void UpdateServiceConfigInControlPlaneLocked( - RefCountedPtr<ServiceConfig> service_config, - RefCountedPtr<ConfigSelector> config_selector, - const internal::ClientChannelGlobalParsedConfig* parsed_service_config, - const char* lb_policy_name); - - void UpdateServiceConfigInDataPlaneLocked(); - - void CreateResolverLocked(); - void DestroyResolverAndLbPolicyLocked(); - - grpc_error* DoPingLocked(grpc_transport_op* op); - - void StartTransportOpLocked(grpc_transport_op* op); - - void TryToConnectLocked(); - - // - // Fields set at construction and never modified. - // - const bool deadline_checking_enabled_; - const bool enable_retries_; - const size_t per_rpc_retry_buffer_size_; - grpc_channel_stack* owning_stack_; - ClientChannelFactory* client_channel_factory_; - const grpc_channel_args* channel_args_; - RefCountedPtr<ServiceConfig> default_service_config_; - std::string server_name_; - UniquePtr<char> target_uri_; - channelz::ChannelNode* channelz_node_; - - // - // Fields related to name resolution. Guarded by resolution_mu_. - // - mutable Mutex resolution_mu_; - // Linked list of calls queued waiting for resolver result. - ResolverQueuedCall* resolver_queued_calls_ = nullptr; - // Data from service config. - grpc_error* resolver_transient_failure_error_ = GRPC_ERROR_NONE; - bool received_service_config_data_ = false; - RefCountedPtr<ServiceConfig> service_config_; - RefCountedPtr<ConfigSelector> config_selector_; - RefCountedPtr<DynamicFilters> dynamic_filters_; - - // - // Fields used in the data plane. Guarded by data_plane_mu_. - // - mutable Mutex data_plane_mu_; - std::unique_ptr<LoadBalancingPolicy::SubchannelPicker> picker_; - // Linked list of calls queued waiting for LB pick. - LbQueuedCall* lb_queued_calls_ = nullptr; - - // - // Fields used in the control plane. Guarded by work_serializer. - // - std::shared_ptr<WorkSerializer> work_serializer_; - grpc_pollset_set* interested_parties_; - ConnectivityStateTracker state_tracker_; - OrphanablePtr<Resolver> resolver_; - bool previous_resolution_contained_addresses_ = false; - RefCountedPtr<ServiceConfig> saved_service_config_; - RefCountedPtr<ConfigSelector> saved_config_selector_; - absl::optional<std::string> health_check_service_name_; - OrphanablePtr<LoadBalancingPolicy> lb_policy_; - RefCountedPtr<SubchannelPoolInterface> subchannel_pool_; - // The number of SubchannelWrapper instances referencing a given Subchannel. - std::map<Subchannel*, int> subchannel_refcount_map_; - // The set of SubchannelWrappers that currently exist. - // No need to hold a ref, since the map is updated in the control-plane - // work_serializer when the SubchannelWrappers are created and destroyed. - std::set<SubchannelWrapper*> subchannel_wrappers_; - // Pending ConnectedSubchannel updates for each SubchannelWrapper. - // Updates are queued here in the control plane work_serializer and then - // applied in the data plane mutex when the picker is updated. - std::map<RefCountedPtr<SubchannelWrapper>, RefCountedPtr<ConnectedSubchannel>> - pending_subchannel_updates_; - int keepalive_time_ = -1; - - // - // Fields accessed from both data plane mutex and control plane - // work_serializer. - // - Atomic<grpc_error*> disconnect_error_; - - // - // Fields guarded by a mutex, since they need to be accessed - // synchronously via get_channel_info(). - // - gpr_mu info_mu_; - UniquePtr<char> info_lb_policy_name_; - UniquePtr<char> info_service_config_json_; - - // - // Fields guarded by a mutex, since they need to be accessed - // synchronously via grpc_channel_num_external_connectivity_watchers(). - // - mutable Mutex external_watchers_mu_; - std::map<grpc_closure*, RefCountedPtr<ExternalConnectivityWatcher>> - external_watchers_; -}; - // -// CallData definition +// ClientChannel::CallData definition // -class CallData { +class ClientChannel::CallData { public: - static grpc_error* Init(grpc_call_element* elem, - const grpc_call_element_args* args); + static grpc_error_handle Init(grpc_call_element* elem, + const grpc_call_element_args* args); static void Destroy(grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* then_schedule_closure); @@ -418,22 +105,23 @@ class CallData { static void SetPollent(grpc_call_element* elem, grpc_polling_entity* pollent); // Invoked by channel for queued calls when name resolution is completed. - static void CheckResolution(void* arg, grpc_error* error); + static void CheckResolution(void* arg, grpc_error_handle error); // Helper function for applying the service config to a call while - // holding ChannelData::resolution_mu_. + // holding ClientChannel::resolution_mu_. // Returns true if the service config has been applied to the call, in which // case the caller must invoke ResolutionDone() or AsyncResolutionDone() // with the returned error. - bool CheckResolutionLocked(grpc_call_element* elem, grpc_error** error); + bool CheckResolutionLocked(grpc_call_element* elem, grpc_error_handle* error) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(&ClientChannel::resolution_mu_); // Schedules a callback to continue processing the call once // resolution is complete. The callback will not run until after this // method returns. - void AsyncResolutionDone(grpc_call_element* elem, grpc_error* error); + void AsyncResolutionDone(grpc_call_element* elem, grpc_error_handle error); private: class ResolverQueuedCallCanceller; - CallData(grpc_call_element* elem, const ChannelData& chand, + CallData(grpc_call_element* elem, const ClientChannel& chand, const grpc_call_element_args& args); ~CallData(); @@ -441,7 +129,8 @@ class CallData { static size_t GetBatchIndex(grpc_transport_stream_op_batch* batch); void PendingBatchesAdd(grpc_call_element* elem, grpc_transport_stream_op_batch* batch); - static void FailPendingBatchInCallCombiner(void* arg, grpc_error* error); + static void FailPendingBatchInCallCombiner(void* arg, + grpc_error_handle error); // A predicate type and some useful implementations for PendingBatchesFail(). typedef bool (*YieldCallCombinerPredicate)( const CallCombinerClosureList& closures); @@ -459,9 +148,10 @@ class CallData { // If yield_call_combiner_predicate returns true, assumes responsibility for // yielding the call combiner. void PendingBatchesFail( - grpc_call_element* elem, grpc_error* error, + grpc_call_element* elem, grpc_error_handle error, YieldCallCombinerPredicate yield_call_combiner_predicate); - static void ResumePendingBatchInCallCombiner(void* arg, grpc_error* ignored); + static void ResumePendingBatchInCallCombiner(void* arg, + grpc_error_handle ignored); // Resumes all pending batches on lb_call_. void PendingBatchesResume(grpc_call_element* elem); @@ -469,20 +159,23 @@ class CallData { // that the resolver has returned results to the channel. // If an error is returned, the error indicates the status with which // the call should be failed. - grpc_error* ApplyServiceConfigToCallLocked( - grpc_call_element* elem, grpc_metadata_batch* initial_metadata); + grpc_error_handle ApplyServiceConfigToCallLocked( + grpc_call_element* elem, grpc_metadata_batch* initial_metadata) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(&ClientChannel::resolution_mu_); // Invoked when the resolver result is applied to the caller, on both // success or failure. - static void ResolutionDone(void* arg, grpc_error* error); + static void ResolutionDone(void* arg, grpc_error_handle error); // Removes the call (if present) from the channel's list of calls queued // for name resolution. - void MaybeRemoveCallFromResolverQueuedCallsLocked(grpc_call_element* elem); + void MaybeRemoveCallFromResolverQueuedCallsLocked(grpc_call_element* elem) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(&ClientChannel::resolution_mu_); // Adds the call (if not already present) to the channel's list of // calls queued for name resolution. - void MaybeAddCallToResolverQueuedCallsLocked(grpc_call_element* elem); + void MaybeAddCallToResolverQueuedCallsLocked(grpc_call_element* elem) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(&ClientChannel::resolution_mu_); static void RecvInitialMetadataReadyForConfigSelectorCommitCallback( - void* arg, grpc_error* error); + void* arg, grpc_error_handle error); void InjectRecvInitialMetadataReadyForConfigSelectorCommitCallback( grpc_transport_stream_op_batch* batch); @@ -508,11 +201,15 @@ class CallData { grpc_closure pick_closure_; - // Accessed while holding ChannelData::resolution_mu_. - bool service_config_applied_ = false; - bool queued_pending_resolver_result_ = false; - ChannelData::ResolverQueuedCall resolver_queued_call_; - ResolverQueuedCallCanceller* resolver_call_canceller_ = nullptr; + // Accessed while holding ClientChannel::resolution_mu_. + bool service_config_applied_ ABSL_GUARDED_BY(&ClientChannel::resolution_mu_) = + false; + bool queued_pending_resolver_result_ + ABSL_GUARDED_BY(&ClientChannel::resolution_mu_) = false; + ClientChannel::ResolverQueuedCall resolver_queued_call_ + ABSL_GUARDED_BY(&ClientChannel::resolution_mu_); + ResolverQueuedCallCanceller* resolver_call_canceller_ + ABSL_GUARDED_BY(&ClientChannel::resolution_mu_) = nullptr; std::function<void()> on_call_committed_; @@ -530,611 +227,105 @@ class CallData { grpc_transport_stream_op_batch* pending_batches_[MAX_PENDING_BATCHES] = {}; // Set when we get a cancel_stream op. - grpc_error* cancel_error_ = GRPC_ERROR_NONE; + grpc_error_handle cancel_error_ = GRPC_ERROR_NONE; }; // -// RetryingCall definition +// Filter vtable // -class RetryingCall { - public: - RetryingCall( - ChannelData* chand, const grpc_call_element_args& args, - grpc_polling_entity* pollent, - RefCountedPtr<ServerRetryThrottleData> retry_throttle_data, - const ClientChannelMethodParsedConfig::RetryPolicy* retry_policy); - ~RetryingCall(); - - void StartTransportStreamOpBatch(grpc_transport_stream_op_batch* batch); - - RefCountedPtr<SubchannelCall> subchannel_call() const; - - private: - // State used for starting a retryable batch on a subchannel call. - // This provides its own grpc_transport_stream_op_batch and other data - // structures needed to populate the ops in the batch. - // We allocate one struct on the arena for each attempt at starting a - // batch on a given subchannel call. - struct SubchannelCallBatchData { - // Creates a SubchannelCallBatchData object on the call's arena with the - // specified refcount. If set_on_complete is true, the batch's - // on_complete callback will be set to point to on_complete(); - // otherwise, the batch's on_complete callback will be null. - static SubchannelCallBatchData* Create(RetryingCall* call, int refcount, - bool set_on_complete); - - void Unref() { - if (gpr_unref(&refs)) Destroy(); - } - - SubchannelCallBatchData(RetryingCall* call, int refcount, - bool set_on_complete); - // All dtor code must be added in `Destroy()`. This is because we may - // call closures in `SubchannelCallBatchData` after they are unrefed by - // `Unref()`, and msan would complain about accessing this class - // after calling dtor. As a result we cannot call the `dtor` in `Unref()`. - // TODO(soheil): We should try to call the dtor in `Unref()`. - ~SubchannelCallBatchData() { Destroy(); } - void Destroy(); - - gpr_refcount refs; - grpc_call_element* elem; - RetryingCall* call; - RefCountedPtr<LoadBalancedCall> lb_call; - // The batch to use in the subchannel call. - // Its payload field points to SubchannelCallRetryState::batch_payload. - grpc_transport_stream_op_batch batch; - // For intercepting on_complete. - grpc_closure on_complete; - }; - - // Retry state associated with a subchannel call. - // Stored in the parent_data of the subchannel call object. - struct SubchannelCallRetryState { - explicit SubchannelCallRetryState(grpc_call_context_element* context) - : batch_payload(context), - started_send_initial_metadata(false), - completed_send_initial_metadata(false), - started_send_trailing_metadata(false), - completed_send_trailing_metadata(false), - started_recv_initial_metadata(false), - completed_recv_initial_metadata(false), - started_recv_trailing_metadata(false), - completed_recv_trailing_metadata(false), - retry_dispatched(false) {} - - // SubchannelCallBatchData.batch.payload points to this. - grpc_transport_stream_op_batch_payload batch_payload; - // For send_initial_metadata. - // Note that we need to make a copy of the initial metadata for each - // subchannel call instead of just referring to the copy in call_data, - // because filters in the subchannel stack will probably add entries, - // so we need to start in a pristine state for each attempt of the call. - grpc_linked_mdelem* send_initial_metadata_storage; - grpc_metadata_batch send_initial_metadata; - // For send_message. - // TODO(roth): Restructure this to eliminate use of ManualConstructor. - ManualConstructor<ByteStreamCache::CachingByteStream> send_message; - // For send_trailing_metadata. - grpc_linked_mdelem* send_trailing_metadata_storage; - grpc_metadata_batch send_trailing_metadata; - // For intercepting recv_initial_metadata. - grpc_metadata_batch recv_initial_metadata; - grpc_closure recv_initial_metadata_ready; - bool trailing_metadata_available = false; - // For intercepting recv_message. - grpc_closure recv_message_ready; - OrphanablePtr<ByteStream> recv_message; - // For intercepting recv_trailing_metadata. - grpc_metadata_batch recv_trailing_metadata; - grpc_transport_stream_stats collect_stats; - grpc_closure recv_trailing_metadata_ready; - // These fields indicate which ops have been started and completed on - // this subchannel call. - size_t started_send_message_count = 0; - size_t completed_send_message_count = 0; - size_t started_recv_message_count = 0; - size_t completed_recv_message_count = 0; - bool started_send_initial_metadata : 1; - bool completed_send_initial_metadata : 1; - bool started_send_trailing_metadata : 1; - bool completed_send_trailing_metadata : 1; - bool started_recv_initial_metadata : 1; - bool completed_recv_initial_metadata : 1; - bool started_recv_trailing_metadata : 1; - bool completed_recv_trailing_metadata : 1; - // State for callback processing. - SubchannelCallBatchData* recv_initial_metadata_ready_deferred_batch = - nullptr; - grpc_error* recv_initial_metadata_error = GRPC_ERROR_NONE; - SubchannelCallBatchData* recv_message_ready_deferred_batch = nullptr; - grpc_error* recv_message_error = GRPC_ERROR_NONE; - SubchannelCallBatchData* recv_trailing_metadata_internal_batch = nullptr; - // NOTE: Do not move this next to the metadata bitfields above. That would - // save space but will also result in a data race because compiler - // will generate a 2 byte store which overwrites the meta-data - // fields upon setting this field. - bool retry_dispatched : 1; - }; - - // Pending batches stored in call data. - struct PendingBatch { - // The pending batch. If nullptr, this slot is empty. - grpc_transport_stream_op_batch* batch = nullptr; - // Indicates whether payload for send ops has been cached in CallData. - bool send_ops_cached = false; - }; - - // Caches data for send ops so that it can be retried later, if not - // already cached. - void MaybeCacheSendOpsForBatch(PendingBatch* pending); - void FreeCachedSendInitialMetadata(); - // Frees cached send_message at index idx. - void FreeCachedSendMessage(size_t idx); - void FreeCachedSendTrailingMetadata(); - // Frees cached send ops that have already been completed after - // committing the call. - void FreeCachedSendOpDataAfterCommit(SubchannelCallRetryState* retry_state); - // Frees cached send ops that were completed by the completed batch in - // batch_data. Used when batches are completed after the call is committed. - void FreeCachedSendOpDataForCompletedBatch( - SubchannelCallBatchData* batch_data, - SubchannelCallRetryState* retry_state); - - // Returns the index into pending_batches_ to be used for batch. - static size_t GetBatchIndex(grpc_transport_stream_op_batch* batch); - void PendingBatchesAdd(grpc_transport_stream_op_batch* batch); - void PendingBatchClear(PendingBatch* pending); - void MaybeClearPendingBatch(PendingBatch* pending); - static void FailPendingBatchInCallCombiner(void* arg, grpc_error* error); - // A predicate type and some useful implementations for PendingBatchesFail(). - typedef bool (*YieldCallCombinerPredicate)( - const CallCombinerClosureList& closures); - static bool YieldCallCombiner(const CallCombinerClosureList& /*closures*/) { - return true; - } - static bool NoYieldCallCombiner(const CallCombinerClosureList& /*closures*/) { - return false; - } - static bool YieldCallCombinerIfPendingBatchesFound( - const CallCombinerClosureList& closures) { - return closures.size() > 0; - } - // Fails all pending batches. - // If yield_call_combiner_predicate returns true, assumes responsibility for - // yielding the call combiner. - void PendingBatchesFail( - grpc_error* error, - YieldCallCombinerPredicate yield_call_combiner_predicate); - static void ResumePendingBatchInCallCombiner(void* arg, grpc_error* ignored); - // Resumes all pending batches on lb_call_. - void PendingBatchesResume(); - // Returns a pointer to the first pending batch for which predicate(batch) - // returns true, or null if not found. - template <typename Predicate> - PendingBatch* PendingBatchFind(const char* log_message, Predicate predicate); - - // Commits the call so that no further retry attempts will be performed. - void RetryCommit(SubchannelCallRetryState* retry_state); - // Starts a retry after appropriate back-off. - void DoRetry(SubchannelCallRetryState* retry_state, - grpc_millis server_pushback_ms); - // Returns true if the call is being retried. - bool MaybeRetry(SubchannelCallBatchData* batch_data, grpc_status_code status, - grpc_mdelem* server_pushback_md); - - // Invokes recv_initial_metadata_ready for a subchannel batch. - static void InvokeRecvInitialMetadataCallback(void* arg, grpc_error* error); - // Intercepts recv_initial_metadata_ready callback for retries. - // Commits the call and returns the initial metadata up the stack. - static void RecvInitialMetadataReady(void* arg, grpc_error* error); - - // Invokes recv_message_ready for a subchannel batch. - static void InvokeRecvMessageCallback(void* arg, grpc_error* error); - // Intercepts recv_message_ready callback for retries. - // Commits the call and returns the message up the stack. - static void RecvMessageReady(void* arg, grpc_error* error); - - // Sets *status and *server_pushback_md based on md_batch and error. - // Only sets *server_pushback_md if server_pushback_md != nullptr. - void GetCallStatus(grpc_metadata_batch* md_batch, grpc_error* error, - grpc_status_code* status, - grpc_mdelem** server_pushback_md); - // Adds recv_trailing_metadata_ready closure to closures. - void AddClosureForRecvTrailingMetadataReady( - SubchannelCallBatchData* batch_data, grpc_error* error, - CallCombinerClosureList* closures); - // Adds any necessary closures for deferred recv_initial_metadata and - // recv_message callbacks to closures. - static void AddClosuresForDeferredRecvCallbacks( - SubchannelCallBatchData* batch_data, - SubchannelCallRetryState* retry_state, CallCombinerClosureList* closures); - // Returns true if any op in the batch was not yet started. - // Only looks at send ops, since recv ops are always started immediately. - bool PendingBatchIsUnstarted(PendingBatch* pending, - SubchannelCallRetryState* retry_state); - // For any pending batch containing an op that has not yet been started, - // adds the pending batch's completion closures to closures. - void AddClosuresToFailUnstartedPendingBatches( - SubchannelCallRetryState* retry_state, grpc_error* error, - CallCombinerClosureList* closures); - // Runs necessary closures upon completion of a call attempt. - void RunClosuresForCompletedCall(SubchannelCallBatchData* batch_data, - grpc_error* error); - // Intercepts recv_trailing_metadata_ready callback for retries. - // Commits the call and returns the trailing metadata up the stack. - static void RecvTrailingMetadataReady(void* arg, grpc_error* error); - - // Adds the on_complete closure for the pending batch completed in - // batch_data to closures. - void AddClosuresForCompletedPendingBatch(SubchannelCallBatchData* batch_data, - grpc_error* error, - CallCombinerClosureList* closures); - - // If there are any cached ops to replay or pending ops to start on the - // subchannel call, adds a closure to closures to invoke - // StartRetriableSubchannelBatches(). - void AddClosuresForReplayOrPendingSendOps( - SubchannelCallBatchData* batch_data, - SubchannelCallRetryState* retry_state, CallCombinerClosureList* closures); - - // Callback used to intercept on_complete from subchannel calls. - // Called only when retries are enabled. - static void OnComplete(void* arg, grpc_error* error); - - static void StartBatchInCallCombiner(void* arg, grpc_error* ignored); - // Adds a closure to closures that will execute batch in the call combiner. - void AddClosureForSubchannelBatch(grpc_transport_stream_op_batch* batch, - CallCombinerClosureList* closures); - // Adds retriable send_initial_metadata op to batch_data. - void AddRetriableSendInitialMetadataOp(SubchannelCallRetryState* retry_state, - SubchannelCallBatchData* batch_data); - // Adds retriable send_message op to batch_data. - void AddRetriableSendMessageOp(SubchannelCallRetryState* retry_state, - SubchannelCallBatchData* batch_data); - // Adds retriable send_trailing_metadata op to batch_data. - void AddRetriableSendTrailingMetadataOp(SubchannelCallRetryState* retry_state, - SubchannelCallBatchData* batch_data); - // Adds retriable recv_initial_metadata op to batch_data. - void AddRetriableRecvInitialMetadataOp(SubchannelCallRetryState* retry_state, - SubchannelCallBatchData* batch_data); - // Adds retriable recv_message op to batch_data. - void AddRetriableRecvMessageOp(SubchannelCallRetryState* retry_state, - SubchannelCallBatchData* batch_data); - // Adds retriable recv_trailing_metadata op to batch_data. - void AddRetriableRecvTrailingMetadataOp(SubchannelCallRetryState* retry_state, - SubchannelCallBatchData* batch_data); - // Helper function used to start a recv_trailing_metadata batch. This - // is used in the case where a recv_initial_metadata or recv_message - // op fails in a way that we know the call is over but when the application - // has not yet started its own recv_trailing_metadata op. - void StartInternalRecvTrailingMetadata(); - // If there are any cached send ops that need to be replayed on the - // current subchannel call, creates and returns a new subchannel batch - // to replay those ops. Otherwise, returns nullptr. - SubchannelCallBatchData* MaybeCreateSubchannelBatchForReplay( - SubchannelCallRetryState* retry_state); - // Adds subchannel batches for pending batches to closures. - void AddSubchannelBatchesForPendingBatches( - SubchannelCallRetryState* retry_state, CallCombinerClosureList* closures); - // Constructs and starts whatever subchannel batches are needed on the - // subchannel call. - static void StartRetriableSubchannelBatches(void* arg, grpc_error* ignored); - - static void CreateLbCall(void* arg, grpc_error* error); - - ChannelData* chand_; - grpc_polling_entity* pollent_; - RefCountedPtr<ServerRetryThrottleData> retry_throttle_data_; - const ClientChannelMethodParsedConfig::RetryPolicy* retry_policy_ = nullptr; - BackOff retry_backoff_; - - grpc_slice path_; // Request path. - gpr_cycle_counter call_start_time_; - grpc_millis deadline_; - Arena* arena_; - grpc_call_stack* owning_call_; - CallCombiner* call_combiner_; - grpc_call_context_element* call_context_; - - grpc_closure retry_closure_; - - RefCountedPtr<LoadBalancedCall> lb_call_; - - // Batches are added to this list when received from above. - // They are removed when we are done handling the batch (i.e., when - // either we have invoked all of the batch's callbacks or we have - // passed the batch down to the LB call and are not intercepting any of - // its callbacks). - // TODO(roth): Now that the retry code is split out into its own call - // object, revamp this to work in a cleaner way, since we no longer need - // for batches to ever wait for name resolution or LB picks. - PendingBatch pending_batches_[MAX_PENDING_BATCHES]; - bool pending_send_initial_metadata_ : 1; - bool pending_send_message_ : 1; - bool pending_send_trailing_metadata_ : 1; - - // Set when we get a cancel_stream op. - grpc_error* cancel_error_ = GRPC_ERROR_NONE; - - // Retry state. - bool enable_retries_ : 1; - bool retry_committed_ : 1; - bool last_attempt_got_server_pushback_ : 1; - int num_attempts_completed_ = 0; - size_t bytes_buffered_for_retry_ = 0; - grpc_timer retry_timer_; - - // The number of pending retriable subchannel batches containing send ops. - // We hold a ref to the call stack while this is non-zero, since replay - // batches may not complete until after all callbacks have been returned - // to the surface, and we need to make sure that the call is not destroyed - // until all of these batches have completed. - // Note that we actually only need to track replay batches, but it's - // easier to track all batches with send ops. - int num_pending_retriable_subchannel_send_batches_ = 0; - - // Cached data for retrying send ops. - // send_initial_metadata - bool seen_send_initial_metadata_ = false; - grpc_linked_mdelem* send_initial_metadata_storage_ = nullptr; - grpc_metadata_batch send_initial_metadata_; - uint32_t send_initial_metadata_flags_; - gpr_atm* peer_string_; - // send_message - // When we get a send_message op, we replace the original byte stream - // with a CachingByteStream that caches the slices to a local buffer for - // use in retries. - // Note: We inline the cache for the first 3 send_message ops and use - // dynamic allocation after that. This number was essentially picked - // at random; it could be changed in the future to tune performance. - absl::InlinedVector<ByteStreamCache*, 3> send_messages_; - // send_trailing_metadata - bool seen_send_trailing_metadata_ = false; - grpc_linked_mdelem* send_trailing_metadata_storage_ = nullptr; - grpc_metadata_batch send_trailing_metadata_; -}; - -// -// LoadBalancedCall definition -// - -// This object is ref-counted, but it cannot inherit from RefCounted<>, -// because it is allocated on the arena and can't free its memory when -// its refcount goes to zero. So instead, it manually implements the -// same API as RefCounted<>, so that it can be used with RefCountedPtr<>. -class LoadBalancedCall { - public: - static RefCountedPtr<LoadBalancedCall> Create( - ChannelData* chand, const grpc_call_element_args& args, - grpc_polling_entity* pollent, size_t parent_data_size); - - LoadBalancedCall(ChannelData* chand, const grpc_call_element_args& args, - grpc_polling_entity* pollent); - ~LoadBalancedCall(); - - // Interface of RefCounted<>. - RefCountedPtr<LoadBalancedCall> Ref() GRPC_MUST_USE_RESULT; - RefCountedPtr<LoadBalancedCall> Ref(const DebugLocation& location, - const char* reason) GRPC_MUST_USE_RESULT; - // When refcount drops to 0, destroys itself and the associated call stack, - // but does NOT free the memory because it's in the call arena. - void Unref(); - void Unref(const DebugLocation& location, const char* reason); - - void* GetParentData(); - - void StartTransportStreamOpBatch(grpc_transport_stream_op_batch* batch); - - // Invoked by channel for queued LB picks when the picker is updated. - static void PickSubchannel(void* arg, grpc_error* error); - // Helper function for performing an LB pick while holding the data plane - // mutex. Returns true if the pick is complete, in which case the caller - // must invoke PickDone() or AsyncPickDone() with the returned error. - bool PickSubchannelLocked(grpc_error** error); - // Schedules a callback to process the completed pick. The callback - // will not run until after this method returns. - void AsyncPickDone(grpc_error* error); - - RefCountedPtr<SubchannelCall> subchannel_call() const { - return subchannel_call_; - } - - private: - // Allow RefCountedPtr<> to access IncrementRefCount(). - template <typename T> - friend class ::grpc_core::RefCountedPtr; - - class LbQueuedCallCanceller; - class Metadata; - class LbCallState; - - // Interface of RefCounted<>. - void IncrementRefCount(); - void IncrementRefCount(const DebugLocation& location, const char* reason); - - // Returns the index into pending_batches_ to be used for batch. - static size_t GetBatchIndex(grpc_transport_stream_op_batch* batch); - void PendingBatchesAdd(grpc_transport_stream_op_batch* batch); - static void FailPendingBatchInCallCombiner(void* arg, grpc_error* error); - // A predicate type and some useful implementations for PendingBatchesFail(). - typedef bool (*YieldCallCombinerPredicate)( - const CallCombinerClosureList& closures); - static bool YieldCallCombiner(const CallCombinerClosureList& /*closures*/) { - return true; - } - static bool NoYieldCallCombiner(const CallCombinerClosureList& /*closures*/) { - return false; - } - static bool YieldCallCombinerIfPendingBatchesFound( - const CallCombinerClosureList& closures) { - return closures.size() > 0; - } - // Fails all pending batches. - // If yield_call_combiner_predicate returns true, assumes responsibility for - // yielding the call combiner. - void PendingBatchesFail( - grpc_error* error, - YieldCallCombinerPredicate yield_call_combiner_predicate); - static void ResumePendingBatchInCallCombiner(void* arg, grpc_error* ignored); - // Resumes all pending batches on subchannel_call_. - void PendingBatchesResume(); - - static void RecvTrailingMetadataReadyForLoadBalancingPolicy( - void* arg, grpc_error* error); - void InjectRecvTrailingMetadataReadyForLoadBalancingPolicy( - grpc_transport_stream_op_batch* batch); - - void CreateSubchannelCall(); - // Invoked when a pick is completed, on both success or failure. - static void PickDone(void* arg, grpc_error* error); - // Removes the call from the channel's list of queued picks if present. - void MaybeRemoveCallFromLbQueuedCallsLocked(); - // Adds the call to the channel's list of queued picks if not already present. - void MaybeAddCallToLbQueuedCallsLocked(); - - RefCount refs_; - - ChannelData* chand_; - - // TODO(roth): Instead of duplicating these fields in every filter - // that uses any one of them, we should store them in the call - // context. This will save per-call memory overhead. - grpc_slice path_; // Request path. - gpr_cycle_counter call_start_time_; - grpc_millis deadline_; - Arena* arena_; - grpc_call_stack* owning_call_; - CallCombiner* call_combiner_; - grpc_call_context_element* call_context_; - - // Set when we get a cancel_stream op. - grpc_error* cancel_error_ = GRPC_ERROR_NONE; - - grpc_polling_entity* pollent_ = nullptr; - - grpc_closure pick_closure_; - - // Accessed while holding ChannelData::data_plane_mu_. - ChannelData::LbQueuedCall queued_call_; - bool queued_pending_lb_pick_ = false; - const LoadBalancingPolicy::BackendMetricData* backend_metric_data_ = nullptr; - RefCountedPtr<ConnectedSubchannel> connected_subchannel_; - std::function<void(grpc_error*, LoadBalancingPolicy::MetadataInterface*, - LoadBalancingPolicy::CallState*)> - lb_recv_trailing_metadata_ready_; - LbQueuedCallCanceller* lb_call_canceller_ = nullptr; - - RefCountedPtr<SubchannelCall> subchannel_call_; - - // For intercepting recv_trailing_metadata_ready for the LB policy. - grpc_metadata_batch* recv_trailing_metadata_ = nullptr; - grpc_closure recv_trailing_metadata_ready_; - grpc_closure* original_recv_trailing_metadata_ready_ = nullptr; - - // Batches are added to this list when received from above. - // They are removed when we are done handling the batch (i.e., when - // either we have invoked all of the batch's callbacks or we have - // passed the batch down to the subchannel call and are not - // intercepting any of its callbacks). - grpc_transport_stream_op_batch* pending_batches_[MAX_PENDING_BATCHES] = {}; +const grpc_channel_filter ClientChannel::kFilterVtable = { + ClientChannel::CallData::StartTransportStreamOpBatch, + ClientChannel::StartTransportOp, + sizeof(ClientChannel::CallData), + ClientChannel::CallData::Init, + ClientChannel::CallData::SetPollent, + ClientChannel::CallData::Destroy, + sizeof(ClientChannel), + ClientChannel::Init, + ClientChannel::Destroy, + ClientChannel::GetChannelInfo, + "client-channel", }; // // dynamic termination filter // -// Channel arg pointer vtable for GRPC_ARG_CLIENT_CHANNEL_DATA. -void* ChannelDataArgCopy(void* p) { return p; } -void ChannelDataArgDestroy(void* p) {} -int ChannelDataArgCmp(void* p, void* q) { return GPR_ICMP(p, q); } -const grpc_arg_pointer_vtable kChannelDataArgPointerVtable = { - ChannelDataArgCopy, ChannelDataArgDestroy, ChannelDataArgCmp}; - -// Channel arg pointer vtable for GRPC_ARG_RETRY_THROTTLE_DATA. -void* RetryThrottleDataArgCopy(void* p) { - auto* retry_throttle_data = static_cast<ServerRetryThrottleData*>(p); - retry_throttle_data->Ref().release(); +namespace { + +// Channel arg pointer vtable for GRPC_ARG_CLIENT_CHANNEL. +void* ClientChannelArgCopy(void* p) { return p; } +void ClientChannelArgDestroy(void* /*p*/) {} +int ClientChannelArgCmp(void* p, void* q) { return GPR_ICMP(p, q); } +const grpc_arg_pointer_vtable kClientChannelArgPointerVtable = { + ClientChannelArgCopy, ClientChannelArgDestroy, ClientChannelArgCmp}; + +// Channel arg pointer vtable for GRPC_ARG_SERVICE_CONFIG_OBJ. +void* ServiceConfigObjArgCopy(void* p) { + auto* service_config = static_cast<ServiceConfig*>(p); + service_config->Ref().release(); return p; } -void RetryThrottleDataArgDestroy(void* p) { - auto* retry_throttle_data = static_cast<ServerRetryThrottleData*>(p); - retry_throttle_data->Unref(); +void ServiceConfigObjArgDestroy(void* p) { + auto* service_config = static_cast<ServiceConfig*>(p); + service_config->Unref(); } -int RetryThrottleDataArgCmp(void* p, void* q) { return GPR_ICMP(p, q); } -const grpc_arg_pointer_vtable kRetryThrottleDataArgPointerVtable = { - RetryThrottleDataArgCopy, RetryThrottleDataArgDestroy, - RetryThrottleDataArgCmp}; +int ServiceConfigObjArgCmp(void* p, void* q) { return GPR_ICMP(p, q); } +const grpc_arg_pointer_vtable kServiceConfigObjArgPointerVtable = { + ServiceConfigObjArgCopy, ServiceConfigObjArgDestroy, + ServiceConfigObjArgCmp}; -class DynamicTerminationFilterChannelData { +class DynamicTerminationFilter { public: - static grpc_error* Init(grpc_channel_element* elem, - grpc_channel_element_args* args); + class CallData; + + static const grpc_channel_filter kFilterVtable; + + static grpc_error_handle Init(grpc_channel_element* elem, + grpc_channel_element_args* args) { + GPR_ASSERT(args->is_last); + GPR_ASSERT(elem->filter == &kFilterVtable); + new (elem->channel_data) DynamicTerminationFilter(args->channel_args); + return GRPC_ERROR_NONE; + } static void Destroy(grpc_channel_element* elem) { - auto* chand = - static_cast<DynamicTerminationFilterChannelData*>(elem->channel_data); - chand->~DynamicTerminationFilterChannelData(); + auto* chand = static_cast<DynamicTerminationFilter*>(elem->channel_data); + chand->~DynamicTerminationFilter(); } // Will never be called. - static void StartTransportOp(grpc_channel_element* elem, - grpc_transport_op* op) {} - static void GetChannelInfo(grpc_channel_element* elem, - const grpc_channel_info* info) {} - - ChannelData* chand() const { return chand_; } - RefCountedPtr<ServerRetryThrottleData> retry_throttle_data() const { - return retry_throttle_data_; - } + static void StartTransportOp(grpc_channel_element* /*elem*/, + grpc_transport_op* /*op*/) {} + static void GetChannelInfo(grpc_channel_element* /*elem*/, + const grpc_channel_info* /*info*/) {} private: - static RefCountedPtr<ServerRetryThrottleData> GetRetryThrottleDataFromArgs( - const grpc_channel_args* args) { - auto* retry_throttle_data = - grpc_channel_args_find_pointer<ServerRetryThrottleData>( - args, GRPC_ARG_RETRY_THROTTLE_DATA); - if (retry_throttle_data == nullptr) return nullptr; - return retry_throttle_data->Ref(); - } - - explicit DynamicTerminationFilterChannelData(const grpc_channel_args* args) - : chand_(grpc_channel_args_find_pointer<ChannelData>( - args, GRPC_ARG_CLIENT_CHANNEL_DATA)), - retry_throttle_data_(GetRetryThrottleDataFromArgs(args)) {} - - ChannelData* chand_; - RefCountedPtr<ServerRetryThrottleData> retry_throttle_data_; + explicit DynamicTerminationFilter(const grpc_channel_args* args) + : chand_(grpc_channel_args_find_pointer<ClientChannel>( + args, GRPC_ARG_CLIENT_CHANNEL)) {} + + ClientChannel* chand_; }; -class DynamicTerminationFilterCallData { +class DynamicTerminationFilter::CallData { public: - static grpc_error* Init(grpc_call_element* elem, - const grpc_call_element_args* args) { - new (elem->call_data) DynamicTerminationFilterCallData(*args); + static grpc_error_handle Init(grpc_call_element* elem, + const grpc_call_element_args* args) { + new (elem->call_data) CallData(*args); return GRPC_ERROR_NONE; } static void Destroy(grpc_call_element* elem, - const grpc_call_final_info* final_info, + const grpc_call_final_info* /*final_info*/, grpc_closure* then_schedule_closure) { - auto* calld = - static_cast<DynamicTerminationFilterCallData*>(elem->call_data); - auto* chand = - static_cast<DynamicTerminationFilterChannelData*>(elem->channel_data); + auto* calld = static_cast<CallData*>(elem->call_data); RefCountedPtr<SubchannelCall> subchannel_call; - if (chand->chand()->enable_retries()) { - if (GPR_LIKELY(calld->retrying_call_ != nullptr)) { - subchannel_call = calld->retrying_call_->subchannel_call(); - calld->retrying_call_->~RetryingCall(); - } - } else { - if (GPR_LIKELY(calld->lb_call_ != nullptr)) { - subchannel_call = calld->lb_call_->subchannel_call(); - } + if (GPR_LIKELY(calld->lb_call_ != nullptr)) { + subchannel_call = calld->lb_call_->subchannel_call(); } - calld->~DynamicTerminationFilterCallData(); + calld->~CallData(); if (GPR_LIKELY(subchannel_call != nullptr)) { subchannel_call->SetAfterCallStackDestroy(then_schedule_closure); } else { @@ -1145,60 +336,31 @@ class DynamicTerminationFilterCallData { static void StartTransportStreamOpBatch( grpc_call_element* elem, grpc_transport_stream_op_batch* batch) { - auto* calld = - static_cast<DynamicTerminationFilterCallData*>(elem->call_data); - auto* chand = - static_cast<DynamicTerminationFilterChannelData*>(elem->channel_data); - if (chand->chand()->enable_retries()) { - calld->retrying_call_->StartTransportStreamOpBatch(batch); - } else { - calld->lb_call_->StartTransportStreamOpBatch(batch); - } + auto* calld = static_cast<CallData*>(elem->call_data); + calld->lb_call_->StartTransportStreamOpBatch(batch); } static void SetPollent(grpc_call_element* elem, grpc_polling_entity* pollent) { - auto* calld = - static_cast<DynamicTerminationFilterCallData*>(elem->call_data); - auto* chand = - static_cast<DynamicTerminationFilterChannelData*>(elem->channel_data); - ChannelData* client_channel = chand->chand(); + auto* calld = static_cast<CallData*>(elem->call_data); + auto* chand = static_cast<DynamicTerminationFilter*>(elem->channel_data); + ClientChannel* client_channel = chand->chand_; grpc_call_element_args args = { calld->owning_call_, nullptr, calld->call_context_, calld->path_, calld->call_start_time_, calld->deadline_, calld->arena_, calld->call_combiner_}; - if (client_channel->enable_retries()) { - // Get retry settings from service config. - auto* svc_cfg_call_data = static_cast<ServiceConfigCallData*>( - calld->call_context_[GRPC_CONTEXT_SERVICE_CONFIG_CALL_DATA].value); - GPR_ASSERT(svc_cfg_call_data != nullptr); - auto* method_config = static_cast<const ClientChannelMethodParsedConfig*>( - svc_cfg_call_data->GetMethodParsedConfig( - ClientChannelServiceConfigParser::ParserIndex())); - // Create retrying call. - calld->retrying_call_ = calld->arena_->New<RetryingCall>( - client_channel, args, pollent, chand->retry_throttle_data(), - method_config == nullptr ? nullptr : method_config->retry_policy()); - if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_routing_trace)) { - gpr_log( - GPR_INFO, - "chand=%p dymamic_termination_calld=%p: create retrying_call=%p", - client_channel, calld, calld->retrying_call_); - } - } else { - calld->lb_call_ = - LoadBalancedCall::Create(client_channel, args, pollent, 0); - if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_routing_trace)) { - gpr_log(GPR_INFO, - "chand=%p dynamic_termination_calld=%p: create lb_call=%p", - chand, client_channel, calld->lb_call_.get()); - } + calld->lb_call_ = + client_channel->CreateLoadBalancedCall(args, pollent, nullptr); + if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_routing_trace)) { + gpr_log(GPR_INFO, + "chand=%p dynamic_termination_calld=%p: create lb_call=%p", chand, + client_channel, calld->lb_call_.get()); } } private: - explicit DynamicTerminationFilterCallData(const grpc_call_element_args& args) + explicit CallData(const grpc_call_element_args& args) : path_(grpc_slice_ref_internal(args.path)), call_start_time_(args.start_time), deadline_(args.deadline), @@ -1207,7 +369,7 @@ class DynamicTerminationFilterCallData { call_combiner_(args.call_combiner), call_context_(args.context) {} - ~DynamicTerminationFilterCallData() { grpc_slice_unref_internal(path_); } + ~CallData() { grpc_slice_unref_internal(path_); } grpc_slice path_; // Request path. gpr_cycle_counter call_start_time_; @@ -1217,35 +379,58 @@ class DynamicTerminationFilterCallData { CallCombiner* call_combiner_; grpc_call_context_element* call_context_; - RetryingCall* retrying_call_ = nullptr; - RefCountedPtr<LoadBalancedCall> lb_call_; + RefCountedPtr<ClientChannel::LoadBalancedCall> lb_call_; }; -const grpc_channel_filter kDynamicTerminationFilterVtable = { - DynamicTerminationFilterCallData::StartTransportStreamOpBatch, - DynamicTerminationFilterChannelData::StartTransportOp, - sizeof(DynamicTerminationFilterCallData), - DynamicTerminationFilterCallData::Init, - DynamicTerminationFilterCallData::SetPollent, - DynamicTerminationFilterCallData::Destroy, - sizeof(DynamicTerminationFilterChannelData), - DynamicTerminationFilterChannelData::Init, - DynamicTerminationFilterChannelData::Destroy, - DynamicTerminationFilterChannelData::GetChannelInfo, +const grpc_channel_filter DynamicTerminationFilter::kFilterVtable = { + DynamicTerminationFilter::CallData::StartTransportStreamOpBatch, + DynamicTerminationFilter::StartTransportOp, + sizeof(DynamicTerminationFilter::CallData), + DynamicTerminationFilter::CallData::Init, + DynamicTerminationFilter::CallData::SetPollent, + DynamicTerminationFilter::CallData::Destroy, + sizeof(DynamicTerminationFilter), + DynamicTerminationFilter::Init, + DynamicTerminationFilter::Destroy, + DynamicTerminationFilter::GetChannelInfo, "dynamic_filter_termination", }; -grpc_error* DynamicTerminationFilterChannelData::Init( - grpc_channel_element* elem, grpc_channel_element_args* args) { - GPR_ASSERT(args->is_last); - GPR_ASSERT(elem->filter == &kDynamicTerminationFilterVtable); - new (elem->channel_data) - DynamicTerminationFilterChannelData(args->channel_args); - return GRPC_ERROR_NONE; -} +} // namespace // -// ChannelData::SubchannelWrapper +// ClientChannel::ResolverResultHandler +// + +class ClientChannel::ResolverResultHandler : public Resolver::ResultHandler { + public: + explicit ResolverResultHandler(ClientChannel* chand) : chand_(chand) { + GRPC_CHANNEL_STACK_REF(chand_->owning_stack_, "ResolverResultHandler"); + } + + ~ResolverResultHandler() override { + if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_routing_trace)) { + gpr_log(GPR_INFO, "chand=%p: resolver shutdown complete", chand_); + } + GRPC_CHANNEL_STACK_UNREF(chand_->owning_stack_, "ResolverResultHandler"); + } + + void ReturnResult(Resolver::Result result) override + ABSL_EXCLUSIVE_LOCKS_REQUIRED(chand_->work_serializer_) { + chand_->OnResolverResultChangedLocked(std::move(result)); + } + + void ReturnError(grpc_error_handle error) override + ABSL_EXCLUSIVE_LOCKS_REQUIRED(chand_->work_serializer_) { + chand_->OnResolverErrorLocked(error); + } + + private: + ClientChannel* chand_; +}; + +// +// ClientChannel::SubchannelWrapper // // This class is a wrapper for Subchannel that hides details of the @@ -1256,29 +441,30 @@ grpc_error* DynamicTerminationFilterChannelData::Init( // underlying subchannel is shared between channels, this wrapper will only // be used within one channel, so it will always be synchronized by the // control plane work_serializer. -class ChannelData::SubchannelWrapper : public SubchannelInterface { +class ClientChannel::SubchannelWrapper : public SubchannelInterface { public: - SubchannelWrapper(ChannelData* chand, Subchannel* subchannel, + SubchannelWrapper(ClientChannel* chand, RefCountedPtr<Subchannel> subchannel, absl::optional<std::string> health_check_service_name) : SubchannelInterface( GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_routing_trace) ? "SubchannelWrapper" : nullptr), chand_(chand), - subchannel_(subchannel), + subchannel_(std::move(subchannel)), health_check_service_name_(std::move(health_check_service_name)) { if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_routing_trace)) { gpr_log(GPR_INFO, "chand=%p: creating subchannel wrapper %p for subchannel %p", - chand, this, subchannel_); + chand, this, subchannel_.get()); } GRPC_CHANNEL_STACK_REF(chand_->owning_stack_, "SubchannelWrapper"); auto* subchannel_node = subchannel_->channelz_node(); if (subchannel_node != nullptr) { - auto it = chand_->subchannel_refcount_map_.find(subchannel_); + auto it = chand_->subchannel_refcount_map_.find(subchannel_.get()); if (it == chand_->subchannel_refcount_map_.end()) { chand_->channelz_node_->AddChildSubchannel(subchannel_node->uuid()); - it = chand_->subchannel_refcount_map_.emplace(subchannel_, 0).first; + it = chand_->subchannel_refcount_map_.emplace(subchannel_.get(), 0) + .first; } ++it->second; } @@ -1289,12 +475,12 @@ class ChannelData::SubchannelWrapper : public SubchannelInterface { if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_routing_trace)) { gpr_log(GPR_INFO, "chand=%p: destroying subchannel wrapper %p for subchannel %p", - chand_, this, subchannel_); + chand_, this, subchannel_.get()); } chand_->subchannel_wrappers_.erase(this); auto* subchannel_node = subchannel_->channelz_node(); if (subchannel_node != nullptr) { - auto it = chand_->subchannel_refcount_map_.find(subchannel_); + auto it = chand_->subchannel_refcount_map_.find(subchannel_.get()); GPR_ASSERT(it != chand_->subchannel_refcount_map_.end()); --it->second; if (it->second == 0) { @@ -1302,11 +488,11 @@ class ChannelData::SubchannelWrapper : public SubchannelInterface { chand_->subchannel_refcount_map_.erase(it); } } - GRPC_SUBCHANNEL_UNREF(subchannel_, "unref from LB"); GRPC_CHANNEL_STACK_UNREF(chand_->owning_stack_, "SubchannelWrapper"); } - grpc_connectivity_state CheckConnectivityState() override { + grpc_connectivity_state CheckConnectivityState() override + ABSL_EXCLUSIVE_LOCKS_REQUIRED(chand_->work_serializer_) { RefCountedPtr<ConnectedSubchannel> connected_subchannel; grpc_connectivity_state connectivity_state = subchannel_->CheckConnectivityState(health_check_service_name_, @@ -1385,16 +571,19 @@ class ChannelData::SubchannelWrapper : public SubchannelInterface { } // Caller must be holding the control-plane work_serializer. - ConnectedSubchannel* connected_subchannel() const { + ConnectedSubchannel* connected_subchannel() const + ABSL_EXCLUSIVE_LOCKS_REQUIRED(&ClientChannel::work_serializer_) { return connected_subchannel_.get(); } // Caller must be holding the data-plane mutex. - ConnectedSubchannel* connected_subchannel_in_data_plane() const { + ConnectedSubchannel* connected_subchannel_in_data_plane() const + ABSL_EXCLUSIVE_LOCKS_REQUIRED(&ClientChannel::data_plane_mu_) { return connected_subchannel_in_data_plane_.get(); } void set_connected_subchannel_in_data_plane( - RefCountedPtr<ConnectedSubchannel> connected_subchannel) { + RefCountedPtr<ConnectedSubchannel> connected_subchannel) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(&ClientChannel::data_plane_mu_) { connected_subchannel_in_data_plane_ = std::move(connected_subchannel); } @@ -1427,7 +616,10 @@ class ChannelData::SubchannelWrapper : public SubchannelInterface { ~WatcherWrapper() override { auto* parent = parent_.release(); // ref owned by lambda parent->chand_->work_serializer_->Run( - [parent]() { parent->Unref(DEBUG_LOCATION, "WatcherWrapper"); }, + [parent]() + ABSL_EXCLUSIVE_LOCKS_REQUIRED(parent_->chand_->work_serializer_) { + parent->Unref(DEBUG_LOCATION, "WatcherWrapper"); + }, DEBUG_LOCATION); } @@ -1436,14 +628,15 @@ class ChannelData::SubchannelWrapper : public SubchannelInterface { gpr_log(GPR_INFO, "chand=%p: connectivity change for subchannel wrapper %p " "subchannel %p; hopping into work_serializer", - parent_->chand_, parent_.get(), parent_->subchannel_); + parent_->chand_, parent_.get(), parent_->subchannel_.get()); } Ref().release(); // ref owned by lambda parent_->chand_->work_serializer_->Run( - [this]() { - ApplyUpdateInControlPlaneWorkSerializer(); - Unref(); - }, + [this]() + ABSL_EXCLUSIVE_LOCKS_REQUIRED(parent_->chand_->work_serializer_) { + ApplyUpdateInControlPlaneWorkSerializer(); + Unref(); + }, DEBUG_LOCATION); } @@ -1464,13 +657,14 @@ class ChannelData::SubchannelWrapper : public SubchannelInterface { grpc_connectivity_state last_seen_state() const { return last_seen_state_; } private: - void ApplyUpdateInControlPlaneWorkSerializer() { + void ApplyUpdateInControlPlaneWorkSerializer() + ABSL_EXCLUSIVE_LOCKS_REQUIRED(parent_->chand_->work_serializer_) { if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_routing_trace)) { gpr_log(GPR_INFO, "chand=%p: processing connectivity change in work serializer " "for subchannel wrapper %p subchannel %p " "watcher=%p", - parent_->chand_, parent_.get(), parent_->subchannel_, + parent_->chand_, parent_.get(), parent_->subchannel_.get(), watcher_.get()); } ConnectivityStateChange state_change = PopConnectivityStateChange(); @@ -1518,7 +712,8 @@ class ChannelData::SubchannelWrapper : public SubchannelInterface { }; void MaybeUpdateConnectedSubchannel( - RefCountedPtr<ConnectedSubchannel> connected_subchannel) { + RefCountedPtr<ConnectedSubchannel> connected_subchannel) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(&ClientChannel::work_serializer_) { // Update the connected subchannel only if the channel is not shutting // down. This is because once the channel is shutting down, we // ignore picker updates from the LB policy, which means that @@ -1526,7 +721,7 @@ class ChannelData::SubchannelWrapper : public SubchannelInterface { // in chand_->pending_subchannel_updates_. So we don't want to add // entries there that will never be processed, since that would // leave dangling refs to the channel and prevent its destruction. - grpc_error* disconnect_error = chand_->disconnect_error(); + grpc_error_handle disconnect_error = chand_->disconnect_error(); if (disconnect_error != GRPC_ERROR_NONE) return; // Not shutting down, so do the update. if (connected_subchannel_ != connected_subchannel) { @@ -1538,8 +733,8 @@ class ChannelData::SubchannelWrapper : public SubchannelInterface { } } - ChannelData* chand_; - Subchannel* subchannel_; + ClientChannel* chand_; + RefCountedPtr<Subchannel> subchannel_; absl::optional<std::string> health_check_service_name_; // Maps from the address of the watcher passed to us by the LB policy // to the address of the WrapperWatcher that we passed to the underlying @@ -1548,17 +743,19 @@ class ChannelData::SubchannelWrapper : public SubchannelInterface { // corresponding WrapperWatcher to cancel on the underlying subchannel. std::map<ConnectivityStateWatcherInterface*, WatcherWrapper*> watcher_map_; // To be accessed only in the control plane work_serializer. - RefCountedPtr<ConnectedSubchannel> connected_subchannel_; + RefCountedPtr<ConnectedSubchannel> connected_subchannel_ + ABSL_GUARDED_BY(&ClientChannel::work_serializer_); // To be accessed only in the data plane mutex. - RefCountedPtr<ConnectedSubchannel> connected_subchannel_in_data_plane_; + RefCountedPtr<ConnectedSubchannel> connected_subchannel_in_data_plane_ + ABSL_GUARDED_BY(&ClientChannel::data_plane_mu_); }; // -// ChannelData::ExternalConnectivityWatcher +// ClientChannel::ExternalConnectivityWatcher // -ChannelData::ExternalConnectivityWatcher::ExternalConnectivityWatcher( - ChannelData* chand, grpc_polling_entity pollent, +ClientChannel::ExternalConnectivityWatcher::ExternalConnectivityWatcher( + ClientChannel* chand, grpc_polling_entity pollent, grpc_connectivity_state* state, grpc_closure* on_complete, grpc_closure* watcher_timer_init) : chand_(chand), @@ -1580,22 +777,22 @@ ChannelData::ExternalConnectivityWatcher::ExternalConnectivityWatcher( } // Pass the ref from creating the object to Start(). chand_->work_serializer_->Run( - [this]() { + [this]() ABSL_EXCLUSIVE_LOCKS_REQUIRED(chand_->work_serializer_) { // The ref is passed to AddWatcherLocked(). AddWatcherLocked(); }, DEBUG_LOCATION); } -ChannelData::ExternalConnectivityWatcher::~ExternalConnectivityWatcher() { +ClientChannel::ExternalConnectivityWatcher::~ExternalConnectivityWatcher() { grpc_polling_entity_del_from_pollset_set(&pollent_, chand_->interested_parties_); GRPC_CHANNEL_STACK_UNREF(chand_->owning_stack_, "ExternalConnectivityWatcher"); } -void ChannelData::ExternalConnectivityWatcher:: - RemoveWatcherFromExternalWatchersMap(ChannelData* chand, +void ClientChannel::ExternalConnectivityWatcher:: + RemoveWatcherFromExternalWatchersMap(ClientChannel* chand, grpc_closure* on_complete, bool cancel) { RefCountedPtr<ExternalConnectivityWatcher> watcher; @@ -1612,7 +809,7 @@ void ChannelData::ExternalConnectivityWatcher:: if (watcher != nullptr && cancel) watcher->Cancel(); } -void ChannelData::ExternalConnectivityWatcher::Notify( +void ClientChannel::ExternalConnectivityWatcher::Notify( grpc_connectivity_state state, const absl::Status& /* status */) { bool done = false; if (!done_.CompareExchangeStrong(&done, true, MemoryOrder::RELAXED, @@ -1620,7 +817,8 @@ void ChannelData::ExternalConnectivityWatcher::Notify( return; // Already done. } // Remove external watcher. - chand_->RemoveExternalConnectivityWatcher(on_complete_, /*cancel=*/false); + ExternalConnectivityWatcher::RemoveWatcherFromExternalWatchersMap( + chand_, on_complete_, /*cancel=*/false); // Report new state to the user. *state_ = state; ExecCtx::Run(DEBUG_LOCATION, on_complete_, GRPC_ERROR_NONE); @@ -1628,12 +826,15 @@ void ChannelData::ExternalConnectivityWatcher::Notify( // Not needed in state SHUTDOWN, because the tracker will // automatically remove all watchers in that case. if (state != GRPC_CHANNEL_SHUTDOWN) { - chand_->work_serializer_->Run([this]() { RemoveWatcherLocked(); }, - DEBUG_LOCATION); + chand_->work_serializer_->Run( + [this]() ABSL_EXCLUSIVE_LOCKS_REQUIRED(chand_->work_serializer_) { + RemoveWatcherLocked(); + }, + DEBUG_LOCATION); } } -void ChannelData::ExternalConnectivityWatcher::Cancel() { +void ClientChannel::ExternalConnectivityWatcher::Cancel() { bool done = false; if (!done_.CompareExchangeStrong(&done, true, MemoryOrder::RELAXED, MemoryOrder::RELAXED)) { @@ -1641,84 +842,95 @@ void ChannelData::ExternalConnectivityWatcher::Cancel() { } ExecCtx::Run(DEBUG_LOCATION, on_complete_, GRPC_ERROR_CANCELLED); // Hop back into the work_serializer to clean up. - chand_->work_serializer_->Run([this]() { RemoveWatcherLocked(); }, - DEBUG_LOCATION); + chand_->work_serializer_->Run( + [this]() ABSL_EXCLUSIVE_LOCKS_REQUIRED(chand_->work_serializer_) { + RemoveWatcherLocked(); + }, + DEBUG_LOCATION); } -void ChannelData::ExternalConnectivityWatcher::AddWatcherLocked() { +void ClientChannel::ExternalConnectivityWatcher::AddWatcherLocked() { Closure::Run(DEBUG_LOCATION, watcher_timer_init_, GRPC_ERROR_NONE); // Add new watcher. Pass the ref of the object from creation to OrphanablePtr. chand_->state_tracker_.AddWatcher( initial_state_, OrphanablePtr<ConnectivityStateWatcherInterface>(this)); } -void ChannelData::ExternalConnectivityWatcher::RemoveWatcherLocked() { +void ClientChannel::ExternalConnectivityWatcher::RemoveWatcherLocked() { chand_->state_tracker_.RemoveWatcher(this); } // -// ChannelData::ConnectivityWatcherAdder +// ClientChannel::ConnectivityWatcherAdder // -class ChannelData::ConnectivityWatcherAdder { +class ClientChannel::ConnectivityWatcherAdder { public: ConnectivityWatcherAdder( - ChannelData* chand, grpc_connectivity_state initial_state, + ClientChannel* chand, grpc_connectivity_state initial_state, OrphanablePtr<AsyncConnectivityStateWatcherInterface> watcher) : chand_(chand), initial_state_(initial_state), watcher_(std::move(watcher)) { GRPC_CHANNEL_STACK_REF(chand_->owning_stack_, "ConnectivityWatcherAdder"); - chand_->work_serializer_->Run([this]() { AddWatcherLocked(); }, - DEBUG_LOCATION); + chand_->work_serializer_->Run( + [this]() ABSL_EXCLUSIVE_LOCKS_REQUIRED(chand_->work_serializer_) { + AddWatcherLocked(); + }, + DEBUG_LOCATION); } private: - void AddWatcherLocked() { + void AddWatcherLocked() + ABSL_EXCLUSIVE_LOCKS_REQUIRED(chand_->work_serializer_) { chand_->state_tracker_.AddWatcher(initial_state_, std::move(watcher_)); GRPC_CHANNEL_STACK_UNREF(chand_->owning_stack_, "ConnectivityWatcherAdder"); delete this; } - ChannelData* chand_; + ClientChannel* chand_; grpc_connectivity_state initial_state_; OrphanablePtr<AsyncConnectivityStateWatcherInterface> watcher_; }; // -// ChannelData::ConnectivityWatcherRemover +// ClientChannel::ConnectivityWatcherRemover // -class ChannelData::ConnectivityWatcherRemover { +class ClientChannel::ConnectivityWatcherRemover { public: - ConnectivityWatcherRemover(ChannelData* chand, + ConnectivityWatcherRemover(ClientChannel* chand, AsyncConnectivityStateWatcherInterface* watcher) : chand_(chand), watcher_(watcher) { GRPC_CHANNEL_STACK_REF(chand_->owning_stack_, "ConnectivityWatcherRemover"); - chand_->work_serializer_->Run([this]() { RemoveWatcherLocked(); }, - DEBUG_LOCATION); + chand_->work_serializer_->Run( + [this]() ABSL_EXCLUSIVE_LOCKS_REQUIRED(chand_->work_serializer_) { + RemoveWatcherLocked(); + }, + DEBUG_LOCATION); } private: - void RemoveWatcherLocked() { + void RemoveWatcherLocked() + ABSL_EXCLUSIVE_LOCKS_REQUIRED(chand_->work_serializer_) { chand_->state_tracker_.RemoveWatcher(watcher_); GRPC_CHANNEL_STACK_UNREF(chand_->owning_stack_, "ConnectivityWatcherRemover"); delete this; } - ChannelData* chand_; + ClientChannel* chand_; AsyncConnectivityStateWatcherInterface* watcher_; }; // -// ChannelData::ClientChannelControlHelper +// ClientChannel::ClientChannelControlHelper // -class ChannelData::ClientChannelControlHelper +class ClientChannel::ClientChannelControlHelper : public LoadBalancingPolicy::ChannelControlHelper { public: - explicit ClientChannelControlHelper(ChannelData* chand) : chand_(chand) { + explicit ClientChannelControlHelper(ClientChannel* chand) : chand_(chand) { GRPC_CHANNEL_STACK_REF(chand_->owning_stack_, "ClientChannelControlHelper"); } @@ -1728,11 +940,12 @@ class ChannelData::ClientChannelControlHelper } RefCountedPtr<SubchannelInterface> CreateSubchannel( - ServerAddress address, const grpc_channel_args& args) override { + ServerAddress address, const grpc_channel_args& args) override + ABSL_EXCLUSIVE_LOCKS_REQUIRED(chand_->work_serializer_) { if (chand_->resolver_ == nullptr) return nullptr; // Shutting down. // Determine health check service name. - bool inhibit_health_checking = grpc_channel_arg_get_bool( - grpc_channel_args_find(&args, GRPC_ARG_INHIBIT_HEALTH_CHECKING), false); + bool inhibit_health_checking = grpc_channel_args_find_bool( + &args, GRPC_ARG_INHIBIT_HEALTH_CHECKING, false); absl::optional<std::string> health_check_service_name; if (!inhibit_health_checking) { health_check_service_name = chand_->health_check_service_name_; @@ -1758,7 +971,7 @@ class ChannelData::ClientChannelControlHelper args_to_add.data(), args_to_add.size()); gpr_free(args_to_add[0].value.string); // Create subchannel. - Subchannel* subchannel = + RefCountedPtr<Subchannel> subchannel = chand_->client_channel_factory_->CreateSubchannel(new_args); grpc_channel_args_destroy(new_args); if (subchannel == nullptr) return nullptr; @@ -1766,14 +979,15 @@ class ChannelData::ClientChannelControlHelper subchannel->ThrottleKeepaliveTime(chand_->keepalive_time_); // Create and return wrapper for the subchannel. return MakeRefCounted<SubchannelWrapper>( - chand_, subchannel, std::move(health_check_service_name)); + chand_, std::move(subchannel), std::move(health_check_service_name)); } void UpdateState( grpc_connectivity_state state, const absl::Status& status, - std::unique_ptr<LoadBalancingPolicy::SubchannelPicker> picker) override { + std::unique_ptr<LoadBalancingPolicy::SubchannelPicker> picker) override + ABSL_EXCLUSIVE_LOCKS_REQUIRED(chand_->work_serializer_) { if (chand_->resolver_ == nullptr) return; // Shutting down. - grpc_error* disconnect_error = chand_->disconnect_error(); + grpc_error_handle disconnect_error = chand_->disconnect_error(); if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_routing_trace)) { const char* extra = disconnect_error == GRPC_ERROR_NONE ? "" @@ -1789,7 +1003,8 @@ class ChannelData::ClientChannelControlHelper } } - void RequestReresolution() override { + void RequestReresolution() override + ABSL_EXCLUSIVE_LOCKS_REQUIRED(chand_->work_serializer_) { if (chand_->resolver_ == nullptr) return; // Shutting down. if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_routing_trace)) { gpr_log(GPR_INFO, "chand=%p: started name re-resolving", chand_); @@ -1797,8 +1012,8 @@ class ChannelData::ClientChannelControlHelper chand_->resolver_->RequestReresolutionLocked(); } - void AddTraceEvent(TraceSeverity severity, - absl::string_view message) override { + void AddTraceEvent(TraceSeverity severity, absl::string_view message) override + ABSL_EXCLUSIVE_LOCKS_REQUIRED(chand_->work_serializer_) { if (chand_->resolver_ == nullptr) return; // Shutting down. if (chand_->channelz_node_ != nullptr) { chand_->channelz_node_->AddTraceEvent( @@ -1815,42 +1030,44 @@ class ChannelData::ClientChannelControlHelper return channelz::ChannelTrace::Error; } - ChannelData* chand_; + ClientChannel* chand_; }; // -// ChannelData implementation +// ClientChannel implementation // -grpc_error* ChannelData::Init(grpc_channel_element* elem, - grpc_channel_element_args* args) { +ClientChannel* ClientChannel::GetFromChannel(grpc_channel* channel) { + grpc_channel_element* elem = + grpc_channel_stack_last_element(grpc_channel_get_channel_stack(channel)); + if (elem->filter != &kFilterVtable) return nullptr; + return static_cast<ClientChannel*>(elem->channel_data); +} + +grpc_error_handle ClientChannel::Init(grpc_channel_element* elem, + grpc_channel_element_args* args) { GPR_ASSERT(args->is_last); - GPR_ASSERT(elem->filter == &grpc_client_channel_filter); - grpc_error* error = GRPC_ERROR_NONE; - new (elem->channel_data) ChannelData(args, &error); + GPR_ASSERT(elem->filter == &kFilterVtable); + grpc_error_handle error = GRPC_ERROR_NONE; + new (elem->channel_data) ClientChannel(args, &error); return error; } -void ChannelData::Destroy(grpc_channel_element* elem) { - ChannelData* chand = static_cast<ChannelData*>(elem->channel_data); - chand->~ChannelData(); +void ClientChannel::Destroy(grpc_channel_element* elem) { + ClientChannel* chand = static_cast<ClientChannel*>(elem->channel_data); + chand->~ClientChannel(); } -bool GetEnableRetries(const grpc_channel_args* args) { - return grpc_channel_arg_get_bool( - grpc_channel_args_find(args, GRPC_ARG_ENABLE_RETRIES), true); -} +namespace { -size_t GetMaxPerRpcRetryBufferSize(const grpc_channel_args* args) { - return static_cast<size_t>(grpc_channel_arg_get_integer( - grpc_channel_args_find(args, GRPC_ARG_PER_RPC_RETRY_BUFFER_SIZE), - {DEFAULT_PER_RPC_RETRY_BUFFER_SIZE, 0, INT_MAX})); +bool GetEnableRetries(const grpc_channel_args* args) { + return grpc_channel_args_find_bool(args, GRPC_ARG_ENABLE_RETRIES, false); } RefCountedPtr<SubchannelPoolInterface> GetSubchannelPool( const grpc_channel_args* args) { - const bool use_local_subchannel_pool = grpc_channel_arg_get_bool( - grpc_channel_args_find(args, GRPC_ARG_USE_LOCAL_SUBCHANNEL_POOL), false); + const bool use_local_subchannel_pool = grpc_channel_args_find_bool( + args, GRPC_ARG_USE_LOCAL_SUBCHANNEL_POOL, false); if (use_local_subchannel_pool) { return MakeRefCounted<LocalSubchannelPool>(); } @@ -1858,26 +1075,23 @@ RefCountedPtr<SubchannelPoolInterface> GetSubchannelPool( } channelz::ChannelNode* GetChannelzNode(const grpc_channel_args* args) { - const grpc_arg* arg = - grpc_channel_args_find(args, GRPC_ARG_CHANNELZ_CHANNEL_NODE); - if (arg != nullptr && arg->type == GRPC_ARG_POINTER) { - return static_cast<channelz::ChannelNode*>(arg->value.pointer.p); - } - return nullptr; + return grpc_channel_args_find_pointer<channelz::ChannelNode>( + args, GRPC_ARG_CHANNELZ_CHANNEL_NODE); } -ChannelData::ChannelData(grpc_channel_element_args* args, grpc_error** error) +} // namespace + +ClientChannel::ClientChannel(grpc_channel_element_args* args, + grpc_error_handle* error) : deadline_checking_enabled_( grpc_deadline_checking_enabled(args->channel_args)), enable_retries_(GetEnableRetries(args->channel_args)), - per_rpc_retry_buffer_size_( - GetMaxPerRpcRetryBufferSize(args->channel_args)), owning_stack_(args->channel_stack), client_channel_factory_( ClientChannelFactory::GetFromChannelArgs(args->channel_args)), channelz_node_(GetChannelzNode(args->channel_args)), - work_serializer_(std::make_shared<WorkSerializer>()), interested_parties_(grpc_pollset_set_create()), + work_serializer_(std::make_shared<WorkSerializer>()), state_tracker_("client_channel", GRPC_CHANNEL_IDLE), subchannel_pool_(GetSubchannelPool(args->channel_args)), disconnect_error_(GRPC_ERROR_NONE) { @@ -1885,8 +1099,6 @@ ChannelData::ChannelData(grpc_channel_element_args* args, grpc_error** error) gpr_log(GPR_INFO, "chand=%p: creating client_channel for channel stack %p", this, owning_stack_); } - // Initialize data members. - gpr_mu_init(&info_mu_); // Start backup polling. grpc_client_channel_start_backup_polling(interested_parties_); // Check client channel factory. @@ -1896,8 +1108,8 @@ ChannelData::ChannelData(grpc_channel_element_args* args, grpc_error** error) return; } // Get server name to resolve, using proxy mapper if needed. - const char* server_uri = grpc_channel_arg_get_string( - grpc_channel_args_find(args->channel_args, GRPC_ARG_SERVER_URI)); + const char* server_uri = + grpc_channel_args_find_string(args->channel_args, GRPC_ARG_SERVER_URI); if (server_uri == nullptr) { *error = GRPC_ERROR_CREATE_FROM_STATIC_STRING( "server URI channel arg missing or wrong type in client channel " @@ -1906,8 +1118,8 @@ ChannelData::ChannelData(grpc_channel_element_args* args, grpc_error** error) } // Get default service config. If none is specified via the client API, // we use an empty config. - const char* service_config_json = grpc_channel_arg_get_string( - grpc_channel_args_find(args->channel_args, GRPC_ARG_SERVICE_CONFIG)); + const char* service_config_json = grpc_channel_args_find_string( + args->channel_args, GRPC_ARG_SERVICE_CONFIG); if (service_config_json == nullptr) service_config_json = "{}"; *error = GRPC_ERROR_NONE; default_service_config_ = @@ -1944,7 +1156,7 @@ ChannelData::ChannelData(grpc_channel_element_args* args, grpc_error** error) *error = GRPC_ERROR_NONE; } -ChannelData::~ChannelData() { +ClientChannel::~ClientChannel() { if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_routing_trace)) { gpr_log(GPR_INFO, "chand=%p: destroying channel", this); } @@ -1955,9 +1167,18 @@ ChannelData::~ChannelData() { grpc_client_channel_stop_backup_polling(interested_parties_); grpc_pollset_set_destroy(interested_parties_); GRPC_ERROR_UNREF(disconnect_error_.Load(MemoryOrder::RELAXED)); - gpr_mu_destroy(&info_mu_); } +RefCountedPtr<ClientChannel::LoadBalancedCall> +ClientChannel::CreateLoadBalancedCall( + const grpc_call_element_args& args, grpc_polling_entity* pollent, + grpc_closure* on_call_destruction_complete) { + return args.arena->New<LoadBalancedCall>(this, args, pollent, + on_call_destruction_complete); +} + +namespace { + RefCountedPtr<LoadBalancingPolicy::Config> ChooseLbPolicy( const Resolver::Result& resolver_result, const internal::ClientChannelGlobalParsedConfig* parsed_service_config) { @@ -1971,9 +1192,8 @@ RefCountedPtr<LoadBalancingPolicy::Config> ChooseLbPolicy( if (!parsed_service_config->parsed_deprecated_lb_policy().empty()) { policy_name = parsed_service_config->parsed_deprecated_lb_policy().c_str(); } else { - const grpc_arg* channel_arg = - grpc_channel_args_find(resolver_result.args, GRPC_ARG_LB_POLICY_NAME); - policy_name = grpc_channel_arg_get_string(channel_arg); + policy_name = grpc_channel_args_find_string(resolver_result.args, + GRPC_ARG_LB_POLICY_NAME); } // Use pick_first if nothing was specified and we didn't select grpclb // above. @@ -1982,7 +1202,7 @@ RefCountedPtr<LoadBalancingPolicy::Config> ChooseLbPolicy( Json config_json = Json::Array{Json::Object{ {policy_name, Json::Object{}}, }}; - grpc_error* parse_error = GRPC_ERROR_NONE; + grpc_error_handle parse_error = GRPC_ERROR_NONE; auto lb_policy_config = LoadBalancingPolicyRegistry::ParseLoadBalancingConfig( config_json, &parse_error); // The policy name came from one of three places: @@ -2002,7 +1222,9 @@ RefCountedPtr<LoadBalancingPolicy::Config> ChooseLbPolicy( return lb_policy_config; } -void ChannelData::OnResolverResultChangedLocked(Resolver::Result result) { +} // namespace + +void ClientChannel::OnResolverResultChangedLocked(Resolver::Result result) { // Handle race conditions. if (resolver_ == nullptr) return; if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_routing_trace)) { @@ -2025,21 +1247,19 @@ void ChannelData::OnResolverResultChangedLocked(Resolver::Result result) { trace_strings.push_back("Address list became non-empty"); } previous_resolution_contained_addresses_ = !result.addresses.empty(); - // The result of grpc_error_string() is owned by the error itself. - // We're storing that string in trace_strings, so we need to make sure - // that the error lives until we're done with the string. - grpc_error* service_config_error = - GRPC_ERROR_REF(result.service_config_error); - if (service_config_error != GRPC_ERROR_NONE) { - trace_strings.push_back(grpc_error_string(service_config_error)); + std::string service_config_error_string_storage; + if (result.service_config_error != GRPC_ERROR_NONE) { + service_config_error_string_storage = + grpc_error_std_string(result.service_config_error); + trace_strings.push_back(service_config_error_string_storage.c_str()); } // Choose the service config. RefCountedPtr<ServiceConfig> service_config; RefCountedPtr<ConfigSelector> config_selector; - if (service_config_error != GRPC_ERROR_NONE) { + if (result.service_config_error != GRPC_ERROR_NONE) { if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_routing_trace)) { gpr_log(GPR_INFO, "chand=%p: resolver returned service config error: %s", - this, grpc_error_string(service_config_error)); + this, grpc_error_std_string(result.service_config_error).c_str()); } // If the service config was invalid, then fallback to the // previously returned service config. @@ -2056,7 +1276,7 @@ void ChannelData::OnResolverResultChangedLocked(Resolver::Result result) { // We received an invalid service config and we don't have a // previous service config to fall back to. Put the channel into // TRANSIENT_FAILURE. - OnResolverErrorLocked(GRPC_ERROR_REF(service_config_error)); + OnResolverErrorLocked(GRPC_ERROR_REF(result.service_config_error)); trace_strings.push_back("no valid service config"); } } else if (result.service_config == nullptr) { @@ -2121,24 +1341,24 @@ void ChannelData::OnResolverResultChangedLocked(Resolver::Result result) { grpc_slice_from_cpp_string(message)); } } - GRPC_ERROR_UNREF(service_config_error); } -void ChannelData::OnResolverErrorLocked(grpc_error* error) { +void ClientChannel::OnResolverErrorLocked(grpc_error_handle error) { if (resolver_ == nullptr) { GRPC_ERROR_UNREF(error); return; } if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_routing_trace)) { gpr_log(GPR_INFO, "chand=%p: resolver transient failure: %s", this, - grpc_error_string(error)); + grpc_error_std_string(error).c_str()); } // If we already have an LB policy from a previous resolution // result, then we continue to let it set the connectivity state. // Otherwise, we go into TRANSIENT_FAILURE. if (lb_policy_ == nullptr) { - grpc_error* state_error = GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( - "Resolver transient failure", &error, 1); + grpc_error_handle state_error = + GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( + "Resolver transient failure", &error, 1); { MutexLock lock(&resolution_mu_); // Update resolver transient failure. @@ -2149,7 +1369,7 @@ void ChannelData::OnResolverErrorLocked(grpc_error* error) { call = call->next) { grpc_call_element* elem = call->elem; CallData* calld = static_cast<CallData*>(elem->call_data); - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; if (calld->CheckResolutionLocked(elem, &error)) { calld->AsyncResolutionDone(elem, error); } @@ -2165,7 +1385,7 @@ void ChannelData::OnResolverErrorLocked(grpc_error* error) { GRPC_ERROR_UNREF(error); } -void ChannelData::CreateOrUpdateLbPolicyLocked( +void ClientChannel::CreateOrUpdateLbPolicyLocked( RefCountedPtr<LoadBalancingPolicy::Config> lb_policy_config, Resolver::Result result) { // Construct update. @@ -2191,7 +1411,7 @@ void ChannelData::CreateOrUpdateLbPolicyLocked( } // Creates a new LB policy. -OrphanablePtr<LoadBalancingPolicy> ChannelData::CreateLbPolicyLocked( +OrphanablePtr<LoadBalancingPolicy> ClientChannel::CreateLbPolicyLocked( const grpc_channel_args& args) { LoadBalancingPolicy::Args lb_policy_args; lb_policy_args.work_serializer = work_serializer_; @@ -2210,8 +1430,8 @@ OrphanablePtr<LoadBalancingPolicy> ChannelData::CreateLbPolicyLocked( return lb_policy; } -void ChannelData::AddResolverQueuedCall(ResolverQueuedCall* call, - grpc_polling_entity* pollent) { +void ClientChannel::AddResolverQueuedCall(ResolverQueuedCall* call, + grpc_polling_entity* pollent) { // Add call to queued calls list. call->next = resolver_queued_calls_; resolver_queued_calls_ = call; @@ -2220,8 +1440,8 @@ void ChannelData::AddResolverQueuedCall(ResolverQueuedCall* call, grpc_polling_entity_add_to_pollset_set(pollent, interested_parties_); } -void ChannelData::RemoveResolverQueuedCall(ResolverQueuedCall* to_remove, - grpc_polling_entity* pollent) { +void ClientChannel::RemoveResolverQueuedCall(ResolverQueuedCall* to_remove, + grpc_polling_entity* pollent) { // Remove call's pollent from channel's interested_parties. grpc_polling_entity_del_from_pollset_set(pollent, interested_parties_); // Remove from queued calls list. @@ -2234,7 +1454,7 @@ void ChannelData::RemoveResolverQueuedCall(ResolverQueuedCall* to_remove, } } -void ChannelData::UpdateServiceConfigInControlPlaneLocked( +void ClientChannel::UpdateServiceConfigInControlPlaneLocked( RefCountedPtr<ServiceConfig> service_config, RefCountedPtr<ConfigSelector> config_selector, const internal::ClientChannelGlobalParsedConfig* parsed_service_config, @@ -2274,7 +1494,7 @@ void ChannelData::UpdateServiceConfigInControlPlaneLocked( } } -void ChannelData::UpdateServiceConfigInDataPlaneLocked() { +void ClientChannel::UpdateServiceConfigInDataPlaneLocked() { // Grab ref to service config. RefCountedPtr<ServiceConfig> service_config = saved_service_config_; // Grab ref to config selector. Use default if resolver didn't supply one. @@ -2287,34 +1507,25 @@ void ChannelData::UpdateServiceConfigInDataPlaneLocked() { config_selector = MakeRefCounted<DefaultConfigSelector>(saved_service_config_); } - // Get retry throttle data from service config. - const internal::ClientChannelGlobalParsedConfig* parsed_service_config = - static_cast<const internal::ClientChannelGlobalParsedConfig*>( - saved_service_config_->GetGlobalParsedConfig( - internal::ClientChannelServiceConfigParser::ParserIndex())); - absl::optional<internal::ClientChannelGlobalParsedConfig::RetryThrottling> - retry_throttle_config = parsed_service_config->retry_throttling(); - RefCountedPtr<ServerRetryThrottleData> retry_throttle_data; - if (retry_throttle_config.has_value()) { - retry_throttle_data = internal::ServerRetryThrottleMap::GetDataForServer( - server_name_, retry_throttle_config.value().max_milli_tokens, - retry_throttle_config.value().milli_token_ratio); - } - // Construct per-LB filter stack. + // Construct dynamic filter stack. std::vector<const grpc_channel_filter*> filters = config_selector->GetFilters(); - filters.push_back(&kDynamicTerminationFilterVtable); - absl::InlinedVector<grpc_arg, 2> args_to_add; - args_to_add.push_back(grpc_channel_arg_pointer_create( - const_cast<char*>(GRPC_ARG_CLIENT_CHANNEL_DATA), this, - &kChannelDataArgPointerVtable)); - if (retry_throttle_data != nullptr) { - args_to_add.push_back(grpc_channel_arg_pointer_create( - const_cast<char*>(GRPC_ARG_RETRY_THROTTLE_DATA), - retry_throttle_data.get(), &kRetryThrottleDataArgPointerVtable)); - } + if (enable_retries_) { + filters.push_back(&kRetryFilterVtable); + } else { + filters.push_back(&DynamicTerminationFilter::kFilterVtable); + } + absl::InlinedVector<grpc_arg, 2> args_to_add = { + grpc_channel_arg_pointer_create( + const_cast<char*>(GRPC_ARG_CLIENT_CHANNEL), this, + &kClientChannelArgPointerVtable), + grpc_channel_arg_pointer_create( + const_cast<char*>(GRPC_ARG_SERVICE_CONFIG_OBJ), service_config.get(), + &kServiceConfigObjArgPointerVtable), + }; grpc_channel_args* new_args = grpc_channel_args_copy_and_add( channel_args_, args_to_add.data(), args_to_add.size()); + new_args = config_selector->ModifyChannelArgs(new_args); RefCountedPtr<DynamicFilters> dynamic_filters = DynamicFilters::Create(new_args, std::move(filters)); GPR_ASSERT(dynamic_filters != nullptr); @@ -2339,7 +1550,7 @@ void ChannelData::UpdateServiceConfigInDataPlaneLocked() { call = call->next) { grpc_call_element* elem = call->elem; CallData* calld = static_cast<CallData*>(elem->call_data); - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; if (calld->CheckResolutionLocked(elem, &error)) { calld->AsyncResolutionDone(elem, error); } @@ -2349,7 +1560,7 @@ void ChannelData::UpdateServiceConfigInDataPlaneLocked() { // of scope. } -void ChannelData::CreateResolverLocked() { +void ClientChannel::CreateResolverLocked() { if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_routing_trace)) { gpr_log(GPR_INFO, "chand=%p: starting name resolution", this); } @@ -2368,7 +1579,7 @@ void ChannelData::CreateResolverLocked() { } } -void ChannelData::DestroyResolverAndLbPolicyLocked() { +void ClientChannel::DestroyResolverAndLbPolicyLocked() { if (resolver_ != nullptr) { if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_routing_trace)) { gpr_log(GPR_INFO, "chand=%p: shutting down resolver=%p", this, @@ -2387,14 +1598,27 @@ void ChannelData::DestroyResolverAndLbPolicyLocked() { } } -void ChannelData::UpdateStateAndPickerLocked( +void ClientChannel::UpdateStateAndPickerLocked( grpc_connectivity_state state, const absl::Status& status, const char* reason, std::unique_ptr<LoadBalancingPolicy::SubchannelPicker> picker) { - // Clean the control plane when entering IDLE. + // Special case for IDLE and SHUTDOWN states. if (picker == nullptr || state == GRPC_CHANNEL_SHUTDOWN) { saved_service_config_.reset(); saved_config_selector_.reset(); + // Acquire resolution lock to update config selector and associated state. + // To minimize lock contention, we wait to unref these objects until + // after we release the lock. + RefCountedPtr<ServiceConfig> service_config_to_unref; + RefCountedPtr<ConfigSelector> config_selector_to_unref; + RefCountedPtr<DynamicFilters> dynamic_filters_to_unref; + { + MutexLock lock(&resolution_mu_); + received_service_config_data_ = false; + service_config_to_unref = std::move(service_config_); + config_selector_to_unref = std::move(config_selector_); + dynamic_filters_to_unref = std::move(dynamic_filters_); + } } // Update connectivity state. state_tracker_.SetState(state, status, reason); @@ -2414,13 +1638,7 @@ void ChannelData::UpdateStateAndPickerLocked( // the refs until after we release the lock, and then unref them at // that point. This includes the following: // - refs to subchannel wrappers in the keys of pending_subchannel_updates_ - // - ref stored in service_config_ - // - ref stored in config_selector_ - // - ref stored in dynamic_filters_ // - ownership of the existing picker in picker_ - RefCountedPtr<ServiceConfig> service_config_to_unref; - RefCountedPtr<ConfigSelector> config_selector_to_unref; - RefCountedPtr<DynamicFilters> dynamic_filters_to_unref; { MutexLock lock(&data_plane_mu_); // Handle subchannel updates. @@ -2439,18 +1657,10 @@ void ChannelData::UpdateStateAndPickerLocked( // Swap out the picker. // Note: Original value will be destroyed after the lock is released. picker_.swap(picker); - // Clean the data plane if the updated picker is nullptr. - if (picker_ == nullptr || state == GRPC_CHANNEL_SHUTDOWN) { - received_service_config_data_ = false; - // Note: We save the objects to unref until after the lock is released. - service_config_to_unref = std::move(service_config_); - config_selector_to_unref = std::move(config_selector_); - dynamic_filters_to_unref = std::move(dynamic_filters_); - } // Re-process queued picks. for (LbQueuedCall* call = lb_queued_calls_; call != nullptr; call = call->next) { - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; if (call->lb_call->PickSubchannelLocked(&error)) { call->lb_call->AsyncPickDone(error); } @@ -2461,12 +1671,15 @@ void ChannelData::UpdateStateAndPickerLocked( pending_subchannel_updates_.clear(); } -grpc_error* ChannelData::DoPingLocked(grpc_transport_op* op) { +grpc_error_handle ClientChannel::DoPingLocked(grpc_transport_op* op) { if (state_tracker_.state() != GRPC_CHANNEL_READY) { return GRPC_ERROR_CREATE_FROM_STATIC_STRING("channel not connected"); } - LoadBalancingPolicy::PickResult result = - picker_->Pick(LoadBalancingPolicy::PickArgs()); + LoadBalancingPolicy::PickResult result; + { + MutexLock lock(&data_plane_mu_); + result = picker_->Pick(LoadBalancingPolicy::PickArgs()); + } ConnectedSubchannel* connected_subchannel = nullptr; if (result.subchannel != nullptr) { SubchannelWrapper* subchannel = @@ -2484,7 +1697,7 @@ grpc_error* ChannelData::DoPingLocked(grpc_transport_op* op) { return result.error; } -void ChannelData::StartTransportOpLocked(grpc_transport_op* op) { +void ClientChannel::StartTransportOpLocked(grpc_transport_op* op) { // Connectivity watch. if (op->start_connectivity_watch != nullptr) { state_tracker_.AddWatcher(op->start_connectivity_watch_state, @@ -2495,7 +1708,7 @@ void ChannelData::StartTransportOpLocked(grpc_transport_op* op) { } // Ping. if (op->send_ping.on_initiate != nullptr || op->send_ping.on_ack != nullptr) { - grpc_error* error = DoPingLocked(op); + grpc_error_handle error = DoPingLocked(op); if (error != GRPC_ERROR_NONE) { ExecCtx::Run(DEBUG_LOCATION, op->send_ping.on_initiate, GRPC_ERROR_REF(error)); @@ -2515,7 +1728,7 @@ void ChannelData::StartTransportOpLocked(grpc_transport_op* op) { if (op->disconnect_with_error != GRPC_ERROR_NONE) { if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_call_trace)) { gpr_log(GPR_INFO, "chand=%p: disconnect_with_error: %s", this, - grpc_error_string(op->disconnect_with_error)); + grpc_error_std_string(op->disconnect_with_error).c_str()); } DestroyResolverAndLbPolicyLocked(); intptr_t value; @@ -2543,9 +1756,9 @@ void ChannelData::StartTransportOpLocked(grpc_transport_op* op) { ExecCtx::Run(DEBUG_LOCATION, op->on_consumed, GRPC_ERROR_NONE); } -void ChannelData::StartTransportOp(grpc_channel_element* elem, - grpc_transport_op* op) { - ChannelData* chand = static_cast<ChannelData*>(elem->channel_data); +void ClientChannel::StartTransportOp(grpc_channel_element* elem, + grpc_transport_op* op) { + ClientChannel* chand = static_cast<ClientChannel*>(elem->channel_data); GPR_ASSERT(op->set_accept_stream == false); // Handle bind_pollset. if (op->bind_pollset != nullptr) { @@ -2554,12 +1767,15 @@ void ChannelData::StartTransportOp(grpc_channel_element* elem, // Pop into control plane work_serializer for remaining ops. GRPC_CHANNEL_STACK_REF(chand->owning_stack_, "start_transport_op"); chand->work_serializer_->Run( - [chand, op]() { chand->StartTransportOpLocked(op); }, DEBUG_LOCATION); + [chand, op]() ABSL_EXCLUSIVE_LOCKS_REQUIRED(chand->work_serializer_) { + chand->StartTransportOpLocked(op); + }, + DEBUG_LOCATION); } -void ChannelData::GetChannelInfo(grpc_channel_element* elem, - const grpc_channel_info* info) { - ChannelData* chand = static_cast<ChannelData*>(elem->channel_data); +void ClientChannel::GetChannelInfo(grpc_channel_element* elem, + const grpc_channel_info* info) { + ClientChannel* chand = static_cast<ClientChannel*>(elem->channel_data); MutexLock lock(&chand->info_mu_); if (info->lb_policy_name != nullptr) { *info->lb_policy_name = gpr_strdup(chand->info_lb_policy_name_.get()); @@ -2570,8 +1786,8 @@ void ChannelData::GetChannelInfo(grpc_channel_element* elem, } } -void ChannelData::AddLbQueuedCall(LbQueuedCall* call, - grpc_polling_entity* pollent) { +void ClientChannel::AddLbQueuedCall(LbQueuedCall* call, + grpc_polling_entity* pollent) { // Add call to queued picks list. call->next = lb_queued_calls_; lb_queued_calls_ = call; @@ -2580,8 +1796,8 @@ void ChannelData::AddLbQueuedCall(LbQueuedCall* call, grpc_polling_entity_add_to_pollset_set(pollent, interested_parties_); } -void ChannelData::RemoveLbQueuedCall(LbQueuedCall* to_remove, - grpc_polling_entity* pollent) { +void ClientChannel::RemoveLbQueuedCall(LbQueuedCall* to_remove, + grpc_polling_entity* pollent) { // Remove call's pollent from channel's interested_parties. grpc_polling_entity_del_from_pollset_set(pollent, interested_parties_); // Remove from queued picks list. @@ -2595,7 +1811,7 @@ void ChannelData::RemoveLbQueuedCall(LbQueuedCall* to_remove, } RefCountedPtr<ConnectedSubchannel> -ChannelData::GetConnectedSubchannelInDataPlane( +ClientChannel::GetConnectedSubchannelInDataPlane( SubchannelInterface* subchannel) const { SubchannelWrapper* subchannel_wrapper = static_cast<SubchannelWrapper*>(subchannel); @@ -2605,7 +1821,7 @@ ChannelData::GetConnectedSubchannelInDataPlane( return connected_subchannel->Ref(); } -void ChannelData::TryToConnectLocked() { +void ClientChannel::TryToConnectLocked() { if (lb_policy_ != nullptr) { lb_policy_->ExitIdleLocked(); } else if (resolver_ == nullptr) { @@ -2614,23 +1830,29 @@ void ChannelData::TryToConnectLocked() { GRPC_CHANNEL_STACK_UNREF(owning_stack_, "TryToConnect"); } -grpc_connectivity_state ChannelData::CheckConnectivityState( +grpc_connectivity_state ClientChannel::CheckConnectivityState( bool try_to_connect) { - grpc_connectivity_state out = state_tracker_.state(); + // state_tracker_ is guarded by work_serializer_, which we're not + // holding here. But the one method of state_tracker_ that *is* + // thread-safe to call without external synchronization is the state() + // method, so we can disable thread-safety analysis for this one read. + grpc_connectivity_state out = ABSL_TS_UNCHECKED_READ(state_tracker_).state(); if (out == GRPC_CHANNEL_IDLE && try_to_connect) { GRPC_CHANNEL_STACK_REF(owning_stack_, "TryToConnect"); - work_serializer_->Run([this]() { TryToConnectLocked(); }, DEBUG_LOCATION); + work_serializer_->Run([this]() ABSL_EXCLUSIVE_LOCKS_REQUIRED( + work_serializer_) { TryToConnectLocked(); }, + DEBUG_LOCATION); } return out; } -void ChannelData::AddConnectivityWatcher( +void ClientChannel::AddConnectivityWatcher( grpc_connectivity_state initial_state, OrphanablePtr<AsyncConnectivityStateWatcherInterface> watcher) { new ConnectivityWatcherAdder(this, initial_state, std::move(watcher)); } -void ChannelData::RemoveConnectivityWatcher( +void ClientChannel::RemoveConnectivityWatcher( AsyncConnectivityStateWatcherInterface* watcher) { new ConnectivityWatcherRemover(this, watcher); } @@ -2639,10 +1861,11 @@ void ChannelData::RemoveConnectivityWatcher( // CallData implementation // -CallData::CallData(grpc_call_element* elem, const ChannelData& chand, - const grpc_call_element_args& args) +ClientChannel::CallData::CallData(grpc_call_element* elem, + const ClientChannel& chand, + const grpc_call_element_args& args) : deadline_state_(elem, args, - GPR_LIKELY(chand.deadline_checking_enabled()) + GPR_LIKELY(chand.deadline_checking_enabled_) ? args.deadline : GRPC_MILLIS_INF_FUTURE), path_(grpc_slice_ref_internal(args.path)), @@ -2651,9 +1874,13 @@ CallData::CallData(grpc_call_element* elem, const ChannelData& chand, arena_(args.arena), owning_call_(args.call_stack), call_combiner_(args.call_combiner), - call_context_(args.context) {} + call_context_(args.context) { + if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_call_trace)) { + gpr_log(GPR_INFO, "chand=%p calld=%p: created call", &chand, this); + } +} -CallData::~CallData() { +ClientChannel::CallData::~CallData() { grpc_slice_unref_internal(path_); GRPC_ERROR_UNREF(cancel_error_); // Make sure there are no remaining pending batches. @@ -2662,16 +1889,16 @@ CallData::~CallData() { } } -grpc_error* CallData::Init(grpc_call_element* elem, - const grpc_call_element_args* args) { - ChannelData* chand = static_cast<ChannelData*>(elem->channel_data); +grpc_error_handle ClientChannel::CallData::Init( + grpc_call_element* elem, const grpc_call_element_args* args) { + ClientChannel* chand = static_cast<ClientChannel*>(elem->channel_data); new (elem->call_data) CallData(elem, *chand, *args); return GRPC_ERROR_NONE; } -void CallData::Destroy(grpc_call_element* elem, - const grpc_call_final_info* /*final_info*/, - grpc_closure* then_schedule_closure) { +void ClientChannel::CallData::Destroy( + grpc_call_element* elem, const grpc_call_final_info* /*final_info*/, + grpc_closure* then_schedule_closure) { CallData* calld = static_cast<CallData*>(elem->call_data); RefCountedPtr<DynamicFilters::Call> dynamic_call = std::move(calld->dynamic_call_); @@ -2684,12 +1911,12 @@ void CallData::Destroy(grpc_call_element* elem, } } -void CallData::StartTransportStreamOpBatch( +void ClientChannel::CallData::StartTransportStreamOpBatch( grpc_call_element* elem, grpc_transport_stream_op_batch* batch) { GPR_TIMER_SCOPE("cc_start_transport_stream_op_batch", 0); CallData* calld = static_cast<CallData*>(elem->call_data); - ChannelData* chand = static_cast<ChannelData*>(elem->channel_data); - if (GPR_LIKELY(chand->deadline_checking_enabled())) { + ClientChannel* chand = static_cast<ClientChannel*>(elem->channel_data); + if (GPR_LIKELY(chand->deadline_checking_enabled_)) { grpc_deadline_state_client_start_transport_stream_op_batch(elem, batch); } // Intercept recv_initial_metadata for config selector on-committed callback. @@ -2700,7 +1927,8 @@ void CallData::StartTransportStreamOpBatch( if (GPR_UNLIKELY(calld->cancel_error_ != GRPC_ERROR_NONE)) { if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_call_trace)) { gpr_log(GPR_INFO, "chand=%p calld=%p: failing batch with error: %s", - chand, calld, grpc_error_string(calld->cancel_error_)); + chand, calld, + grpc_error_std_string(calld->cancel_error_).c_str()); } // Note: This will release the call combiner. grpc_transport_stream_op_batch_finish_with_failure( @@ -2719,7 +1947,7 @@ void CallData::StartTransportStreamOpBatch( GRPC_ERROR_REF(batch->payload->cancel_stream.cancel_error); if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_call_trace)) { gpr_log(GPR_INFO, "chand=%p calld=%p: recording cancel_error=%s", chand, - calld, grpc_error_string(calld->cancel_error_)); + calld, grpc_error_std_string(calld->cancel_error_).c_str()); } // If we do not have a dynamic call (i.e., name resolution has not // yet completed), fail all pending batches. Otherwise, send the @@ -2773,8 +2001,8 @@ void CallData::StartTransportStreamOpBatch( } } -void CallData::SetPollent(grpc_call_element* elem, - grpc_polling_entity* pollent) { +void ClientChannel::CallData::SetPollent(grpc_call_element* elem, + grpc_polling_entity* pollent) { CallData* calld = static_cast<CallData*>(elem->call_data); calld->pollent_ = pollent; } @@ -2783,9 +2011,11 @@ void CallData::SetPollent(grpc_call_element* elem, // pending_batches management // -size_t CallData::GetBatchIndex(grpc_transport_stream_op_batch* batch) { +size_t ClientChannel::CallData::GetBatchIndex( + grpc_transport_stream_op_batch* batch) { // Note: It is important the send_initial_metadata be the first entry - // here, since the code in pick_subchannel_locked() assumes it will be. + // here, since the code in ApplyServiceConfigToCallLocked() and + // CheckResolutionLocked() assumes it will be. if (batch->send_initial_metadata) return 0; if (batch->send_message) return 1; if (batch->send_trailing_metadata) return 2; @@ -2796,9 +2026,9 @@ size_t CallData::GetBatchIndex(grpc_transport_stream_op_batch* batch) { } // This is called via the call combiner, so access to calld is synchronized. -void CallData::PendingBatchesAdd(grpc_call_element* elem, - grpc_transport_stream_op_batch* batch) { - ChannelData* chand = static_cast<ChannelData*>(elem->channel_data); +void ClientChannel::CallData::PendingBatchesAdd( + grpc_call_element* elem, grpc_transport_stream_op_batch* batch) { + ClientChannel* chand = static_cast<ClientChannel*>(elem->channel_data); const size_t idx = GetBatchIndex(batch); if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_call_trace)) { gpr_log(GPR_INFO, @@ -2811,7 +2041,8 @@ void CallData::PendingBatchesAdd(grpc_call_element* elem, } // This is called via the call combiner, so access to calld is synchronized. -void CallData::FailPendingBatchInCallCombiner(void* arg, grpc_error* error) { +void ClientChannel::CallData::FailPendingBatchInCallCombiner( + void* arg, grpc_error_handle error) { grpc_transport_stream_op_batch* batch = static_cast<grpc_transport_stream_op_batch*>(arg); CallData* calld = static_cast<CallData*>(batch->handler_private.extra_arg); @@ -2821,8 +2052,8 @@ void CallData::FailPendingBatchInCallCombiner(void* arg, grpc_error* error) { } // This is called via the call combiner, so access to calld is synchronized. -void CallData::PendingBatchesFail( - grpc_call_element* elem, grpc_error* error, +void ClientChannel::CallData::PendingBatchesFail( + grpc_call_element* elem, grpc_error_handle error, YieldCallCombinerPredicate yield_call_combiner_predicate) { GPR_ASSERT(error != GRPC_ERROR_NONE); if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_call_trace)) { @@ -2832,7 +2063,8 @@ void CallData::PendingBatchesFail( } gpr_log(GPR_INFO, "chand=%p calld=%p: failing %" PRIuPTR " pending batches: %s", - elem->channel_data, this, num_batches, grpc_error_string(error)); + elem->channel_data, this, num_batches, + grpc_error_std_string(error).c_str()); } CallCombinerClosureList closures; for (size_t i = 0; i < GPR_ARRAY_SIZE(pending_batches_); ++i) { @@ -2856,8 +2088,8 @@ void CallData::PendingBatchesFail( } // This is called via the call combiner, so access to calld is synchronized. -void CallData::ResumePendingBatchInCallCombiner(void* arg, - grpc_error* /*ignored*/) { +void ClientChannel::CallData::ResumePendingBatchInCallCombiner( + void* arg, grpc_error_handle /*ignored*/) { grpc_transport_stream_op_batch* batch = static_cast<grpc_transport_stream_op_batch*>(arg); auto* elem = @@ -2868,8 +2100,8 @@ void CallData::ResumePendingBatchInCallCombiner(void* arg, } // This is called via the call combiner, so access to calld is synchronized. -void CallData::PendingBatchesResume(grpc_call_element* elem) { - ChannelData* chand = static_cast<ChannelData*>(elem->channel_data); +void ClientChannel::CallData::PendingBatchesResume(grpc_call_element* elem) { + ClientChannel* chand = static_cast<ClientChannel*>(elem->channel_data); // Retries not enabled; send down batches as-is. if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_call_trace)) { size_t num_batches = 0; @@ -2903,7 +2135,7 @@ void CallData::PendingBatchesResume(grpc_call_element* elem) { // A class to handle the call combiner cancellation callback for a // queued pick. -class CallData::ResolverQueuedCallCanceller { +class ClientChannel::CallData::ResolverQueuedCallCanceller { public: explicit ResolverQueuedCallCanceller(grpc_call_element* elem) : elem_(elem) { auto* calld = static_cast<CallData*>(elem->call_data); @@ -2914,17 +2146,17 @@ class CallData::ResolverQueuedCallCanceller { } private: - static void CancelLocked(void* arg, grpc_error* error) { + static void CancelLocked(void* arg, grpc_error_handle error) { auto* self = static_cast<ResolverQueuedCallCanceller*>(arg); - auto* chand = static_cast<ChannelData*>(self->elem_->channel_data); + auto* chand = static_cast<ClientChannel*>(self->elem_->channel_data); auto* calld = static_cast<CallData*>(self->elem_->call_data); { - MutexLock lock(chand->resolution_mu()); + MutexLock lock(&chand->resolution_mu_); if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_routing_trace)) { gpr_log(GPR_INFO, "chand=%p calld=%p: cancelling resolver queued pick: " "error=%s self=%p calld->resolver_pick_canceller=%p", - chand, calld, grpc_error_string(error), self, + chand, calld, grpc_error_std_string(error).c_str(), self, calld->resolver_call_canceller_); } if (calld->resolver_call_canceller_ == self && error != GRPC_ERROR_NONE) { @@ -2943,10 +2175,10 @@ class CallData::ResolverQueuedCallCanceller { grpc_closure closure_; }; -void CallData::MaybeRemoveCallFromResolverQueuedCallsLocked( +void ClientChannel::CallData::MaybeRemoveCallFromResolverQueuedCallsLocked( grpc_call_element* elem) { if (!queued_pending_resolver_result_) return; - auto* chand = static_cast<ChannelData*>(elem->channel_data); + auto* chand = static_cast<ClientChannel*>(elem->channel_data); if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_routing_trace)) { gpr_log(GPR_INFO, "chand=%p calld=%p: removing from resolver queued picks list", @@ -2958,10 +2190,10 @@ void CallData::MaybeRemoveCallFromResolverQueuedCallsLocked( resolver_call_canceller_ = nullptr; } -void CallData::MaybeAddCallToResolverQueuedCallsLocked( +void ClientChannel::CallData::MaybeAddCallToResolverQueuedCallsLocked( grpc_call_element* elem) { if (queued_pending_resolver_result_) return; - auto* chand = static_cast<ChannelData*>(elem->channel_data); + auto* chand = static_cast<ClientChannel*>(elem->channel_data); if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_routing_trace)) { gpr_log(GPR_INFO, "chand=%p calld=%p: adding to resolver queued picks list", chand, this); @@ -2973,14 +2205,14 @@ void CallData::MaybeAddCallToResolverQueuedCallsLocked( resolver_call_canceller_ = new ResolverQueuedCallCanceller(elem); } -grpc_error* CallData::ApplyServiceConfigToCallLocked( +grpc_error_handle ClientChannel::CallData::ApplyServiceConfigToCallLocked( grpc_call_element* elem, grpc_metadata_batch* initial_metadata) { - ChannelData* chand = static_cast<ChannelData*>(elem->channel_data); + ClientChannel* chand = static_cast<ClientChannel*>(elem->channel_data); if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_routing_trace)) { gpr_log(GPR_INFO, "chand=%p calld=%p: applying service config to call", chand, this); } - ConfigSelector* config_selector = chand->config_selector(); + ConfigSelector* config_selector = chand->config_selector_.get(); if (config_selector != nullptr) { // Use the ConfigSelector to determine the config for the call. ConfigSelector::CallConfig call_config = @@ -3002,7 +2234,7 @@ grpc_error* CallData::ApplyServiceConfigToCallLocked( if (method_params != nullptr) { // If the deadline from the service config is shorter than the one // from the client API, reset the deadline timer. - if (chand->deadline_checking_enabled() && method_params->timeout() != 0) { + if (chand->deadline_checking_enabled_ && method_params->timeout() != 0) { const grpc_millis per_method_deadline = grpc_cycle_counter_to_millis_round_up(call_start_time_) + method_params->timeout(); @@ -3027,13 +2259,14 @@ grpc_error* CallData::ApplyServiceConfigToCallLocked( } } // Set the dynamic filter stack. - dynamic_filters_ = chand->dynamic_filters(); + dynamic_filters_ = chand->dynamic_filters_; } return GRPC_ERROR_NONE; } -void CallData::RecvInitialMetadataReadyForConfigSelectorCommitCallback( - void* arg, grpc_error* error) { +void ClientChannel::CallData:: + RecvInitialMetadataReadyForConfigSelectorCommitCallback( + void* arg, grpc_error_handle error) { auto* self = static_cast<CallData*>(arg); if (self->on_call_committed_ != nullptr) { self->on_call_committed_(); @@ -3046,8 +2279,9 @@ void CallData::RecvInitialMetadataReadyForConfigSelectorCommitCallback( // TODO(roth): Consider not intercepting this callback unless we // actually need to, if this causes a performance problem. -void CallData::InjectRecvInitialMetadataReadyForConfigSelectorCommitCallback( - grpc_transport_stream_op_batch* batch) { +void ClientChannel::CallData:: + InjectRecvInitialMetadataReadyForConfigSelectorCommitCallback( + grpc_transport_stream_op_batch* batch) { original_recv_initial_metadata_ready_ = batch->payload->recv_initial_metadata.recv_initial_metadata_ready; GRPC_CLOSURE_INIT(&recv_initial_metadata_ready_, @@ -3057,20 +2291,22 @@ void CallData::InjectRecvInitialMetadataReadyForConfigSelectorCommitCallback( &recv_initial_metadata_ready_; } -void CallData::AsyncResolutionDone(grpc_call_element* elem, grpc_error* error) { +void ClientChannel::CallData::AsyncResolutionDone(grpc_call_element* elem, + grpc_error_handle error) { GRPC_CLOSURE_INIT(&pick_closure_, ResolutionDone, elem, nullptr); ExecCtx::Run(DEBUG_LOCATION, &pick_closure_, error); } -void CallData::ResolutionDone(void* arg, grpc_error* error) { +void ClientChannel::CallData::ResolutionDone(void* arg, + grpc_error_handle error) { grpc_call_element* elem = static_cast<grpc_call_element*>(arg); - ChannelData* chand = static_cast<ChannelData*>(elem->channel_data); + ClientChannel* chand = static_cast<ClientChannel*>(elem->channel_data); CallData* calld = static_cast<CallData*>(elem->call_data); if (error != GRPC_ERROR_NONE) { if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_routing_trace)) { gpr_log(GPR_INFO, "chand=%p calld=%p: error applying config to call: error=%s", - chand, calld, grpc_error_string(error)); + chand, calld, grpc_error_std_string(error).c_str()); } calld->PendingBatchesFail(elem, GRPC_ERROR_REF(error), YieldCallCombiner); return; @@ -3078,13 +2314,14 @@ void CallData::ResolutionDone(void* arg, grpc_error* error) { calld->CreateDynamicCall(elem); } -void CallData::CheckResolution(void* arg, grpc_error* error) { +void ClientChannel::CallData::CheckResolution(void* arg, + grpc_error_handle error) { grpc_call_element* elem = static_cast<grpc_call_element*>(arg); CallData* calld = static_cast<CallData*>(elem->call_data); - ChannelData* chand = static_cast<ChannelData*>(elem->channel_data); + ClientChannel* chand = static_cast<ClientChannel*>(elem->channel_data); bool resolution_complete; { - MutexLock lock(chand->resolution_mu()); + MutexLock lock(&chand->resolution_mu_); resolution_complete = calld->CheckResolutionLocked(elem, &error); } if (resolution_complete) { @@ -3093,27 +2330,28 @@ void CallData::CheckResolution(void* arg, grpc_error* error) { } } -bool CallData::CheckResolutionLocked(grpc_call_element* elem, - grpc_error** error) { - ChannelData* chand = static_cast<ChannelData*>(elem->channel_data); +bool ClientChannel::CallData::CheckResolutionLocked(grpc_call_element* elem, + grpc_error_handle* error) { + ClientChannel* chand = static_cast<ClientChannel*>(elem->channel_data); // If we're still in IDLE, we need to start resolving. if (GPR_UNLIKELY(chand->CheckConnectivityState(false) == GRPC_CHANNEL_IDLE)) { // Bounce into the control plane work serializer to start resolving, // in case we are still in IDLE state. Since we are holding on to the // resolution mutex here, we offload it on the ExecCtx so that we don't // deadlock with ourselves. - GRPC_CHANNEL_STACK_REF(chand->owning_stack(), "CheckResolutionLocked"); + GRPC_CHANNEL_STACK_REF(chand->owning_stack_, "CheckResolutionLocked"); ExecCtx::Run( DEBUG_LOCATION, GRPC_CLOSURE_CREATE( - [](void* arg, grpc_error* /*error*/) { - auto* chand = static_cast<ChannelData*>(arg); - chand->work_serializer()->Run( - [chand]() { - chand->CheckConnectivityState(/*try_to_connect=*/true); - GRPC_CHANNEL_STACK_UNREF(chand->owning_stack(), - "CheckResolutionLocked"); - }, + [](void* arg, grpc_error_handle /*error*/) { + auto* chand = static_cast<ClientChannel*>(arg); + chand->work_serializer_->Run( + [chand]() + ABSL_EXCLUSIVE_LOCKS_REQUIRED(chand->work_serializer_) { + chand->CheckConnectivityState(/*try_to_connect=*/true); + GRPC_CHANNEL_STACK_UNREF(chand->owning_stack_, + "CheckResolutionLocked"); + }, DEBUG_LOCATION); }, chand, nullptr), @@ -3128,10 +2366,10 @@ bool CallData::CheckResolutionLocked(grpc_call_element* elem, send_initial_metadata.send_initial_metadata_flags; // If we don't yet have a resolver result, we need to queue the call // until we get one. - if (GPR_UNLIKELY(!chand->received_service_config_data())) { + if (GPR_UNLIKELY(!chand->received_service_config_data_)) { // If the resolver returned transient failure before returning the // first service config, fail any non-wait_for_ready calls. - grpc_error* resolver_error = chand->resolver_transient_failure_error(); + grpc_error_handle resolver_error = chand->resolver_transient_failure_error_; if (resolver_error != GRPC_ERROR_NONE && (send_initial_metadata_flags & GRPC_INITIAL_METADATA_WAIT_FOR_READY) == 0) { @@ -3154,8 +2392,8 @@ bool CallData::CheckResolutionLocked(grpc_call_element* elem, return true; } -void CallData::CreateDynamicCall(grpc_call_element* elem) { - auto* chand = static_cast<ChannelData*>(elem->channel_data); +void ClientChannel::CallData::CreateDynamicCall(grpc_call_element* elem) { + auto* chand = static_cast<ClientChannel*>(elem->channel_data); DynamicFilters::Call::Args args = {std::move(dynamic_filters_), pollent_, path_, @@ -3164,14 +2402,20 @@ void CallData::CreateDynamicCall(grpc_call_element* elem) { arena_, call_context_, call_combiner_}; - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; DynamicFilters* channel_stack = args.channel_stack.get(); + if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_routing_trace)) { + gpr_log( + GPR_INFO, + "chand=%p calld=%p: creating dynamic call stack on channel_stack=%p", + chand, this, channel_stack); + } dynamic_call_ = channel_stack->CreateCall(std::move(args), &error); if (error != GRPC_ERROR_NONE) { if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_routing_trace)) { gpr_log(GPR_INFO, "chand=%p calld=%p: failed to create dynamic call: error=%s", - chand, this, grpc_error_string(error)); + chand, this, grpc_error_std_string(error).c_str()); } PendingBatchesFail(elem, error, YieldCallCombiner); return; @@ -3180,1613 +2424,10 @@ void CallData::CreateDynamicCall(grpc_call_element* elem) { } // -// RetryingCall implementation +// ClientChannel::LoadBalancedCall::Metadata // -// Retry support: -// -// In order to support retries, we act as a proxy for stream op batches. -// When we get a batch from the surface, we add it to our list of pending -// batches, and we then use those batches to construct separate "child" -// batches to be started on the subchannel call. When the child batches -// return, we then decide which pending batches have been completed and -// schedule their callbacks accordingly. If a subchannel call fails and -// we want to retry it, we do a new pick and start again, constructing -// new "child" batches for the new subchannel call. -// -// Note that retries are committed when receiving data from the server -// (except for Trailers-Only responses). However, there may be many -// send ops started before receiving any data, so we may have already -// completed some number of send ops (and returned the completions up to -// the surface) by the time we realize that we need to retry. To deal -// with this, we cache data for send ops, so that we can replay them on a -// different subchannel call even after we have completed the original -// batches. -// -// There are two sets of data to maintain: -// - In call_data (in the parent channel), we maintain a list of pending -// ops and cached data for send ops. -// - In the subchannel call, we maintain state to indicate what ops have -// already been sent down to that call. -// -// When constructing the "child" batches, we compare those two sets of -// data to see which batches need to be sent to the subchannel call. - -// TODO(roth): In subsequent PRs: -// - add support for transparent retries (including initial metadata) -// - figure out how to record stats in census for retries -// (census filter is on top of this one) -// - add census stats for retries - -RetryingCall::RetryingCall( - ChannelData* chand, const grpc_call_element_args& args, - grpc_polling_entity* pollent, - RefCountedPtr<ServerRetryThrottleData> retry_throttle_data, - const ClientChannelMethodParsedConfig::RetryPolicy* retry_policy) - : chand_(chand), - pollent_(pollent), - retry_throttle_data_(std::move(retry_throttle_data)), - retry_policy_(retry_policy), - retry_backoff_( - BackOff::Options() - .set_initial_backoff( - retry_policy_ == nullptr ? 0 : retry_policy_->initial_backoff) - .set_multiplier(retry_policy_ == nullptr - ? 0 - : retry_policy_->backoff_multiplier) - .set_jitter(RETRY_BACKOFF_JITTER) - .set_max_backoff( - retry_policy_ == nullptr ? 0 : retry_policy_->max_backoff)), - path_(grpc_slice_ref_internal(args.path)), - call_start_time_(args.start_time), - deadline_(args.deadline), - arena_(args.arena), - owning_call_(args.call_stack), - call_combiner_(args.call_combiner), - call_context_(args.context), - pending_send_initial_metadata_(false), - pending_send_message_(false), - pending_send_trailing_metadata_(false), - enable_retries_(true), - retry_committed_(false), - last_attempt_got_server_pushback_(false) {} - -RetryingCall::~RetryingCall() { - grpc_slice_unref_internal(path_); - GRPC_ERROR_UNREF(cancel_error_); - // Make sure there are no remaining pending batches. - for (size_t i = 0; i < GPR_ARRAY_SIZE(pending_batches_); ++i) { - GPR_ASSERT(pending_batches_[i].batch == nullptr); - } -} - -void RetryingCall::StartTransportStreamOpBatch( - grpc_transport_stream_op_batch* batch) { - // If we've previously been cancelled, immediately fail any new batches. - if (GPR_UNLIKELY(cancel_error_ != GRPC_ERROR_NONE)) { - if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_call_trace)) { - gpr_log(GPR_INFO, - "chand=%p retrying_call=%p: failing batch with error: %s", chand_, - this, grpc_error_string(cancel_error_)); - } - // Note: This will release the call combiner. - grpc_transport_stream_op_batch_finish_with_failure( - batch, GRPC_ERROR_REF(cancel_error_), call_combiner_); - return; - } - // Handle cancellation. - if (GPR_UNLIKELY(batch->cancel_stream)) { - // Stash a copy of cancel_error in our call data, so that we can use - // it for subsequent operations. This ensures that if the call is - // cancelled before any batches are passed down (e.g., if the deadline - // is in the past when the call starts), we can return the right - // error to the caller when the first batch does get passed down. - GRPC_ERROR_UNREF(cancel_error_); - cancel_error_ = GRPC_ERROR_REF(batch->payload->cancel_stream.cancel_error); - if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_call_trace)) { - gpr_log(GPR_INFO, "chand=%p retrying_call=%p: recording cancel_error=%s", - chand_, this, grpc_error_string(cancel_error_)); - } - // If we do not have an LB call (i.e., a pick has not yet been started), - // fail all pending batches. Otherwise, send the cancellation down to the - // LB call. - if (lb_call_ == nullptr) { - // TODO(roth): If there is a pending retry callback, do we need to - // cancel it here? - PendingBatchesFail(GRPC_ERROR_REF(cancel_error_), NoYieldCallCombiner); - // Note: This will release the call combiner. - grpc_transport_stream_op_batch_finish_with_failure( - batch, GRPC_ERROR_REF(cancel_error_), call_combiner_); - } else { - // Note: This will release the call combiner. - lb_call_->StartTransportStreamOpBatch(batch); - } - return; - } - // Add the batch to the pending list. - PendingBatchesAdd(batch); - // Create LB call if needed. - // TODO(roth): If we get a new batch from the surface after the - // initial retry attempt has failed, while the retry timer is pending, - // we should queue the batch and not try to send it immediately. - if (lb_call_ == nullptr) { - // We do not yet have an LB call, so create one. - if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_call_trace)) { - gpr_log(GPR_INFO, "chand=%p retrying_call=%p: creating LB call", chand_, - this); - } - CreateLbCall(this, GRPC_ERROR_NONE); - return; - } - // Send batches to LB call. - if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_call_trace)) { - gpr_log(GPR_INFO, "chand=%p retrying_call=%p: starting batch on lb_call=%p", - chand_, this, lb_call_.get()); - } - PendingBatchesResume(); -} - -RefCountedPtr<SubchannelCall> RetryingCall::subchannel_call() const { - if (lb_call_ == nullptr) return nullptr; - return lb_call_->subchannel_call(); -} - -// -// send op data caching -// - -void RetryingCall::MaybeCacheSendOpsForBatch(PendingBatch* pending) { - if (pending->send_ops_cached) return; - pending->send_ops_cached = true; - grpc_transport_stream_op_batch* batch = pending->batch; - // Save a copy of metadata for send_initial_metadata ops. - if (batch->send_initial_metadata) { - seen_send_initial_metadata_ = true; - GPR_ASSERT(send_initial_metadata_storage_ == nullptr); - grpc_metadata_batch* send_initial_metadata = - batch->payload->send_initial_metadata.send_initial_metadata; - send_initial_metadata_storage_ = - static_cast<grpc_linked_mdelem*>(arena_->Alloc( - sizeof(grpc_linked_mdelem) * send_initial_metadata->list.count)); - grpc_metadata_batch_copy(send_initial_metadata, &send_initial_metadata_, - send_initial_metadata_storage_); - send_initial_metadata_flags_ = - batch->payload->send_initial_metadata.send_initial_metadata_flags; - peer_string_ = batch->payload->send_initial_metadata.peer_string; - } - // Set up cache for send_message ops. - if (batch->send_message) { - ByteStreamCache* cache = arena_->New<ByteStreamCache>( - std::move(batch->payload->send_message.send_message)); - send_messages_.push_back(cache); - } - // Save metadata batch for send_trailing_metadata ops. - if (batch->send_trailing_metadata) { - seen_send_trailing_metadata_ = true; - GPR_ASSERT(send_trailing_metadata_storage_ == nullptr); - grpc_metadata_batch* send_trailing_metadata = - batch->payload->send_trailing_metadata.send_trailing_metadata; - send_trailing_metadata_storage_ = - static_cast<grpc_linked_mdelem*>(arena_->Alloc( - sizeof(grpc_linked_mdelem) * send_trailing_metadata->list.count)); - grpc_metadata_batch_copy(send_trailing_metadata, &send_trailing_metadata_, - send_trailing_metadata_storage_); - } -} - -void RetryingCall::FreeCachedSendInitialMetadata() { - if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_call_trace)) { - gpr_log(GPR_INFO, - "chand=%p retrying_call=%p: destroying send_initial_metadata", - chand_, this); - } - grpc_metadata_batch_destroy(&send_initial_metadata_); -} - -void RetryingCall::FreeCachedSendMessage(size_t idx) { - if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_call_trace)) { - gpr_log(GPR_INFO, - "chand=%p retrying_call=%p: destroying send_messages[%" PRIuPTR "]", - chand_, this, idx); - } - send_messages_[idx]->Destroy(); -} - -void RetryingCall::FreeCachedSendTrailingMetadata() { - if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_call_trace)) { - gpr_log(GPR_INFO, - "chand_=%p retrying_call=%p: destroying send_trailing_metadata", - chand_, this); - } - grpc_metadata_batch_destroy(&send_trailing_metadata_); -} - -void RetryingCall::FreeCachedSendOpDataAfterCommit( - SubchannelCallRetryState* retry_state) { - if (retry_state->completed_send_initial_metadata) { - FreeCachedSendInitialMetadata(); - } - for (size_t i = 0; i < retry_state->completed_send_message_count; ++i) { - FreeCachedSendMessage(i); - } - if (retry_state->completed_send_trailing_metadata) { - FreeCachedSendTrailingMetadata(); - } -} - -void RetryingCall::FreeCachedSendOpDataForCompletedBatch( - SubchannelCallBatchData* batch_data, - SubchannelCallRetryState* retry_state) { - if (batch_data->batch.send_initial_metadata) { - FreeCachedSendInitialMetadata(); - } - if (batch_data->batch.send_message) { - FreeCachedSendMessage(retry_state->completed_send_message_count - 1); - } - if (batch_data->batch.send_trailing_metadata) { - FreeCachedSendTrailingMetadata(); - } -} - -// -// pending_batches management -// - -size_t RetryingCall::GetBatchIndex(grpc_transport_stream_op_batch* batch) { - // Note: It is important the send_initial_metadata be the first entry - // here, since the code in pick_subchannel_locked() assumes it will be. - if (batch->send_initial_metadata) return 0; - if (batch->send_message) return 1; - if (batch->send_trailing_metadata) return 2; - if (batch->recv_initial_metadata) return 3; - if (batch->recv_message) return 4; - if (batch->recv_trailing_metadata) return 5; - GPR_UNREACHABLE_CODE(return (size_t)-1); -} - -// This is called via the call combiner, so access to calld is synchronized. -void RetryingCall::PendingBatchesAdd(grpc_transport_stream_op_batch* batch) { - const size_t idx = GetBatchIndex(batch); - if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_call_trace)) { - gpr_log( - GPR_INFO, - "chand_=%p retrying_call=%p: adding pending batch at index %" PRIuPTR, - chand_, this, idx); - } - PendingBatch* pending = &pending_batches_[idx]; - GPR_ASSERT(pending->batch == nullptr); - pending->batch = batch; - pending->send_ops_cached = false; - if (enable_retries_) { - // Update state in calld about pending batches. - // Also check if the batch takes us over the retry buffer limit. - // Note: We don't check the size of trailing metadata here, because - // gRPC clients do not send trailing metadata. - if (batch->send_initial_metadata) { - pending_send_initial_metadata_ = true; - bytes_buffered_for_retry_ += grpc_metadata_batch_size( - batch->payload->send_initial_metadata.send_initial_metadata); - } - if (batch->send_message) { - pending_send_message_ = true; - bytes_buffered_for_retry_ += - batch->payload->send_message.send_message->length(); - } - if (batch->send_trailing_metadata) { - pending_send_trailing_metadata_ = true; - } - if (GPR_UNLIKELY(bytes_buffered_for_retry_ > - chand_->per_rpc_retry_buffer_size())) { - if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_call_trace)) { - gpr_log(GPR_INFO, - "chand=%p retrying_call=%p: exceeded retry buffer size, " - "committing", - chand_, this); - } - SubchannelCallRetryState* retry_state = - lb_call_ == nullptr ? nullptr - : static_cast<SubchannelCallRetryState*>( - lb_call_->GetParentData()); - RetryCommit(retry_state); - // If we are not going to retry and have not yet started, pretend - // retries are disabled so that we don't bother with retry overhead. - if (num_attempts_completed_ == 0) { - if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_call_trace)) { - gpr_log(GPR_INFO, - "chand=%p retrying_call=%p: disabling retries before first " - "attempt", - chand_, this); - } - // TODO(roth): Treat this as a commit? - enable_retries_ = false; - } - } - } -} - -void RetryingCall::PendingBatchClear(PendingBatch* pending) { - if (enable_retries_) { - if (pending->batch->send_initial_metadata) { - pending_send_initial_metadata_ = false; - } - if (pending->batch->send_message) { - pending_send_message_ = false; - } - if (pending->batch->send_trailing_metadata) { - pending_send_trailing_metadata_ = false; - } - } - pending->batch = nullptr; -} - -void RetryingCall::MaybeClearPendingBatch(PendingBatch* pending) { - grpc_transport_stream_op_batch* batch = pending->batch; - // We clear the pending batch if all of its callbacks have been - // scheduled and reset to nullptr. - if (batch->on_complete == nullptr && - (!batch->recv_initial_metadata || - batch->payload->recv_initial_metadata.recv_initial_metadata_ready == - nullptr) && - (!batch->recv_message || - batch->payload->recv_message.recv_message_ready == nullptr) && - (!batch->recv_trailing_metadata || - batch->payload->recv_trailing_metadata.recv_trailing_metadata_ready == - nullptr)) { - if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_call_trace)) { - gpr_log(GPR_INFO, "chand=%p retrying_call=%p: clearing pending batch", - chand_, this); - } - PendingBatchClear(pending); - } -} - -// This is called via the call combiner, so access to calld is synchronized. -void RetryingCall::FailPendingBatchInCallCombiner(void* arg, - grpc_error* error) { - grpc_transport_stream_op_batch* batch = - static_cast<grpc_transport_stream_op_batch*>(arg); - RetryingCall* call = - static_cast<RetryingCall*>(batch->handler_private.extra_arg); - // Note: This will release the call combiner. - grpc_transport_stream_op_batch_finish_with_failure( - batch, GRPC_ERROR_REF(error), call->call_combiner_); -} - -// This is called via the call combiner, so access to calld is synchronized. -void RetryingCall::PendingBatchesFail( - grpc_error* error, - YieldCallCombinerPredicate yield_call_combiner_predicate) { - GPR_ASSERT(error != GRPC_ERROR_NONE); - if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_call_trace)) { - size_t num_batches = 0; - for (size_t i = 0; i < GPR_ARRAY_SIZE(pending_batches_); ++i) { - if (pending_batches_[i].batch != nullptr) ++num_batches; - } - gpr_log(GPR_INFO, - "chand=%p retrying_call=%p: failing %" PRIuPTR - " pending batches: %s", - chand_, this, num_batches, grpc_error_string(error)); - } - CallCombinerClosureList closures; - for (size_t i = 0; i < GPR_ARRAY_SIZE(pending_batches_); ++i) { - PendingBatch* pending = &pending_batches_[i]; - grpc_transport_stream_op_batch* batch = pending->batch; - if (batch != nullptr) { - batch->handler_private.extra_arg = this; - GRPC_CLOSURE_INIT(&batch->handler_private.closure, - FailPendingBatchInCallCombiner, batch, - grpc_schedule_on_exec_ctx); - closures.Add(&batch->handler_private.closure, GRPC_ERROR_REF(error), - "PendingBatchesFail"); - PendingBatchClear(pending); - } - } - if (yield_call_combiner_predicate(closures)) { - closures.RunClosures(call_combiner_); - } else { - closures.RunClosuresWithoutYielding(call_combiner_); - } - GRPC_ERROR_UNREF(error); -} - -// This is called via the call combiner, so access to calld is synchronized. -void RetryingCall::ResumePendingBatchInCallCombiner(void* arg, - grpc_error* /*ignored*/) { - grpc_transport_stream_op_batch* batch = - static_cast<grpc_transport_stream_op_batch*>(arg); - auto* lb_call = - static_cast<LoadBalancedCall*>(batch->handler_private.extra_arg); - // Note: This will release the call combiner. - lb_call->StartTransportStreamOpBatch(batch); -} - -// This is called via the call combiner, so access to calld is synchronized. -void RetryingCall::PendingBatchesResume() { - if (enable_retries_) { - StartRetriableSubchannelBatches(this, GRPC_ERROR_NONE); - return; - } - // Retries not enabled; send down batches as-is. - if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_call_trace)) { - size_t num_batches = 0; - for (size_t i = 0; i < GPR_ARRAY_SIZE(pending_batches_); ++i) { - if (pending_batches_[i].batch != nullptr) ++num_batches; - } - gpr_log(GPR_INFO, - "chand=%p retrying_call=%p: starting %" PRIuPTR - " pending batches on lb_call=%p", - chand_, this, num_batches, lb_call_.get()); - } - CallCombinerClosureList closures; - for (size_t i = 0; i < GPR_ARRAY_SIZE(pending_batches_); ++i) { - PendingBatch* pending = &pending_batches_[i]; - grpc_transport_stream_op_batch* batch = pending->batch; - if (batch != nullptr) { - batch->handler_private.extra_arg = lb_call_.get(); - GRPC_CLOSURE_INIT(&batch->handler_private.closure, - ResumePendingBatchInCallCombiner, batch, nullptr); - closures.Add(&batch->handler_private.closure, GRPC_ERROR_NONE, - "PendingBatchesResume"); - PendingBatchClear(pending); - } - } - // Note: This will release the call combiner. - closures.RunClosures(call_combiner_); -} - -template <typename Predicate> -RetryingCall::PendingBatch* RetryingCall::PendingBatchFind( - const char* log_message, Predicate predicate) { - for (size_t i = 0; i < GPR_ARRAY_SIZE(pending_batches_); ++i) { - PendingBatch* pending = &pending_batches_[i]; - grpc_transport_stream_op_batch* batch = pending->batch; - if (batch != nullptr && predicate(batch)) { - if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_call_trace)) { - gpr_log( - GPR_INFO, - "chand=%p retrying_call=%p: %s pending batch at index %" PRIuPTR, - chand_, this, log_message, i); - } - return pending; - } - } - return nullptr; -} - -// -// retry code -// - -void RetryingCall::RetryCommit(SubchannelCallRetryState* retry_state) { - if (retry_committed_) return; - retry_committed_ = true; - if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_call_trace)) { - gpr_log(GPR_INFO, "chand=%p retrying_call=%p: committing retries", chand_, - this); - } - if (retry_state != nullptr) { - FreeCachedSendOpDataAfterCommit(retry_state); - } -} - -void RetryingCall::DoRetry(SubchannelCallRetryState* retry_state, - grpc_millis server_pushback_ms) { - GPR_ASSERT(retry_policy_ != nullptr); - // Reset LB call. - lb_call_.reset(); - // Compute backoff delay. - grpc_millis next_attempt_time; - if (server_pushback_ms >= 0) { - next_attempt_time = ExecCtx::Get()->Now() + server_pushback_ms; - last_attempt_got_server_pushback_ = true; - } else { - if (num_attempts_completed_ == 1 || last_attempt_got_server_pushback_) { - last_attempt_got_server_pushback_ = false; - } - next_attempt_time = retry_backoff_.NextAttemptTime(); - } - if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_call_trace)) { - gpr_log(GPR_INFO, - "chand=%p retrying_call=%p: retrying failed call in %" PRId64 " ms", - chand_, this, next_attempt_time - ExecCtx::Get()->Now()); - } - // Schedule retry after computed delay. - GRPC_CLOSURE_INIT(&retry_closure_, CreateLbCall, this, nullptr); - grpc_timer_init(&retry_timer_, next_attempt_time, &retry_closure_); - // Update bookkeeping. - if (retry_state != nullptr) retry_state->retry_dispatched = true; -} - -bool RetryingCall::MaybeRetry(SubchannelCallBatchData* batch_data, - grpc_status_code status, - grpc_mdelem* server_pushback_md) { - // Get retry policy. - if (retry_policy_ == nullptr) return false; - // If we've already dispatched a retry from this call, return true. - // This catches the case where the batch has multiple callbacks - // (i.e., it includes either recv_message or recv_initial_metadata). - SubchannelCallRetryState* retry_state = nullptr; - if (batch_data != nullptr) { - retry_state = static_cast<SubchannelCallRetryState*>( - batch_data->lb_call->GetParentData()); - if (retry_state->retry_dispatched) { - if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_call_trace)) { - gpr_log(GPR_INFO, "chand=%p retrying_call=%p: retry already dispatched", - chand_, this); - } - return true; - } - } - // Check status. - if (GPR_LIKELY(status == GRPC_STATUS_OK)) { - if (retry_throttle_data_ != nullptr) { - retry_throttle_data_->RecordSuccess(); - } - if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_call_trace)) { - gpr_log(GPR_INFO, "chand=%p retrying_call=%p: call succeeded", chand_, - this); - } - return false; - } - // Status is not OK. Check whether the status is retryable. - if (!retry_policy_->retryable_status_codes.Contains(status)) { - if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_call_trace)) { - gpr_log( - GPR_INFO, - "chand=%p retrying_call=%p: status %s not configured as retryable", - chand_, this, grpc_status_code_to_string(status)); - } - return false; - } - // Record the failure and check whether retries are throttled. - // Note that it's important for this check to come after the status - // code check above, since we should only record failures whose statuses - // match the configured retryable status codes, so that we don't count - // things like failures due to malformed requests (INVALID_ARGUMENT). - // Conversely, it's important for this to come before the remaining - // checks, so that we don't fail to record failures due to other factors. - if (retry_throttle_data_ != nullptr && - !retry_throttle_data_->RecordFailure()) { - if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_call_trace)) { - gpr_log(GPR_INFO, "chand=%p retrying_call=%p: retries throttled", chand_, - this); - } - return false; - } - // Check whether the call is committed. - if (retry_committed_) { - if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_call_trace)) { - gpr_log(GPR_INFO, "chand=%p retrying_call=%p: retries already committed", - chand_, this); - } - return false; - } - // Check whether we have retries remaining. - ++num_attempts_completed_; - if (num_attempts_completed_ >= retry_policy_->max_attempts) { - if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_call_trace)) { - gpr_log(GPR_INFO, "chand=%p retrying_call=%p: exceeded %d retry attempts", - chand_, this, retry_policy_->max_attempts); - } - return false; - } - // If the call was cancelled from the surface, don't retry. - if (cancel_error_ != GRPC_ERROR_NONE) { - if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_call_trace)) { - gpr_log(GPR_INFO, - "chand=%p retrying_call=%p: call cancelled from surface, not " - "retrying", - chand_, this); - } - return false; - } - // Check server push-back. - grpc_millis server_pushback_ms = -1; - if (server_pushback_md != nullptr) { - // If the value is "-1" or any other unparseable string, we do not retry. - uint32_t ms; - if (!grpc_parse_slice_to_uint32(GRPC_MDVALUE(*server_pushback_md), &ms)) { - if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_call_trace)) { - gpr_log( - GPR_INFO, - "chand=%p retrying_call=%p: not retrying due to server push-back", - chand_, this); - } - return false; - } else { - if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_call_trace)) { - gpr_log(GPR_INFO, - "chand=%p retrying_call=%p: server push-back: retry in %u ms", - chand_, this, ms); - } - server_pushback_ms = static_cast<grpc_millis>(ms); - } - } - DoRetry(retry_state, server_pushback_ms); - return true; -} - -// -// RetryingCall::SubchannelCallBatchData -// - -RetryingCall::SubchannelCallBatchData* -RetryingCall::SubchannelCallBatchData::Create(RetryingCall* call, int refcount, - bool set_on_complete) { - return call->arena_->New<SubchannelCallBatchData>(call, refcount, - set_on_complete); -} - -RetryingCall::SubchannelCallBatchData::SubchannelCallBatchData( - RetryingCall* call, int refcount, bool set_on_complete) - : call(call), lb_call(call->lb_call_) { - SubchannelCallRetryState* retry_state = - static_cast<SubchannelCallRetryState*>(lb_call->GetParentData()); - batch.payload = &retry_state->batch_payload; - gpr_ref_init(&refs, refcount); - if (set_on_complete) { - GRPC_CLOSURE_INIT(&on_complete, RetryingCall::OnComplete, this, - grpc_schedule_on_exec_ctx); - batch.on_complete = &on_complete; - } - GRPC_CALL_STACK_REF(call->owning_call_, "batch_data"); -} - -void RetryingCall::SubchannelCallBatchData::Destroy() { - SubchannelCallRetryState* retry_state = - static_cast<SubchannelCallRetryState*>(lb_call->GetParentData()); - if (batch.send_initial_metadata) { - grpc_metadata_batch_destroy(&retry_state->send_initial_metadata); - } - if (batch.send_trailing_metadata) { - grpc_metadata_batch_destroy(&retry_state->send_trailing_metadata); - } - if (batch.recv_initial_metadata) { - grpc_metadata_batch_destroy(&retry_state->recv_initial_metadata); - } - if (batch.recv_trailing_metadata) { - grpc_metadata_batch_destroy(&retry_state->recv_trailing_metadata); - } - lb_call.reset(); - GRPC_CALL_STACK_UNREF(call->owning_call_, "batch_data"); -} - -// -// recv_initial_metadata callback handling -// - -void RetryingCall::InvokeRecvInitialMetadataCallback(void* arg, - grpc_error* error) { - SubchannelCallBatchData* batch_data = - static_cast<SubchannelCallBatchData*>(arg); - // Find pending batch. - PendingBatch* pending = batch_data->call->PendingBatchFind( - "invoking recv_initial_metadata_ready for", - [](grpc_transport_stream_op_batch* batch) { - return batch->recv_initial_metadata && - batch->payload->recv_initial_metadata - .recv_initial_metadata_ready != nullptr; - }); - GPR_ASSERT(pending != nullptr); - // Return metadata. - SubchannelCallRetryState* retry_state = - static_cast<SubchannelCallRetryState*>( - batch_data->lb_call->GetParentData()); - grpc_metadata_batch_move( - &retry_state->recv_initial_metadata, - pending->batch->payload->recv_initial_metadata.recv_initial_metadata); - // Update bookkeeping. - // Note: Need to do this before invoking the callback, since invoking - // the callback will result in yielding the call combiner. - grpc_closure* recv_initial_metadata_ready = - pending->batch->payload->recv_initial_metadata - .recv_initial_metadata_ready; - pending->batch->payload->recv_initial_metadata.recv_initial_metadata_ready = - nullptr; - batch_data->call->MaybeClearPendingBatch(pending); - batch_data->Unref(); - // Invoke callback. - Closure::Run(DEBUG_LOCATION, recv_initial_metadata_ready, - GRPC_ERROR_REF(error)); -} - -void RetryingCall::RecvInitialMetadataReady(void* arg, grpc_error* error) { - SubchannelCallBatchData* batch_data = - static_cast<SubchannelCallBatchData*>(arg); - RetryingCall* call = batch_data->call; - if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_call_trace)) { - gpr_log( - GPR_INFO, - "chand=%p retrying_call=%p: got recv_initial_metadata_ready, error=%s", - call->chand_, call, grpc_error_string(error)); - } - SubchannelCallRetryState* retry_state = - static_cast<SubchannelCallRetryState*>( - batch_data->lb_call->GetParentData()); - retry_state->completed_recv_initial_metadata = true; - // If a retry was already dispatched, then we're not going to use the - // result of this recv_initial_metadata op, so do nothing. - if (retry_state->retry_dispatched) { - GRPC_CALL_COMBINER_STOP( - call->call_combiner_, - "recv_initial_metadata_ready after retry dispatched"); - return; - } - // If we got an error or a Trailers-Only response and have not yet gotten - // the recv_trailing_metadata_ready callback, then defer propagating this - // callback back to the surface. We can evaluate whether to retry when - // recv_trailing_metadata comes back. - if (GPR_UNLIKELY((retry_state->trailing_metadata_available || - error != GRPC_ERROR_NONE) && - !retry_state->completed_recv_trailing_metadata)) { - if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_call_trace)) { - gpr_log( - GPR_INFO, - "chand=%p retrying_call=%p: deferring recv_initial_metadata_ready " - "(Trailers-Only)", - call->chand_, call); - } - retry_state->recv_initial_metadata_ready_deferred_batch = batch_data; - retry_state->recv_initial_metadata_error = GRPC_ERROR_REF(error); - if (!retry_state->started_recv_trailing_metadata) { - // recv_trailing_metadata not yet started by application; start it - // ourselves to get status. - call->StartInternalRecvTrailingMetadata(); - } else { - GRPC_CALL_COMBINER_STOP( - call->call_combiner_, - "recv_initial_metadata_ready trailers-only or error"); - } - return; - } - // Received valid initial metadata, so commit the call. - call->RetryCommit(retry_state); - // Invoke the callback to return the result to the surface. - // Manually invoking a callback function; it does not take ownership of error. - call->InvokeRecvInitialMetadataCallback(batch_data, error); -} - -// -// recv_message callback handling -// - -void RetryingCall::InvokeRecvMessageCallback(void* arg, grpc_error* error) { - SubchannelCallBatchData* batch_data = - static_cast<SubchannelCallBatchData*>(arg); - RetryingCall* call = batch_data->call; - // Find pending op. - PendingBatch* pending = call->PendingBatchFind( - "invoking recv_message_ready for", - [](grpc_transport_stream_op_batch* batch) { - return batch->recv_message && - batch->payload->recv_message.recv_message_ready != nullptr; - }); - GPR_ASSERT(pending != nullptr); - // Return payload. - SubchannelCallRetryState* retry_state = - static_cast<SubchannelCallRetryState*>( - batch_data->lb_call->GetParentData()); - *pending->batch->payload->recv_message.recv_message = - std::move(retry_state->recv_message); - // Update bookkeeping. - // Note: Need to do this before invoking the callback, since invoking - // the callback will result in yielding the call combiner. - grpc_closure* recv_message_ready = - pending->batch->payload->recv_message.recv_message_ready; - pending->batch->payload->recv_message.recv_message_ready = nullptr; - call->MaybeClearPendingBatch(pending); - batch_data->Unref(); - // Invoke callback. - Closure::Run(DEBUG_LOCATION, recv_message_ready, GRPC_ERROR_REF(error)); -} - -void RetryingCall::RecvMessageReady(void* arg, grpc_error* error) { - SubchannelCallBatchData* batch_data = - static_cast<SubchannelCallBatchData*>(arg); - RetryingCall* call = batch_data->call; - if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_call_trace)) { - gpr_log(GPR_INFO, - "chand=%p retrying_call=%p: got recv_message_ready, error=%s", - call->chand_, call, grpc_error_string(error)); - } - SubchannelCallRetryState* retry_state = - static_cast<SubchannelCallRetryState*>( - batch_data->lb_call->GetParentData()); - ++retry_state->completed_recv_message_count; - // If a retry was already dispatched, then we're not going to use the - // result of this recv_message op, so do nothing. - if (retry_state->retry_dispatched) { - GRPC_CALL_COMBINER_STOP(call->call_combiner_, - "recv_message_ready after retry dispatched"); - return; - } - // If we got an error or the payload was nullptr and we have not yet gotten - // the recv_trailing_metadata_ready callback, then defer propagating this - // callback back to the surface. We can evaluate whether to retry when - // recv_trailing_metadata comes back. - if (GPR_UNLIKELY( - (retry_state->recv_message == nullptr || error != GRPC_ERROR_NONE) && - !retry_state->completed_recv_trailing_metadata)) { - if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_call_trace)) { - gpr_log( - GPR_INFO, - "chand=%p retrying_call=%p: deferring recv_message_ready (nullptr " - "message and recv_trailing_metadata pending)", - call->chand_, call); - } - retry_state->recv_message_ready_deferred_batch = batch_data; - retry_state->recv_message_error = GRPC_ERROR_REF(error); - if (!retry_state->started_recv_trailing_metadata) { - // recv_trailing_metadata not yet started by application; start it - // ourselves to get status. - call->StartInternalRecvTrailingMetadata(); - } else { - GRPC_CALL_COMBINER_STOP(call->call_combiner_, "recv_message_ready null"); - } - return; - } - // Received a valid message, so commit the call. - call->RetryCommit(retry_state); - // Invoke the callback to return the result to the surface. - // Manually invoking a callback function; it does not take ownership of error. - call->InvokeRecvMessageCallback(batch_data, error); -} - -// -// recv_trailing_metadata handling -// - -void RetryingCall::GetCallStatus(grpc_metadata_batch* md_batch, - grpc_error* error, grpc_status_code* status, - grpc_mdelem** server_pushback_md) { - if (error != GRPC_ERROR_NONE) { - grpc_error_get_status(error, deadline_, status, nullptr, nullptr, nullptr); - } else { - GPR_ASSERT(md_batch->idx.named.grpc_status != nullptr); - *status = - grpc_get_status_code_from_metadata(md_batch->idx.named.grpc_status->md); - if (server_pushback_md != nullptr && - md_batch->idx.named.grpc_retry_pushback_ms != nullptr) { - *server_pushback_md = &md_batch->idx.named.grpc_retry_pushback_ms->md; - } - } - GRPC_ERROR_UNREF(error); -} - -void RetryingCall::AddClosureForRecvTrailingMetadataReady( - SubchannelCallBatchData* batch_data, grpc_error* error, - CallCombinerClosureList* closures) { - // Find pending batch. - PendingBatch* pending = PendingBatchFind( - "invoking recv_trailing_metadata for", - [](grpc_transport_stream_op_batch* batch) { - return batch->recv_trailing_metadata && - batch->payload->recv_trailing_metadata - .recv_trailing_metadata_ready != nullptr; - }); - // If we generated the recv_trailing_metadata op internally via - // StartInternalRecvTrailingMetadata(), then there will be no pending batch. - if (pending == nullptr) { - GRPC_ERROR_UNREF(error); - return; - } - // Return metadata. - SubchannelCallRetryState* retry_state = - static_cast<SubchannelCallRetryState*>( - batch_data->lb_call->GetParentData()); - grpc_metadata_batch_move( - &retry_state->recv_trailing_metadata, - pending->batch->payload->recv_trailing_metadata.recv_trailing_metadata); - // Add closure. - closures->Add(pending->batch->payload->recv_trailing_metadata - .recv_trailing_metadata_ready, - error, "recv_trailing_metadata_ready for pending batch"); - // Update bookkeeping. - pending->batch->payload->recv_trailing_metadata.recv_trailing_metadata_ready = - nullptr; - MaybeClearPendingBatch(pending); -} - -void RetryingCall::AddClosuresForDeferredRecvCallbacks( - SubchannelCallBatchData* batch_data, SubchannelCallRetryState* retry_state, - CallCombinerClosureList* closures) { - if (batch_data->batch.recv_trailing_metadata) { - // Add closure for deferred recv_initial_metadata_ready. - if (GPR_UNLIKELY(retry_state->recv_initial_metadata_ready_deferred_batch != - nullptr)) { - GRPC_CLOSURE_INIT(&retry_state->recv_initial_metadata_ready, - InvokeRecvInitialMetadataCallback, - retry_state->recv_initial_metadata_ready_deferred_batch, - grpc_schedule_on_exec_ctx); - closures->Add(&retry_state->recv_initial_metadata_ready, - retry_state->recv_initial_metadata_error, - "resuming recv_initial_metadata_ready"); - retry_state->recv_initial_metadata_ready_deferred_batch = nullptr; - } - // Add closure for deferred recv_message_ready. - if (GPR_UNLIKELY(retry_state->recv_message_ready_deferred_batch != - nullptr)) { - GRPC_CLOSURE_INIT(&retry_state->recv_message_ready, - InvokeRecvMessageCallback, - retry_state->recv_message_ready_deferred_batch, - grpc_schedule_on_exec_ctx); - closures->Add(&retry_state->recv_message_ready, - retry_state->recv_message_error, - "resuming recv_message_ready"); - retry_state->recv_message_ready_deferred_batch = nullptr; - } - } -} - -bool RetryingCall::PendingBatchIsUnstarted( - PendingBatch* pending, SubchannelCallRetryState* retry_state) { - if (pending->batch == nullptr || pending->batch->on_complete == nullptr) { - return false; - } - if (pending->batch->send_initial_metadata && - !retry_state->started_send_initial_metadata) { - return true; - } - if (pending->batch->send_message && - retry_state->started_send_message_count < send_messages_.size()) { - return true; - } - if (pending->batch->send_trailing_metadata && - !retry_state->started_send_trailing_metadata) { - return true; - } - return false; -} - -void RetryingCall::AddClosuresToFailUnstartedPendingBatches( - SubchannelCallRetryState* retry_state, grpc_error* error, - CallCombinerClosureList* closures) { - for (size_t i = 0; i < GPR_ARRAY_SIZE(pending_batches_); ++i) { - PendingBatch* pending = &pending_batches_[i]; - if (PendingBatchIsUnstarted(pending, retry_state)) { - if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_call_trace)) { - gpr_log(GPR_INFO, - "chand=%p retrying_call=%p: failing unstarted pending batch at " - "index " - "%" PRIuPTR, - chand_, this, i); - } - closures->Add(pending->batch->on_complete, GRPC_ERROR_REF(error), - "failing on_complete for pending batch"); - pending->batch->on_complete = nullptr; - MaybeClearPendingBatch(pending); - } - } - GRPC_ERROR_UNREF(error); -} - -void RetryingCall::RunClosuresForCompletedCall( - SubchannelCallBatchData* batch_data, grpc_error* error) { - SubchannelCallRetryState* retry_state = - static_cast<SubchannelCallRetryState*>( - batch_data->lb_call->GetParentData()); - // Construct list of closures to execute. - CallCombinerClosureList closures; - // First, add closure for recv_trailing_metadata_ready. - AddClosureForRecvTrailingMetadataReady(batch_data, GRPC_ERROR_REF(error), - &closures); - // If there are deferred recv_initial_metadata_ready or recv_message_ready - // callbacks, add them to closures. - AddClosuresForDeferredRecvCallbacks(batch_data, retry_state, &closures); - // Add closures to fail any pending batches that have not yet been started. - AddClosuresToFailUnstartedPendingBatches(retry_state, GRPC_ERROR_REF(error), - &closures); - // Don't need batch_data anymore. - batch_data->Unref(); - // Schedule all of the closures identified above. - // Note: This will release the call combiner. - closures.RunClosures(call_combiner_); - GRPC_ERROR_UNREF(error); -} - -void RetryingCall::RecvTrailingMetadataReady(void* arg, grpc_error* error) { - SubchannelCallBatchData* batch_data = - static_cast<SubchannelCallBatchData*>(arg); - RetryingCall* call = batch_data->call; - if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_call_trace)) { - gpr_log( - GPR_INFO, - "chand=%p retrying_call=%p: got recv_trailing_metadata_ready, error=%s", - call->chand_, call, grpc_error_string(error)); - } - SubchannelCallRetryState* retry_state = - static_cast<SubchannelCallRetryState*>( - batch_data->lb_call->GetParentData()); - retry_state->completed_recv_trailing_metadata = true; - // Get the call's status and check for server pushback metadata. - grpc_status_code status = GRPC_STATUS_OK; - grpc_mdelem* server_pushback_md = nullptr; - grpc_metadata_batch* md_batch = - batch_data->batch.payload->recv_trailing_metadata.recv_trailing_metadata; - call->GetCallStatus(md_batch, GRPC_ERROR_REF(error), &status, - &server_pushback_md); - if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_call_trace)) { - gpr_log(GPR_INFO, "chand=%p retrying_call=%p: call finished, status=%s", - call->chand_, call, grpc_status_code_to_string(status)); - } - // Check if we should retry. - if (call->MaybeRetry(batch_data, status, server_pushback_md)) { - // Unref batch_data for deferred recv_initial_metadata_ready or - // recv_message_ready callbacks, if any. - if (retry_state->recv_initial_metadata_ready_deferred_batch != nullptr) { - batch_data->Unref(); - GRPC_ERROR_UNREF(retry_state->recv_initial_metadata_error); - } - if (retry_state->recv_message_ready_deferred_batch != nullptr) { - batch_data->Unref(); - GRPC_ERROR_UNREF(retry_state->recv_message_error); - } - batch_data->Unref(); - return; - } - // Not retrying, so commit the call. - call->RetryCommit(retry_state); - // Run any necessary closures. - call->RunClosuresForCompletedCall(batch_data, GRPC_ERROR_REF(error)); -} - -// -// on_complete callback handling -// - -void RetryingCall::AddClosuresForCompletedPendingBatch( - SubchannelCallBatchData* batch_data, grpc_error* error, - CallCombinerClosureList* closures) { - PendingBatch* pending = PendingBatchFind( - "completed", [batch_data](grpc_transport_stream_op_batch* batch) { - // Match the pending batch with the same set of send ops as the - // subchannel batch we've just completed. - return batch->on_complete != nullptr && - batch_data->batch.send_initial_metadata == - batch->send_initial_metadata && - batch_data->batch.send_message == batch->send_message && - batch_data->batch.send_trailing_metadata == - batch->send_trailing_metadata; - }); - // If batch_data is a replay batch, then there will be no pending - // batch to complete. - if (pending == nullptr) { - GRPC_ERROR_UNREF(error); - return; - } - // Add closure. - closures->Add(pending->batch->on_complete, error, - "on_complete for pending batch"); - pending->batch->on_complete = nullptr; - MaybeClearPendingBatch(pending); -} - -void RetryingCall::AddClosuresForReplayOrPendingSendOps( - SubchannelCallBatchData* batch_data, SubchannelCallRetryState* retry_state, - CallCombinerClosureList* closures) { - bool have_pending_send_message_ops = - retry_state->started_send_message_count < send_messages_.size(); - bool have_pending_send_trailing_metadata_op = - seen_send_trailing_metadata_ && - !retry_state->started_send_trailing_metadata; - if (!have_pending_send_message_ops && - !have_pending_send_trailing_metadata_op) { - for (size_t i = 0; i < GPR_ARRAY_SIZE(pending_batches_); ++i) { - PendingBatch* pending = &pending_batches_[i]; - grpc_transport_stream_op_batch* batch = pending->batch; - if (batch == nullptr || pending->send_ops_cached) continue; - if (batch->send_message) have_pending_send_message_ops = true; - if (batch->send_trailing_metadata) { - have_pending_send_trailing_metadata_op = true; - } - } - } - if (have_pending_send_message_ops || have_pending_send_trailing_metadata_op) { - if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_call_trace)) { - gpr_log(GPR_INFO, - "chand=%p retrying_call=%p: starting next batch for pending send " - "op(s)", - chand_, this); - } - GRPC_CLOSURE_INIT(&batch_data->batch.handler_private.closure, - StartRetriableSubchannelBatches, this, - grpc_schedule_on_exec_ctx); - closures->Add(&batch_data->batch.handler_private.closure, GRPC_ERROR_NONE, - "starting next batch for send_* op(s)"); - } -} - -void RetryingCall::OnComplete(void* arg, grpc_error* error) { - SubchannelCallBatchData* batch_data = - static_cast<SubchannelCallBatchData*>(arg); - RetryingCall* call = batch_data->call; - if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_call_trace)) { - gpr_log(GPR_INFO, - "chand=%p retrying_call=%p: got on_complete, error=%s, batch=%s", - call->chand_, call, grpc_error_string(error), - grpc_transport_stream_op_batch_string(&batch_data->batch).c_str()); - } - SubchannelCallRetryState* retry_state = - static_cast<SubchannelCallRetryState*>( - batch_data->lb_call->GetParentData()); - // Update bookkeeping in retry_state. - if (batch_data->batch.send_initial_metadata) { - retry_state->completed_send_initial_metadata = true; - } - if (batch_data->batch.send_message) { - ++retry_state->completed_send_message_count; - } - if (batch_data->batch.send_trailing_metadata) { - retry_state->completed_send_trailing_metadata = true; - } - // If the call is committed, free cached data for send ops that we've just - // completed. - if (call->retry_committed_) { - call->FreeCachedSendOpDataForCompletedBatch(batch_data, retry_state); - } - // Construct list of closures to execute. - CallCombinerClosureList closures; - // If a retry was already dispatched, that means we saw - // recv_trailing_metadata before this, so we do nothing here. - // Otherwise, invoke the callback to return the result to the surface. - if (!retry_state->retry_dispatched) { - // Add closure for the completed pending batch, if any. - call->AddClosuresForCompletedPendingBatch(batch_data, GRPC_ERROR_REF(error), - &closures); - // If needed, add a callback to start any replay or pending send ops on - // the subchannel call. - if (!retry_state->completed_recv_trailing_metadata) { - call->AddClosuresForReplayOrPendingSendOps(batch_data, retry_state, - &closures); - } - } - // Track number of pending subchannel send batches and determine if this - // was the last one. - --call->num_pending_retriable_subchannel_send_batches_; - const bool last_send_batch_complete = - call->num_pending_retriable_subchannel_send_batches_ == 0; - // Don't need batch_data anymore. - batch_data->Unref(); - // Schedule all of the closures identified above. - // Note: This yeilds the call combiner. - closures.RunClosures(call->call_combiner_); - // If this was the last subchannel send batch, unref the call stack. - if (last_send_batch_complete) { - GRPC_CALL_STACK_UNREF(call->owning_call_, "subchannel_send_batches"); - } -} - -// -// subchannel batch construction -// - -void RetryingCall::StartBatchInCallCombiner(void* arg, - grpc_error* /*ignored*/) { - grpc_transport_stream_op_batch* batch = - static_cast<grpc_transport_stream_op_batch*>(arg); - auto* lb_call = - static_cast<LoadBalancedCall*>(batch->handler_private.extra_arg); - // Note: This will release the call combiner. - lb_call->StartTransportStreamOpBatch(batch); -} - -void RetryingCall::AddClosureForSubchannelBatch( - grpc_transport_stream_op_batch* batch, CallCombinerClosureList* closures) { - batch->handler_private.extra_arg = lb_call_.get(); - GRPC_CLOSURE_INIT(&batch->handler_private.closure, StartBatchInCallCombiner, - batch, grpc_schedule_on_exec_ctx); - if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_call_trace)) { - gpr_log(GPR_INFO, - "chand=%p retrying_call=%p: starting subchannel batch: %s", chand_, - this, grpc_transport_stream_op_batch_string(batch).c_str()); - } - closures->Add(&batch->handler_private.closure, GRPC_ERROR_NONE, - "start_subchannel_batch"); -} - -void RetryingCall::AddRetriableSendInitialMetadataOp( - SubchannelCallRetryState* retry_state, - SubchannelCallBatchData* batch_data) { - // Maps the number of retries to the corresponding metadata value slice. - const grpc_slice* retry_count_strings[] = {&GRPC_MDSTR_1, &GRPC_MDSTR_2, - &GRPC_MDSTR_3, &GRPC_MDSTR_4}; - // We need to make a copy of the metadata batch for each attempt, since - // the filters in the subchannel stack may modify this batch, and we don't - // want those modifications to be passed forward to subsequent attempts. - // - // If we've already completed one or more attempts, add the - // grpc-retry-attempts header. - retry_state->send_initial_metadata_storage = - static_cast<grpc_linked_mdelem*>(arena_->Alloc( - sizeof(grpc_linked_mdelem) * - (send_initial_metadata_.list.count + (num_attempts_completed_ > 0)))); - grpc_metadata_batch_copy(&send_initial_metadata_, - &retry_state->send_initial_metadata, - retry_state->send_initial_metadata_storage); - if (GPR_UNLIKELY(retry_state->send_initial_metadata.idx.named - .grpc_previous_rpc_attempts != nullptr)) { - grpc_metadata_batch_remove(&retry_state->send_initial_metadata, - GRPC_BATCH_GRPC_PREVIOUS_RPC_ATTEMPTS); - } - if (GPR_UNLIKELY(num_attempts_completed_ > 0)) { - grpc_mdelem retry_md = grpc_mdelem_create( - GRPC_MDSTR_GRPC_PREVIOUS_RPC_ATTEMPTS, - *retry_count_strings[num_attempts_completed_ - 1], nullptr); - grpc_error* error = grpc_metadata_batch_add_tail( - &retry_state->send_initial_metadata, - &retry_state - ->send_initial_metadata_storage[send_initial_metadata_.list.count], - retry_md, GRPC_BATCH_GRPC_PREVIOUS_RPC_ATTEMPTS); - if (GPR_UNLIKELY(error != GRPC_ERROR_NONE)) { - gpr_log(GPR_ERROR, "error adding retry metadata: %s", - grpc_error_string(error)); - GPR_ASSERT(false); - } - } - retry_state->started_send_initial_metadata = true; - batch_data->batch.send_initial_metadata = true; - batch_data->batch.payload->send_initial_metadata.send_initial_metadata = - &retry_state->send_initial_metadata; - batch_data->batch.payload->send_initial_metadata.send_initial_metadata_flags = - send_initial_metadata_flags_; - batch_data->batch.payload->send_initial_metadata.peer_string = peer_string_; -} - -void RetryingCall::AddRetriableSendMessageOp( - SubchannelCallRetryState* retry_state, - SubchannelCallBatchData* batch_data) { - if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_call_trace)) { - gpr_log(GPR_INFO, - "chand=%p retrying_call=%p: starting calld->send_messages[%" PRIuPTR - "]", - chand_, this, retry_state->started_send_message_count); - } - ByteStreamCache* cache = - send_messages_[retry_state->started_send_message_count]; - ++retry_state->started_send_message_count; - retry_state->send_message.Init(cache); - batch_data->batch.send_message = true; - batch_data->batch.payload->send_message.send_message.reset( - retry_state->send_message.get()); -} - -void RetryingCall::AddRetriableSendTrailingMetadataOp( - SubchannelCallRetryState* retry_state, - SubchannelCallBatchData* batch_data) { - // We need to make a copy of the metadata batch for each attempt, since - // the filters in the subchannel stack may modify this batch, and we don't - // want those modifications to be passed forward to subsequent attempts. - retry_state->send_trailing_metadata_storage = - static_cast<grpc_linked_mdelem*>(arena_->Alloc( - sizeof(grpc_linked_mdelem) * send_trailing_metadata_.list.count)); - grpc_metadata_batch_copy(&send_trailing_metadata_, - &retry_state->send_trailing_metadata, - retry_state->send_trailing_metadata_storage); - retry_state->started_send_trailing_metadata = true; - batch_data->batch.send_trailing_metadata = true; - batch_data->batch.payload->send_trailing_metadata.send_trailing_metadata = - &retry_state->send_trailing_metadata; -} - -void RetryingCall::AddRetriableRecvInitialMetadataOp( - SubchannelCallRetryState* retry_state, - SubchannelCallBatchData* batch_data) { - retry_state->started_recv_initial_metadata = true; - batch_data->batch.recv_initial_metadata = true; - grpc_metadata_batch_init(&retry_state->recv_initial_metadata); - batch_data->batch.payload->recv_initial_metadata.recv_initial_metadata = - &retry_state->recv_initial_metadata; - batch_data->batch.payload->recv_initial_metadata.trailing_metadata_available = - &retry_state->trailing_metadata_available; - GRPC_CLOSURE_INIT(&retry_state->recv_initial_metadata_ready, - RecvInitialMetadataReady, batch_data, - grpc_schedule_on_exec_ctx); - batch_data->batch.payload->recv_initial_metadata.recv_initial_metadata_ready = - &retry_state->recv_initial_metadata_ready; -} - -void RetryingCall::AddRetriableRecvMessageOp( - SubchannelCallRetryState* retry_state, - SubchannelCallBatchData* batch_data) { - ++retry_state->started_recv_message_count; - batch_data->batch.recv_message = true; - batch_data->batch.payload->recv_message.recv_message = - &retry_state->recv_message; - GRPC_CLOSURE_INIT(&retry_state->recv_message_ready, RecvMessageReady, - batch_data, grpc_schedule_on_exec_ctx); - batch_data->batch.payload->recv_message.recv_message_ready = - &retry_state->recv_message_ready; -} - -void RetryingCall::AddRetriableRecvTrailingMetadataOp( - SubchannelCallRetryState* retry_state, - SubchannelCallBatchData* batch_data) { - retry_state->started_recv_trailing_metadata = true; - batch_data->batch.recv_trailing_metadata = true; - grpc_metadata_batch_init(&retry_state->recv_trailing_metadata); - batch_data->batch.payload->recv_trailing_metadata.recv_trailing_metadata = - &retry_state->recv_trailing_metadata; - batch_data->batch.payload->recv_trailing_metadata.collect_stats = - &retry_state->collect_stats; - GRPC_CLOSURE_INIT(&retry_state->recv_trailing_metadata_ready, - RecvTrailingMetadataReady, batch_data, - grpc_schedule_on_exec_ctx); - batch_data->batch.payload->recv_trailing_metadata - .recv_trailing_metadata_ready = - &retry_state->recv_trailing_metadata_ready; -} - -void RetryingCall::StartInternalRecvTrailingMetadata() { - if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_call_trace)) { - gpr_log( - GPR_INFO, - "chand=%p retrying_call=%p: call failed but recv_trailing_metadata not " - "started; starting it internally", - chand_, this); - } - SubchannelCallRetryState* retry_state = - static_cast<SubchannelCallRetryState*>(lb_call_->GetParentData()); - // Create batch_data with 2 refs, since this batch will be unreffed twice: - // once for the recv_trailing_metadata_ready callback when the subchannel - // batch returns, and again when we actually get a recv_trailing_metadata - // op from the surface. - SubchannelCallBatchData* batch_data = - SubchannelCallBatchData::Create(this, 2, false /* set_on_complete */); - AddRetriableRecvTrailingMetadataOp(retry_state, batch_data); - retry_state->recv_trailing_metadata_internal_batch = batch_data; - // Note: This will release the call combiner. - lb_call_->StartTransportStreamOpBatch(&batch_data->batch); -} - -// If there are any cached send ops that need to be replayed on the -// current subchannel call, creates and returns a new subchannel batch -// to replay those ops. Otherwise, returns nullptr. -RetryingCall::SubchannelCallBatchData* -RetryingCall::MaybeCreateSubchannelBatchForReplay( - SubchannelCallRetryState* retry_state) { - SubchannelCallBatchData* replay_batch_data = nullptr; - // send_initial_metadata. - if (seen_send_initial_metadata_ && - !retry_state->started_send_initial_metadata && - !pending_send_initial_metadata_) { - if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_call_trace)) { - gpr_log(GPR_INFO, - "chand=%p retrying_call=%p: replaying previously completed " - "send_initial_metadata op", - chand_, this); - } - replay_batch_data = - SubchannelCallBatchData::Create(this, 1, true /* set_on_complete */); - AddRetriableSendInitialMetadataOp(retry_state, replay_batch_data); - } - // send_message. - // Note that we can only have one send_message op in flight at a time. - if (retry_state->started_send_message_count < send_messages_.size() && - retry_state->started_send_message_count == - retry_state->completed_send_message_count && - !pending_send_message_) { - if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_call_trace)) { - gpr_log(GPR_INFO, - "chand=%p retrying_call=%p: replaying previously completed " - "send_message op", - chand_, this); - } - if (replay_batch_data == nullptr) { - replay_batch_data = - SubchannelCallBatchData::Create(this, 1, true /* set_on_complete */); - } - AddRetriableSendMessageOp(retry_state, replay_batch_data); - } - // send_trailing_metadata. - // Note that we only add this op if we have no more send_message ops - // to start, since we can't send down any more send_message ops after - // send_trailing_metadata. - if (seen_send_trailing_metadata_ && - retry_state->started_send_message_count == send_messages_.size() && - !retry_state->started_send_trailing_metadata && - !pending_send_trailing_metadata_) { - if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_call_trace)) { - gpr_log(GPR_INFO, - "chand=%p retrying_call=%p: replaying previously completed " - "send_trailing_metadata op", - chand_, this); - } - if (replay_batch_data == nullptr) { - replay_batch_data = - SubchannelCallBatchData::Create(this, 1, true /* set_on_complete */); - } - AddRetriableSendTrailingMetadataOp(retry_state, replay_batch_data); - } - return replay_batch_data; -} - -void RetryingCall::AddSubchannelBatchesForPendingBatches( - SubchannelCallRetryState* retry_state, CallCombinerClosureList* closures) { - for (size_t i = 0; i < GPR_ARRAY_SIZE(pending_batches_); ++i) { - PendingBatch* pending = &pending_batches_[i]; - grpc_transport_stream_op_batch* batch = pending->batch; - if (batch == nullptr) continue; - // Skip any batch that either (a) has already been started on this - // subchannel call or (b) we can't start yet because we're still - // replaying send ops that need to be completed first. - // TODO(roth): Note that if any one op in the batch can't be sent - // yet due to ops that we're replaying, we don't start any of the ops - // in the batch. This is probably okay, but it could conceivably - // lead to increased latency in some cases -- e.g., we could delay - // starting a recv op due to it being in the same batch with a send - // op. If/when we revamp the callback protocol in - // transport_stream_op_batch, we may be able to fix this. - if (batch->send_initial_metadata && - retry_state->started_send_initial_metadata) { - continue; - } - if (batch->send_message && retry_state->completed_send_message_count < - retry_state->started_send_message_count) { - continue; - } - // Note that we only start send_trailing_metadata if we have no more - // send_message ops to start, since we can't send down any more - // send_message ops after send_trailing_metadata. - if (batch->send_trailing_metadata && - (retry_state->started_send_message_count + batch->send_message < - send_messages_.size() || - retry_state->started_send_trailing_metadata)) { - continue; - } - if (batch->recv_initial_metadata && - retry_state->started_recv_initial_metadata) { - continue; - } - if (batch->recv_message && retry_state->completed_recv_message_count < - retry_state->started_recv_message_count) { - continue; - } - if (batch->recv_trailing_metadata && - retry_state->started_recv_trailing_metadata) { - // If we previously completed a recv_trailing_metadata op - // initiated by StartInternalRecvTrailingMetadata(), use the - // result of that instead of trying to re-start this op. - if (GPR_UNLIKELY((retry_state->recv_trailing_metadata_internal_batch != - nullptr))) { - // If the batch completed, then trigger the completion callback - // directly, so that we return the previously returned results to - // the application. Otherwise, just unref the internally - // started subchannel batch, since we'll propagate the - // completion when it completes. - if (retry_state->completed_recv_trailing_metadata) { - // Batches containing recv_trailing_metadata always succeed. - closures->Add( - &retry_state->recv_trailing_metadata_ready, GRPC_ERROR_NONE, - "re-executing recv_trailing_metadata_ready to propagate " - "internally triggered result"); - } else { - retry_state->recv_trailing_metadata_internal_batch->Unref(); - } - retry_state->recv_trailing_metadata_internal_batch = nullptr; - } - continue; - } - // If we're not retrying, just send the batch as-is. - // TODO(roth): This condition doesn't seem exactly right -- maybe need a - // notion of "draining" once we've committed and are done replaying? - if (retry_policy_ == nullptr || retry_committed_) { - AddClosureForSubchannelBatch(batch, closures); - PendingBatchClear(pending); - continue; - } - // Create batch with the right number of callbacks. - const bool has_send_ops = batch->send_initial_metadata || - batch->send_message || - batch->send_trailing_metadata; - const int num_callbacks = has_send_ops + batch->recv_initial_metadata + - batch->recv_message + - batch->recv_trailing_metadata; - SubchannelCallBatchData* batch_data = SubchannelCallBatchData::Create( - this, num_callbacks, has_send_ops /* set_on_complete */); - // Cache send ops if needed. - MaybeCacheSendOpsForBatch(pending); - // send_initial_metadata. - if (batch->send_initial_metadata) { - AddRetriableSendInitialMetadataOp(retry_state, batch_data); - } - // send_message. - if (batch->send_message) { - AddRetriableSendMessageOp(retry_state, batch_data); - } - // send_trailing_metadata. - if (batch->send_trailing_metadata) { - AddRetriableSendTrailingMetadataOp(retry_state, batch_data); - } - // recv_initial_metadata. - if (batch->recv_initial_metadata) { - // recv_flags is only used on the server side. - GPR_ASSERT(batch->payload->recv_initial_metadata.recv_flags == nullptr); - AddRetriableRecvInitialMetadataOp(retry_state, batch_data); - } - // recv_message. - if (batch->recv_message) { - AddRetriableRecvMessageOp(retry_state, batch_data); - } - // recv_trailing_metadata. - if (batch->recv_trailing_metadata) { - AddRetriableRecvTrailingMetadataOp(retry_state, batch_data); - } - AddClosureForSubchannelBatch(&batch_data->batch, closures); - // Track number of pending subchannel send batches. - // If this is the first one, take a ref to the call stack. - if (batch->send_initial_metadata || batch->send_message || - batch->send_trailing_metadata) { - if (num_pending_retriable_subchannel_send_batches_ == 0) { - GRPC_CALL_STACK_REF(owning_call_, "subchannel_send_batches"); - } - ++num_pending_retriable_subchannel_send_batches_; - } - } -} - -void RetryingCall::StartRetriableSubchannelBatches(void* arg, - grpc_error* /*ignored*/) { - RetryingCall* call = static_cast<RetryingCall*>(arg); - if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_call_trace)) { - gpr_log(GPR_INFO, - "chand=%p retrying_call=%p: constructing retriable batches", - call->chand_, call); - } - SubchannelCallRetryState* retry_state = - static_cast<SubchannelCallRetryState*>(call->lb_call_->GetParentData()); - // Construct list of closures to execute, one for each pending batch. - CallCombinerClosureList closures; - // Replay previously-returned send_* ops if needed. - SubchannelCallBatchData* replay_batch_data = - call->MaybeCreateSubchannelBatchForReplay(retry_state); - if (replay_batch_data != nullptr) { - call->AddClosureForSubchannelBatch(&replay_batch_data->batch, &closures); - // Track number of pending subchannel send batches. - // If this is the first one, take a ref to the call stack. - if (call->num_pending_retriable_subchannel_send_batches_ == 0) { - GRPC_CALL_STACK_REF(call->owning_call_, "subchannel_send_batches"); - } - ++call->num_pending_retriable_subchannel_send_batches_; - } - // Now add pending batches. - call->AddSubchannelBatchesForPendingBatches(retry_state, &closures); - // Start batches on subchannel call. - if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_call_trace)) { - gpr_log(GPR_INFO, - "chand=%p retrying_call=%p: starting %" PRIuPTR - " retriable batches on lb_call=%p", - call->chand_, call, closures.size(), call->lb_call_.get()); - } - // Note: This will yield the call combiner. - closures.RunClosures(call->call_combiner_); -} - -void RetryingCall::CreateLbCall(void* arg, grpc_error* /*error*/) { - auto* call = static_cast<RetryingCall*>(arg); - const size_t parent_data_size = - call->enable_retries_ ? sizeof(SubchannelCallRetryState) : 0; - grpc_call_element_args args = {call->owning_call_, nullptr, - call->call_context_, call->path_, - call->call_start_time_, call->deadline_, - call->arena_, call->call_combiner_}; - call->lb_call_ = LoadBalancedCall::Create(call->chand_, args, call->pollent_, - parent_data_size); - if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_routing_trace)) { - gpr_log(GPR_INFO, "chand=%p retrying_call=%p: create lb_call=%p", - call->chand_, call, call->lb_call_.get()); - } - if (parent_data_size > 0) { - new (call->lb_call_->GetParentData()) - SubchannelCallRetryState(call->call_context_); - } - call->PendingBatchesResume(); -} - -// -// LoadBalancedCall::Metadata -// - -class LoadBalancedCall::Metadata +class ClientChannel::LoadBalancedCall::Metadata : public LoadBalancingPolicy::MetadataInterface { public: Metadata(LoadBalancedCall* lb_call, grpc_metadata_batch* batch) @@ -4849,10 +2490,11 @@ class LoadBalancedCall::Metadata }; // -// LoadBalancedCall::LbCallState +// ClientChannel::LoadBalancedCall::LbCallState // -class LoadBalancedCall::LbCallState : public LoadBalancingPolicy::CallState { +class ClientChannel::LoadBalancedCall::LbCallState + : public LoadBalancingPolicy::CallState { public: explicit LbCallState(LoadBalancedCall* lb_call) : lb_call_(lb_call) {} @@ -4888,25 +2530,12 @@ class LoadBalancedCall::LbCallState : public LoadBalancingPolicy::CallState { // LoadBalancedCall // -RefCountedPtr<LoadBalancedCall> LoadBalancedCall::Create( - ChannelData* chand, const grpc_call_element_args& args, - grpc_polling_entity* pollent, size_t parent_data_size) { - const size_t alloc_size = - parent_data_size > 0 - ? (GPR_ROUND_UP_TO_ALIGNMENT_SIZE(sizeof(LoadBalancedCall)) + - parent_data_size) - : sizeof(LoadBalancedCall); - auto* lb_call = static_cast<LoadBalancedCall*>(args.arena->Alloc(alloc_size)); - new (lb_call) LoadBalancedCall(chand, args, pollent); - return lb_call; -} - -LoadBalancedCall::LoadBalancedCall(ChannelData* chand, - const grpc_call_element_args& args, - grpc_polling_entity* pollent) - : refs_(1, GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_routing_trace) - ? "LoadBalancedCall" - : nullptr), +ClientChannel::LoadBalancedCall::LoadBalancedCall( + ClientChannel* chand, const grpc_call_element_args& args, + grpc_polling_entity* pollent, grpc_closure* on_call_destruction_complete) + : RefCounted(GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_routing_trace) + ? "LoadBalancedCall" + : nullptr), chand_(chand), path_(grpc_slice_ref_internal(args.path)), call_start_time_(args.start_time), @@ -4915,11 +2544,13 @@ LoadBalancedCall::LoadBalancedCall(ChannelData* chand, owning_call_(args.call_stack), call_combiner_(args.call_combiner), call_context_(args.context), - pollent_(pollent) {} + pollent_(pollent), + on_call_destruction_complete_(on_call_destruction_complete) {} -LoadBalancedCall::~LoadBalancedCall() { +ClientChannel::LoadBalancedCall::~LoadBalancedCall() { grpc_slice_unref_internal(path_); GRPC_ERROR_UNREF(cancel_error_); + GRPC_ERROR_UNREF(failure_error_); if (backend_metric_data_ != nullptr) { backend_metric_data_ ->LoadBalancingPolicy::BackendMetricData::~BackendMetricData(); @@ -4928,47 +2559,16 @@ LoadBalancedCall::~LoadBalancedCall() { for (size_t i = 0; i < GPR_ARRAY_SIZE(pending_batches_); ++i) { GPR_ASSERT(pending_batches_[i] == nullptr); } -} - -RefCountedPtr<LoadBalancedCall> LoadBalancedCall::Ref() { - IncrementRefCount(); - return RefCountedPtr<LoadBalancedCall>(this); -} - -RefCountedPtr<LoadBalancedCall> LoadBalancedCall::Ref( - const DebugLocation& location, const char* reason) { - IncrementRefCount(location, reason); - return RefCountedPtr<LoadBalancedCall>(this); -} - -void LoadBalancedCall::Unref() { - if (GPR_UNLIKELY(refs_.Unref())) { - this->~LoadBalancedCall(); - } -} - -void LoadBalancedCall::Unref(const DebugLocation& location, - const char* reason) { - if (GPR_UNLIKELY(refs_.Unref(location, reason))) { - this->~LoadBalancedCall(); + if (on_call_destruction_complete_ != nullptr) { + ExecCtx::Run(DEBUG_LOCATION, on_call_destruction_complete_, + GRPC_ERROR_NONE); } } -void LoadBalancedCall::IncrementRefCount() { refs_.Ref(); } - -void LoadBalancedCall::IncrementRefCount(const DebugLocation& location, - const char* reason) { - refs_.Ref(location, reason); -} - -void* LoadBalancedCall::GetParentData() { - return reinterpret_cast<char*>(this) + - GPR_ROUND_UP_TO_ALIGNMENT_SIZE(sizeof(LoadBalancedCall)); -} - -size_t LoadBalancedCall::GetBatchIndex(grpc_transport_stream_op_batch* batch) { +size_t ClientChannel::LoadBalancedCall::GetBatchIndex( + grpc_transport_stream_op_batch* batch) { // Note: It is important the send_initial_metadata be the first entry - // here, since the code in pick_subchannel_locked() assumes it will be. + // here, since the code in PickSubchannelLocked() assumes it will be. if (batch->send_initial_metadata) return 0; if (batch->send_message) return 1; if (batch->send_trailing_metadata) return 2; @@ -4979,7 +2579,7 @@ size_t LoadBalancedCall::GetBatchIndex(grpc_transport_stream_op_batch* batch) { } // This is called via the call combiner, so access to calld is synchronized. -void LoadBalancedCall::PendingBatchesAdd( +void ClientChannel::LoadBalancedCall::PendingBatchesAdd( grpc_transport_stream_op_batch* batch) { const size_t idx = GetBatchIndex(batch); if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_call_trace)) { @@ -4992,8 +2592,8 @@ void LoadBalancedCall::PendingBatchesAdd( } // This is called via the call combiner, so access to calld is synchronized. -void LoadBalancedCall::FailPendingBatchInCallCombiner(void* arg, - grpc_error* error) { +void ClientChannel::LoadBalancedCall::FailPendingBatchInCallCombiner( + void* arg, grpc_error_handle error) { grpc_transport_stream_op_batch* batch = static_cast<grpc_transport_stream_op_batch*>(arg); auto* self = static_cast<LoadBalancedCall*>(batch->handler_private.extra_arg); @@ -5003,10 +2603,12 @@ void LoadBalancedCall::FailPendingBatchInCallCombiner(void* arg, } // This is called via the call combiner, so access to calld is synchronized. -void LoadBalancedCall::PendingBatchesFail( - grpc_error* error, +void ClientChannel::LoadBalancedCall::PendingBatchesFail( + grpc_error_handle error, YieldCallCombinerPredicate yield_call_combiner_predicate) { GPR_ASSERT(error != GRPC_ERROR_NONE); + GRPC_ERROR_UNREF(failure_error_); + failure_error_ = error; if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_call_trace)) { size_t num_batches = 0; for (size_t i = 0; i < GPR_ARRAY_SIZE(pending_batches_); ++i) { @@ -5014,7 +2616,7 @@ void LoadBalancedCall::PendingBatchesFail( } gpr_log(GPR_INFO, "chand=%p lb_call=%p: failing %" PRIuPTR " pending batches: %s", - chand_, this, num_batches, grpc_error_string(error)); + chand_, this, num_batches, grpc_error_std_string(error).c_str()); } CallCombinerClosureList closures; for (size_t i = 0; i < GPR_ARRAY_SIZE(pending_batches_); ++i) { @@ -5034,12 +2636,11 @@ void LoadBalancedCall::PendingBatchesFail( } else { closures.RunClosuresWithoutYielding(call_combiner_); } - GRPC_ERROR_UNREF(error); } // This is called via the call combiner, so access to calld is synchronized. -void LoadBalancedCall::ResumePendingBatchInCallCombiner( - void* arg, grpc_error* /*ignored*/) { +void ClientChannel::LoadBalancedCall::ResumePendingBatchInCallCombiner( + void* arg, grpc_error_handle /*ignored*/) { grpc_transport_stream_op_batch* batch = static_cast<grpc_transport_stream_op_batch*>(arg); SubchannelCall* subchannel_call = @@ -5049,7 +2650,7 @@ void LoadBalancedCall::ResumePendingBatchInCallCombiner( } // This is called via the call combiner, so access to calld is synchronized. -void LoadBalancedCall::PendingBatchesResume() { +void ClientChannel::LoadBalancedCall::PendingBatchesResume() { if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_call_trace)) { size_t num_batches = 0; for (size_t i = 0; i < GPR_ARRAY_SIZE(pending_batches_); ++i) { @@ -5077,7 +2678,7 @@ void LoadBalancedCall::PendingBatchesResume() { closures.RunClosures(call_combiner_); } -void LoadBalancedCall::StartTransportStreamOpBatch( +void ClientChannel::LoadBalancedCall::StartTransportStreamOpBatch( grpc_transport_stream_op_batch* batch) { // Intercept recv_trailing_metadata_ready for LB callback. if (batch->recv_trailing_metadata) { @@ -5087,7 +2688,7 @@ void LoadBalancedCall::StartTransportStreamOpBatch( if (GPR_UNLIKELY(cancel_error_ != GRPC_ERROR_NONE)) { if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_call_trace)) { gpr_log(GPR_INFO, "chand=%p lb_call=%p: failing batch with error: %s", - chand_, this, grpc_error_string(cancel_error_)); + chand_, this, grpc_error_std_string(cancel_error_).c_str()); } // Note: This will release the call combiner. grpc_transport_stream_op_batch_finish_with_failure( @@ -5105,7 +2706,7 @@ void LoadBalancedCall::StartTransportStreamOpBatch( cancel_error_ = GRPC_ERROR_REF(batch->payload->cancel_stream.cancel_error); if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_call_trace)) { gpr_log(GPR_INFO, "chand=%p lb_call=%p: recording cancel_error=%s", - chand_, this, grpc_error_string(cancel_error_)); + chand_, this, grpc_error_std_string(cancel_error_).c_str()); } // If we do not have a subchannel call (i.e., a pick has not yet // been started), fail all pending batches. Otherwise, send the @@ -5158,12 +2759,13 @@ void LoadBalancedCall::StartTransportStreamOpBatch( } } -void LoadBalancedCall::RecvTrailingMetadataReadyForLoadBalancingPolicy( - void* arg, grpc_error* error) { +void ClientChannel::LoadBalancedCall:: + RecvTrailingMetadataReadyForLoadBalancingPolicy(void* arg, + grpc_error_handle error) { auto* self = static_cast<LoadBalancedCall*>(arg); if (self->lb_recv_trailing_metadata_ready_ != nullptr) { // Set error if call did not succeed. - grpc_error* error_for_lb = GRPC_ERROR_NONE; + grpc_error_handle error_for_lb = GRPC_ERROR_NONE; if (error != GRPC_ERROR_NONE) { error_for_lb = error; } else { @@ -5191,14 +2793,19 @@ void LoadBalancedCall::RecvTrailingMetadataReadyForLoadBalancingPolicy( if (error == GRPC_ERROR_NONE) GRPC_ERROR_UNREF(error_for_lb); } // Chain to original callback. + if (self->failure_error_ != GRPC_ERROR_NONE) { + error = self->failure_error_; + self->failure_error_ = GRPC_ERROR_NONE; + } else { + error = GRPC_ERROR_REF(error); + } Closure::Run(DEBUG_LOCATION, self->original_recv_trailing_metadata_ready_, - GRPC_ERROR_REF(error)); + error); } -// TODO(roth): Consider not intercepting this callback unless we -// actually need to, if this causes a performance problem. -void LoadBalancedCall::InjectRecvTrailingMetadataReadyForLoadBalancingPolicy( - grpc_transport_stream_op_batch* batch) { +void ClientChannel::LoadBalancedCall:: + InjectRecvTrailingMetadataReadyForLoadBalancingPolicy( + grpc_transport_stream_op_batch* batch) { recv_trailing_metadata_ = batch->payload->recv_trailing_metadata.recv_trailing_metadata; original_recv_trailing_metadata_ready_ = @@ -5210,19 +2817,23 @@ void LoadBalancedCall::InjectRecvTrailingMetadataReadyForLoadBalancingPolicy( &recv_trailing_metadata_ready_; } -void LoadBalancedCall::CreateSubchannelCall() { +void ClientChannel::LoadBalancedCall::CreateSubchannelCall() { SubchannelCall::Args call_args = { std::move(connected_subchannel_), pollent_, path_, call_start_time_, deadline_, arena_, // TODO(roth): When we implement hedging support, we will probably // need to use a separate call context for each subchannel call. call_context_, call_combiner_}; - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; subchannel_call_ = SubchannelCall::Create(std::move(call_args), &error); if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_routing_trace)) { gpr_log(GPR_INFO, "chand=%p lb_call=%p: create subchannel_call=%p: error=%s", chand_, - this, subchannel_call_.get(), grpc_error_string(error)); + this, subchannel_call_.get(), grpc_error_std_string(error).c_str()); + } + if (on_call_destruction_complete_ != nullptr) { + subchannel_call_->SetAfterCallStackDestroy(on_call_destruction_complete_); + on_call_destruction_complete_ = nullptr; } if (GPR_UNLIKELY(error != GRPC_ERROR_NONE)) { PendingBatchesFail(error, YieldCallCombiner); @@ -5238,7 +2849,7 @@ void LoadBalancedCall::CreateSubchannelCall() { // because there may be multiple LB picks happening in parallel. // Instead, we will probably need to maintain a list in the CallData // object of pending LB picks to be cancelled when the closure runs. -class LoadBalancedCall::LbQueuedCallCanceller { +class ClientChannel::LoadBalancedCall::LbQueuedCallCanceller { public: explicit LbQueuedCallCanceller(RefCountedPtr<LoadBalancedCall> lb_call) : lb_call_(std::move(lb_call)) { @@ -5248,17 +2859,17 @@ class LoadBalancedCall::LbQueuedCallCanceller { } private: - static void CancelLocked(void* arg, grpc_error* error) { + static void CancelLocked(void* arg, grpc_error_handle error) { auto* self = static_cast<LbQueuedCallCanceller*>(arg); auto* lb_call = self->lb_call_.get(); auto* chand = lb_call->chand_; { - MutexLock lock(chand->data_plane_mu()); + MutexLock lock(&chand->data_plane_mu_); if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_routing_trace)) { gpr_log(GPR_INFO, "chand=%p lb_call=%p: cancelling queued pick: " "error=%s self=%p calld->pick_canceller=%p", - chand, lb_call, grpc_error_string(error), self, + chand, lb_call, grpc_error_std_string(error).c_str(), self, lb_call->lb_call_canceller_); } if (lb_call->lb_call_canceller_ == self && error != GRPC_ERROR_NONE) { @@ -5277,7 +2888,7 @@ class LoadBalancedCall::LbQueuedCallCanceller { grpc_closure closure_; }; -void LoadBalancedCall::MaybeRemoveCallFromLbQueuedCallsLocked() { +void ClientChannel::LoadBalancedCall::MaybeRemoveCallFromLbQueuedCallsLocked() { if (!queued_pending_lb_pick_) return; if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_routing_trace)) { gpr_log(GPR_INFO, "chand=%p lb_call=%p: removing from queued picks list", @@ -5289,7 +2900,7 @@ void LoadBalancedCall::MaybeRemoveCallFromLbQueuedCallsLocked() { lb_call_canceller_ = nullptr; } -void LoadBalancedCall::MaybeAddCallToLbQueuedCallsLocked() { +void ClientChannel::LoadBalancedCall::MaybeAddCallToLbQueuedCallsLocked() { if (queued_pending_lb_pick_) return; if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_routing_trace)) { gpr_log(GPR_INFO, "chand=%p lb_call=%p: adding to queued picks list", @@ -5302,18 +2913,19 @@ void LoadBalancedCall::MaybeAddCallToLbQueuedCallsLocked() { lb_call_canceller_ = new LbQueuedCallCanceller(Ref()); } -void LoadBalancedCall::AsyncPickDone(grpc_error* error) { +void ClientChannel::LoadBalancedCall::AsyncPickDone(grpc_error_handle error) { GRPC_CLOSURE_INIT(&pick_closure_, PickDone, this, grpc_schedule_on_exec_ctx); ExecCtx::Run(DEBUG_LOCATION, &pick_closure_, error); } -void LoadBalancedCall::PickDone(void* arg, grpc_error* error) { +void ClientChannel::LoadBalancedCall::PickDone(void* arg, + grpc_error_handle error) { auto* self = static_cast<LoadBalancedCall*>(arg); if (error != GRPC_ERROR_NONE) { if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_routing_trace)) { gpr_log(GPR_INFO, "chand=%p lb_call=%p: failed to pick subchannel: error=%s", - self->chand_, self, grpc_error_string(error)); + self->chand_, self, grpc_error_std_string(error).c_str()); } self->PendingBatchesFail(GRPC_ERROR_REF(error), YieldCallCombiner); return; @@ -5321,6 +2933,8 @@ void LoadBalancedCall::PickDone(void* arg, grpc_error* error) { self->CreateSubchannelCall(); } +namespace { + const char* PickResultTypeName( LoadBalancingPolicy::PickResult::ResultType type) { switch (type) { @@ -5334,11 +2948,14 @@ const char* PickResultTypeName( GPR_UNREACHABLE_CODE(return "UNKNOWN"); } -void LoadBalancedCall::PickSubchannel(void* arg, grpc_error* error) { +} // namespace + +void ClientChannel::LoadBalancedCall::PickSubchannel(void* arg, + grpc_error_handle error) { auto* self = static_cast<LoadBalancedCall*>(arg); bool pick_complete; { - MutexLock lock(self->chand_->data_plane_mu()); + MutexLock lock(&self->chand_->data_plane_mu_); pick_complete = self->PickSubchannelLocked(&error); } if (pick_complete) { @@ -5347,7 +2964,8 @@ void LoadBalancedCall::PickSubchannel(void* arg, grpc_error* error) { } } -bool LoadBalancedCall::PickSubchannelLocked(grpc_error** error) { +bool ClientChannel::LoadBalancedCall::PickSubchannelLocked( + grpc_error_handle* error) { GPR_ASSERT(connected_subchannel_ == nullptr); GPR_ASSERT(subchannel_call_ == nullptr); // Grab initial metadata. @@ -5364,18 +2982,18 @@ bool LoadBalancedCall::PickSubchannelLocked(grpc_error** error) { pick_args.call_state = &lb_call_state; Metadata initial_metadata(this, initial_metadata_batch); pick_args.initial_metadata = &initial_metadata; - auto result = chand_->picker()->Pick(pick_args); + auto result = chand_->picker_->Pick(pick_args); if (GRPC_TRACE_FLAG_ENABLED(grpc_client_channel_routing_trace)) { gpr_log( GPR_INFO, "chand=%p lb_call=%p: LB pick returned %s (subchannel=%p, error=%s)", chand_, this, PickResultTypeName(result.type), result.subchannel.get(), - grpc_error_string(result.error)); + grpc_error_std_string(result.error).c_str()); } switch (result.type) { case LoadBalancingPolicy::PickResult::PICK_FAILED: { // If we're shutting down, fail all RPCs. - grpc_error* disconnect_error = chand_->disconnect_error(); + grpc_error_handle disconnect_error = chand_->disconnect_error(); if (disconnect_error != GRPC_ERROR_NONE) { GRPC_ERROR_UNREF(result.error); MaybeRemoveCallFromLbQueuedCallsLocked(); @@ -5386,7 +3004,7 @@ bool LoadBalancedCall::PickSubchannelLocked(grpc_error** error) { // attempt's final status. if ((send_initial_metadata_flags & GRPC_INITIAL_METADATA_WAIT_FOR_READY) == 0) { - grpc_error* new_error = + grpc_error_handle new_error = GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Failed to pick subchannel", &result.error, 1); GRPC_ERROR_UNREF(result.error); @@ -5407,9 +3025,11 @@ bool LoadBalancedCall::PickSubchannelLocked(grpc_error** error) { // Handle drops. if (GPR_UNLIKELY(result.subchannel == nullptr)) { result.error = grpc_error_set_int( - GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "Call dropped by load balancing policy"), - GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_UNAVAILABLE); + grpc_error_set_int(GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "Call dropped by load balancing policy"), + GRPC_ERROR_INT_GRPC_STATUS, + GRPC_STATUS_UNAVAILABLE), + GRPC_ERROR_INT_LB_POLICY_DROP, 1); } else { // Grab a ref to the connected subchannel while we're still // holding the data plane mutex. @@ -5423,69 +3043,4 @@ bool LoadBalancedCall::PickSubchannelLocked(grpc_error** error) { } } -} // namespace } // namespace grpc_core - -/************************************************************************* - * EXPORTED SYMBOLS - */ - -using grpc_core::CallData; -using grpc_core::ChannelData; - -const grpc_channel_filter grpc_client_channel_filter = { - CallData::StartTransportStreamOpBatch, - ChannelData::StartTransportOp, - sizeof(CallData), - CallData::Init, - CallData::SetPollent, - CallData::Destroy, - sizeof(ChannelData), - ChannelData::Init, - ChannelData::Destroy, - ChannelData::GetChannelInfo, - "client-channel", -}; - -grpc_connectivity_state grpc_client_channel_check_connectivity_state( - grpc_channel_element* elem, int try_to_connect) { - auto* chand = static_cast<ChannelData*>(elem->channel_data); - return chand->CheckConnectivityState(try_to_connect); -} - -int grpc_client_channel_num_external_connectivity_watchers( - grpc_channel_element* elem) { - auto* chand = static_cast<ChannelData*>(elem->channel_data); - return chand->NumExternalConnectivityWatchers(); -} - -void grpc_client_channel_watch_connectivity_state( - grpc_channel_element* elem, grpc_polling_entity pollent, - grpc_connectivity_state* state, grpc_closure* on_complete, - grpc_closure* watcher_timer_init) { - auto* chand = static_cast<ChannelData*>(elem->channel_data); - if (state == nullptr) { - // Handle cancellation. - GPR_ASSERT(watcher_timer_init == nullptr); - chand->RemoveExternalConnectivityWatcher(on_complete, /*cancel=*/true); - return; - } - // Handle addition. - return chand->AddExternalConnectivityWatcher(pollent, state, on_complete, - watcher_timer_init); -} - -void grpc_client_channel_start_connectivity_watch( - grpc_channel_element* elem, grpc_connectivity_state initial_state, - grpc_core::OrphanablePtr<grpc_core::AsyncConnectivityStateWatcherInterface> - watcher) { - auto* chand = static_cast<ChannelData*>(elem->channel_data); - chand->AddConnectivityWatcher(initial_state, std::move(watcher)); -} - -void grpc_client_channel_stop_connectivity_watch( - grpc_channel_element* elem, - grpc_core::AsyncConnectivityStateWatcherInterface* watcher) { - auto* chand = static_cast<ChannelData*>(elem->channel_data); - chand->RemoveConnectivityWatcher(watcher); -} diff --git a/grpc/src/core/ext/filters/client_channel/client_channel.h b/grpc/src/core/ext/filters/client_channel/client_channel.h index 202de8ae..b7dd1a19 100644 --- a/grpc/src/core/ext/filters/client_channel/client_channel.h +++ b/grpc/src/core/ext/filters/client_channel/client_channel.h @@ -1,78 +1,510 @@ -/* - * - * Copyright 2015 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 2015 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_FILTERS_CLIENT_CHANNEL_CLIENT_CHANNEL_H #define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_CLIENT_CHANNEL_H #include <grpc/support/port_platform.h> -#include "src/core/ext/filters/client_channel/client_channel_channelz.h" +#include <map> +#include <memory> +#include <set> +#include <string> + +#include "absl/status/status.h" +#include "absl/types/optional.h" + +#include <grpc/support/log.h> + #include "src/core/ext/filters/client_channel/client_channel_factory.h" +#include "src/core/ext/filters/client_channel/config_selector.h" +#include "src/core/ext/filters/client_channel/dynamic_filters.h" +#include "src/core/ext/filters/client_channel/lb_policy.h" #include "src/core/ext/filters/client_channel/resolver.h" -#include "src/core/lib/channel/channel_stack.h" +#include "src/core/ext/filters/client_channel/resolver_result_parsing.h" +#include "src/core/ext/filters/client_channel/retry_throttle.h" +#include "src/core/ext/filters/client_channel/service_config.h" +#include "src/core/ext/filters/client_channel/subchannel.h" +#include "src/core/ext/filters/client_channel/subchannel_pool_interface.h" +#include "src/core/lib/gprpp/sync.h" +#include "src/core/lib/iomgr/error.h" +#include "src/core/lib/iomgr/polling_entity.h" +#include "src/core/lib/iomgr/work_serializer.h" +#include "src/core/lib/surface/channel.h" +#include "src/core/lib/transport/connectivity_state.h" + +// +// Client channel filter +// -extern grpc_core::TraceFlag grpc_client_channel_trace; +// A client channel is a channel that begins disconnected, and can connect +// to some endpoint on demand. If that endpoint disconnects, it will be +// connected to again later. +// +// Calls on a disconnected client channel are queued until a connection is +// established. // Channel arg key for server URI string. #define GRPC_ARG_SERVER_URI "grpc.server_uri" -/* A client channel is a channel that begins disconnected, and can connect - to some endpoint on demand. If that endpoint disconnects, it will be - connected to again later. +// Channel arg containing a pointer to the ClientChannel object. +#define GRPC_ARG_CLIENT_CHANNEL "grpc.internal.client_channel" + +// Channel arg containing a pointer to the ServiceConfig object. +#define GRPC_ARG_SERVICE_CONFIG_OBJ "grpc.internal.service_config_obj" + +// Max number of batches that can be pending on a call at any given +// time. This includes one batch for each of the following ops: +// recv_initial_metadata +// send_initial_metadata +// recv_message +// send_message +// recv_trailing_metadata +// send_trailing_metadata +#define MAX_PENDING_BATCHES 6 + +namespace grpc_core { + +class ClientChannel { + public: + static const grpc_channel_filter kFilterVtable; + + class LoadBalancedCall; + + // Returns the ClientChannel object from channel, or null if channel + // is not a client channel. + static ClientChannel* GetFromChannel(grpc_channel* channel); + + grpc_connectivity_state CheckConnectivityState(bool try_to_connect); + + // Starts a one-time connectivity state watch. When the channel's state + // becomes different from *state, sets *state to the new state and + // schedules on_complete. The watcher_timer_init callback is invoked as + // soon as the watch is actually started (i.e., after hopping into the + // client channel combiner). I/O will be serviced via pollent. + // + // This is intended to be used when starting a watch from outside of C-core + // via grpc_channel_watch_connectivity_state(). It should not be used + // by other callers. + void AddExternalConnectivityWatcher(grpc_polling_entity pollent, + grpc_connectivity_state* state, + grpc_closure* on_complete, + grpc_closure* watcher_timer_init) { + new ExternalConnectivityWatcher(this, pollent, state, on_complete, + watcher_timer_init); + } + + // Cancels a pending external watcher previously added by + // AddExternalConnectivityWatcher(). + void CancelExternalConnectivityWatcher(grpc_closure* on_complete) { + ExternalConnectivityWatcher::RemoveWatcherFromExternalWatchersMap( + this, on_complete, /*cancel=*/true); + } + + int NumExternalConnectivityWatchers() const { + MutexLock lock(&external_watchers_mu_); + return static_cast<int>(external_watchers_.size()); + } + + // Starts and stops a connectivity watch. The watcher will be initially + // notified as soon as the state changes from initial_state and then on + // every subsequent state change until either the watch is stopped or + // it is notified that the state has changed to SHUTDOWN. + // + // This is intended to be used when starting watches from code inside of + // C-core (e.g., for a nested control plane channel for things like xds). + void AddConnectivityWatcher( + grpc_connectivity_state initial_state, + OrphanablePtr<AsyncConnectivityStateWatcherInterface> watcher); + void RemoveConnectivityWatcher( + AsyncConnectivityStateWatcherInterface* watcher); + + RefCountedPtr<LoadBalancedCall> CreateLoadBalancedCall( + const grpc_call_element_args& args, grpc_polling_entity* pollent, + grpc_closure* on_call_destruction_complete); + + private: + class CallData; + class ResolverResultHandler; + class SubchannelWrapper; + class ClientChannelControlHelper; + class ConnectivityWatcherAdder; + class ConnectivityWatcherRemover; + + // Represents a pending connectivity callback from an external caller + // via grpc_client_channel_watch_connectivity_state(). + class ExternalConnectivityWatcher : public ConnectivityStateWatcherInterface { + public: + ExternalConnectivityWatcher(ClientChannel* chand, + grpc_polling_entity pollent, + grpc_connectivity_state* state, + grpc_closure* on_complete, + grpc_closure* watcher_timer_init); + + ~ExternalConnectivityWatcher() override; + + // Removes the watcher from the external_watchers_ map. + static void RemoveWatcherFromExternalWatchersMap(ClientChannel* chand, + grpc_closure* on_complete, + bool cancel); + + void Notify(grpc_connectivity_state state, + const absl::Status& /* status */) override; + + void Cancel(); + + private: + // Adds the watcher to state_tracker_. Consumes the ref that is passed to it + // from Start(). + void AddWatcherLocked() + ABSL_EXCLUSIVE_LOCKS_REQUIRED(chand_->work_serializer_); + void RemoveWatcherLocked() + ABSL_EXCLUSIVE_LOCKS_REQUIRED(chand_->work_serializer_); + + ClientChannel* chand_; + grpc_polling_entity pollent_; + grpc_connectivity_state initial_state_; + grpc_connectivity_state* state_; + grpc_closure* on_complete_; + grpc_closure* watcher_timer_init_; + Atomic<bool> done_{false}; + }; + + struct ResolverQueuedCall { + grpc_call_element* elem; + ResolverQueuedCall* next = nullptr; + }; + struct LbQueuedCall { + LoadBalancedCall* lb_call; + LbQueuedCall* next = nullptr; + }; + + ClientChannel(grpc_channel_element_args* args, grpc_error_handle* error); + ~ClientChannel(); + + // Filter vtable functions. + static grpc_error_handle Init(grpc_channel_element* elem, + grpc_channel_element_args* args); + static void Destroy(grpc_channel_element* elem); + static void StartTransportOp(grpc_channel_element* elem, + grpc_transport_op* op); + static void GetChannelInfo(grpc_channel_element* elem, + const grpc_channel_info* info); - Calls on a disconnected client channel are queued until a connection is - established. */ + // Note: Does NOT return a new ref. + grpc_error_handle disconnect_error() const { + return disconnect_error_.Load(MemoryOrder::ACQUIRE); + } -extern const grpc_channel_filter grpc_client_channel_filter; + // Note: All methods with "Locked" suffix must be invoked from within + // work_serializer_. -grpc_connectivity_state grpc_client_channel_check_connectivity_state( - grpc_channel_element* elem, int try_to_connect); + void OnResolverResultChangedLocked(Resolver::Result result) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(work_serializer_); + void OnResolverErrorLocked(grpc_error_handle error) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(work_serializer_); -int grpc_client_channel_num_external_connectivity_watchers( - grpc_channel_element* elem); + void CreateOrUpdateLbPolicyLocked( + RefCountedPtr<LoadBalancingPolicy::Config> lb_policy_config, + Resolver::Result result) ABSL_EXCLUSIVE_LOCKS_REQUIRED(work_serializer_); + OrphanablePtr<LoadBalancingPolicy> CreateLbPolicyLocked( + const grpc_channel_args& args) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(work_serializer_); + + void UpdateStateAndPickerLocked( + grpc_connectivity_state state, const absl::Status& status, + const char* reason, + std::unique_ptr<LoadBalancingPolicy::SubchannelPicker> picker) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(work_serializer_); + + void UpdateServiceConfigInControlPlaneLocked( + RefCountedPtr<ServiceConfig> service_config, + RefCountedPtr<ConfigSelector> config_selector, + const internal::ClientChannelGlobalParsedConfig* parsed_service_config, + const char* lb_policy_name) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(work_serializer_); + + void UpdateServiceConfigInDataPlaneLocked() + ABSL_EXCLUSIVE_LOCKS_REQUIRED(work_serializer_); + + void CreateResolverLocked() ABSL_EXCLUSIVE_LOCKS_REQUIRED(work_serializer_); + void DestroyResolverAndLbPolicyLocked() + ABSL_EXCLUSIVE_LOCKS_REQUIRED(work_serializer_); + + grpc_error_handle DoPingLocked(grpc_transport_op* op) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(work_serializer_); + + void StartTransportOpLocked(grpc_transport_op* op) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(work_serializer_); + + void TryToConnectLocked() ABSL_EXCLUSIVE_LOCKS_REQUIRED(work_serializer_); + + // These methods all require holding resolution_mu_. + void AddResolverQueuedCall(ResolverQueuedCall* call, + grpc_polling_entity* pollent) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(resolution_mu_); + void RemoveResolverQueuedCall(ResolverQueuedCall* to_remove, + grpc_polling_entity* pollent) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(resolution_mu_); + + // These methods all require holding data_plane_mu_. + void AddLbQueuedCall(LbQueuedCall* call, grpc_polling_entity* pollent) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(data_plane_mu_); + void RemoveLbQueuedCall(LbQueuedCall* to_remove, grpc_polling_entity* pollent) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(data_plane_mu_); + RefCountedPtr<ConnectedSubchannel> GetConnectedSubchannelInDataPlane( + SubchannelInterface* subchannel) const + ABSL_EXCLUSIVE_LOCKS_REQUIRED(data_plane_mu_); + + // + // Fields set at construction and never modified. + // + const bool deadline_checking_enabled_; + const bool enable_retries_; + grpc_channel_stack* owning_stack_; + ClientChannelFactory* client_channel_factory_; + const grpc_channel_args* channel_args_; + RefCountedPtr<ServiceConfig> default_service_config_; + std::string server_name_; + UniquePtr<char> target_uri_; + channelz::ChannelNode* channelz_node_; + grpc_pollset_set* interested_parties_; + + // + // Fields related to name resolution. Guarded by resolution_mu_. + // + mutable Mutex resolution_mu_; + // Linked list of calls queued waiting for resolver result. + ResolverQueuedCall* resolver_queued_calls_ ABSL_GUARDED_BY(resolution_mu_) = + nullptr; + // Data from service config. + grpc_error_handle resolver_transient_failure_error_ + ABSL_GUARDED_BY(resolution_mu_) = GRPC_ERROR_NONE; + bool received_service_config_data_ ABSL_GUARDED_BY(resolution_mu_) = false; + RefCountedPtr<ServiceConfig> service_config_ ABSL_GUARDED_BY(resolution_mu_); + RefCountedPtr<ConfigSelector> config_selector_ + ABSL_GUARDED_BY(resolution_mu_); + RefCountedPtr<DynamicFilters> dynamic_filters_ + ABSL_GUARDED_BY(resolution_mu_); + + // + // Fields used in the data plane. Guarded by data_plane_mu_. + // + mutable Mutex data_plane_mu_; + std::unique_ptr<LoadBalancingPolicy::SubchannelPicker> picker_ + ABSL_GUARDED_BY(data_plane_mu_); + // Linked list of calls queued waiting for LB pick. + LbQueuedCall* lb_queued_calls_ ABSL_GUARDED_BY(data_plane_mu_) = nullptr; + + // + // Fields used in the control plane. Guarded by work_serializer. + // + std::shared_ptr<WorkSerializer> work_serializer_; + ConnectivityStateTracker state_tracker_ ABSL_GUARDED_BY(work_serializer_); + OrphanablePtr<Resolver> resolver_ ABSL_GUARDED_BY(work_serializer_); + bool previous_resolution_contained_addresses_ + ABSL_GUARDED_BY(work_serializer_) = false; + RefCountedPtr<ServiceConfig> saved_service_config_ + ABSL_GUARDED_BY(work_serializer_); + RefCountedPtr<ConfigSelector> saved_config_selector_ + ABSL_GUARDED_BY(work_serializer_); + absl::optional<std::string> health_check_service_name_ + ABSL_GUARDED_BY(work_serializer_); + OrphanablePtr<LoadBalancingPolicy> lb_policy_ + ABSL_GUARDED_BY(work_serializer_); + RefCountedPtr<SubchannelPoolInterface> subchannel_pool_ + ABSL_GUARDED_BY(work_serializer_); + // The number of SubchannelWrapper instances referencing a given Subchannel. + std::map<Subchannel*, int> subchannel_refcount_map_ + ABSL_GUARDED_BY(work_serializer_); + // The set of SubchannelWrappers that currently exist. + // No need to hold a ref, since the map is updated in the control-plane + // work_serializer when the SubchannelWrappers are created and destroyed. + std::set<SubchannelWrapper*> subchannel_wrappers_ + ABSL_GUARDED_BY(work_serializer_); + // Pending ConnectedSubchannel updates for each SubchannelWrapper. + // Updates are queued here in the control plane work_serializer and then + // applied in the data plane mutex when the picker is updated. + std::map<RefCountedPtr<SubchannelWrapper>, RefCountedPtr<ConnectedSubchannel>> + pending_subchannel_updates_ ABSL_GUARDED_BY(work_serializer_); + int keepalive_time_ ABSL_GUARDED_BY(work_serializer_) = -1; + + // + // Fields accessed from both data plane mutex and control plane + // work_serializer. + // + Atomic<grpc_error_handle> disconnect_error_; + + // + // Fields guarded by a mutex, since they need to be accessed + // synchronously via get_channel_info(). + // + Mutex info_mu_; + UniquePtr<char> info_lb_policy_name_ ABSL_GUARDED_BY(info_mu_); + UniquePtr<char> info_service_config_json_ ABSL_GUARDED_BY(info_mu_); + + // + // Fields guarded by a mutex, since they need to be accessed + // synchronously via grpc_channel_num_external_connectivity_watchers(). + // + mutable Mutex external_watchers_mu_; + std::map<grpc_closure*, RefCountedPtr<ExternalConnectivityWatcher>> + external_watchers_ ABSL_GUARDED_BY(external_watchers_mu_); +}; -// Starts a one-time connectivity state watch. When the channel's state -// becomes different from *state, sets *state to the new state and -// schedules on_complete. The watcher_timer_init callback is invoked as -// soon as the watch is actually started (i.e., after hopping into the -// client channel combiner). I/O will be serviced via pollent. // -// This is intended to be used when starting a watch from outside of C-core -// via grpc_channel_watch_connectivity_state(). It should not be used -// by other callers. -void grpc_client_channel_watch_connectivity_state( - grpc_channel_element* elem, grpc_polling_entity pollent, - grpc_connectivity_state* state, grpc_closure* on_complete, - grpc_closure* watcher_timer_init); - -// Starts and stops a connectivity watch. The watcher will be initially -// notified as soon as the state changes from initial_state and then on -// every subsequent state change until either the watch is stopped or -// it is notified that the state has changed to SHUTDOWN. +// ClientChannel::LoadBalancedCall // -// This is intended to be used when starting watches from code inside of -// C-core (e.g., for a nested control plane channel for things like xds). -void grpc_client_channel_start_connectivity_watch( - grpc_channel_element* elem, grpc_connectivity_state initial_state, - grpc_core::OrphanablePtr<grpc_core::AsyncConnectivityStateWatcherInterface> - watcher); -void grpc_client_channel_stop_connectivity_watch( - grpc_channel_element* elem, - grpc_core::AsyncConnectivityStateWatcherInterface* watcher); + +// This object is ref-counted, but it cannot inherit from RefCounted<>, +// because it is allocated on the arena and can't free its memory when +// its refcount goes to zero. So instead, it manually implements the +// same API as RefCounted<>, so that it can be used with RefCountedPtr<>. +class ClientChannel::LoadBalancedCall + : public RefCounted<LoadBalancedCall, PolymorphicRefCount, kUnrefCallDtor> { + public: + // If on_call_destruction_complete is non-null, then it will be + // invoked once the LoadBalancedCall is completely destroyed. + // If it is null, then the caller is responsible for checking whether + // the LB call has a subchannel call and ensuring that the + // on_call_destruction_complete closure passed down from the surface + // is not invoked until after the subchannel call stack is destroyed. + LoadBalancedCall(ClientChannel* chand, const grpc_call_element_args& args, + grpc_polling_entity* pollent, + grpc_closure* on_call_destruction_complete); + ~LoadBalancedCall() override; + + void StartTransportStreamOpBatch(grpc_transport_stream_op_batch* batch); + + // Invoked by channel for queued LB picks when the picker is updated. + static void PickSubchannel(void* arg, grpc_error_handle error); + // Helper function for performing an LB pick while holding the data plane + // mutex. Returns true if the pick is complete, in which case the caller + // must invoke PickDone() or AsyncPickDone() with the returned error. + bool PickSubchannelLocked(grpc_error_handle* error) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(&ClientChannel::data_plane_mu_); + // Schedules a callback to process the completed pick. The callback + // will not run until after this method returns. + void AsyncPickDone(grpc_error_handle error); + + RefCountedPtr<SubchannelCall> subchannel_call() const { + return subchannel_call_; + } + + private: + class LbQueuedCallCanceller; + class Metadata; + class LbCallState; + + // Returns the index into pending_batches_ to be used for batch. + static size_t GetBatchIndex(grpc_transport_stream_op_batch* batch); + void PendingBatchesAdd(grpc_transport_stream_op_batch* batch); + static void FailPendingBatchInCallCombiner(void* arg, + grpc_error_handle error); + // A predicate type and some useful implementations for PendingBatchesFail(). + typedef bool (*YieldCallCombinerPredicate)( + const CallCombinerClosureList& closures); + static bool YieldCallCombiner(const CallCombinerClosureList& /*closures*/) { + return true; + } + static bool NoYieldCallCombiner(const CallCombinerClosureList& /*closures*/) { + return false; + } + static bool YieldCallCombinerIfPendingBatchesFound( + const CallCombinerClosureList& closures) { + return closures.size() > 0; + } + // Fails all pending batches. + // If yield_call_combiner_predicate returns true, assumes responsibility for + // yielding the call combiner. + void PendingBatchesFail( + grpc_error_handle error, + YieldCallCombinerPredicate yield_call_combiner_predicate); + static void ResumePendingBatchInCallCombiner(void* arg, + grpc_error_handle ignored); + // Resumes all pending batches on subchannel_call_. + void PendingBatchesResume(); + + static void RecvTrailingMetadataReadyForLoadBalancingPolicy( + void* arg, grpc_error_handle error); + void InjectRecvTrailingMetadataReadyForLoadBalancingPolicy( + grpc_transport_stream_op_batch* batch); + + void CreateSubchannelCall(); + // Invoked when a pick is completed, on both success or failure. + static void PickDone(void* arg, grpc_error_handle error); + // Removes the call from the channel's list of queued picks if present. + void MaybeRemoveCallFromLbQueuedCallsLocked() + ABSL_EXCLUSIVE_LOCKS_REQUIRED(&ClientChannel::data_plane_mu_); + // Adds the call to the channel's list of queued picks if not already present. + void MaybeAddCallToLbQueuedCallsLocked() + ABSL_EXCLUSIVE_LOCKS_REQUIRED(&ClientChannel::data_plane_mu_); + + ClientChannel* chand_; + + // TODO(roth): Instead of duplicating these fields in every filter + // that uses any one of them, we should store them in the call + // context. This will save per-call memory overhead. + grpc_slice path_; // Request path. + gpr_cycle_counter call_start_time_; + grpc_millis deadline_; + Arena* arena_; + grpc_call_stack* owning_call_; + CallCombiner* call_combiner_; + grpc_call_context_element* call_context_; + grpc_polling_entity* pollent_; + grpc_closure* on_call_destruction_complete_; + + // Set when we get a cancel_stream op. + grpc_error_handle cancel_error_ = GRPC_ERROR_NONE; + + // Set when we fail inside the LB call. + grpc_error_handle failure_error_ = GRPC_ERROR_NONE; + + grpc_closure pick_closure_; + + // Accessed while holding ClientChannel::data_plane_mu_. + ClientChannel::LbQueuedCall queued_call_ + ABSL_GUARDED_BY(&ClientChannel::data_plane_mu_); + bool queued_pending_lb_pick_ ABSL_GUARDED_BY(&ClientChannel::data_plane_mu_) = + false; + LbQueuedCallCanceller* lb_call_canceller_ + ABSL_GUARDED_BY(&ClientChannel::data_plane_mu_) = nullptr; + + RefCountedPtr<ConnectedSubchannel> connected_subchannel_; + const LoadBalancingPolicy::BackendMetricData* backend_metric_data_ = nullptr; + std::function<void(grpc_error_handle, LoadBalancingPolicy::MetadataInterface*, + LoadBalancingPolicy::CallState*)> + lb_recv_trailing_metadata_ready_; + + RefCountedPtr<SubchannelCall> subchannel_call_; + + // For intercepting recv_trailing_metadata_ready for the LB policy. + grpc_metadata_batch* recv_trailing_metadata_ = nullptr; + grpc_closure recv_trailing_metadata_ready_; + grpc_closure* original_recv_trailing_metadata_ready_ = nullptr; + + // Batches are added to this list when received from above. + // They are removed when we are done handling the batch (i.e., when + // either we have invoked all of the batch's callbacks or we have + // passed the batch down to the subchannel call and are not + // intercepting any of its callbacks). + grpc_transport_stream_op_batch* pending_batches_[MAX_PENDING_BATCHES] = {}; +}; + +} // namespace grpc_core #endif // GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_CLIENT_CHANNEL_H diff --git a/grpc/src/core/ext/filters/client_channel/client_channel_channelz.h b/grpc/src/core/ext/filters/client_channel/client_channel_channelz.h index 1a35abe4..a106897b 100644 --- a/grpc/src/core/ext/filters/client_channel/client_channel_channelz.h +++ b/grpc/src/core/ext/filters/client_channel/client_channel_channelz.h @@ -63,7 +63,7 @@ class SubchannelNode : public BaseNode { private: Atomic<grpc_connectivity_state> connectivity_state_{GRPC_CHANNEL_IDLE}; Mutex socket_mu_; - RefCountedPtr<SocketNode> child_socket_; + RefCountedPtr<SocketNode> child_socket_ ABSL_GUARDED_BY(socket_mu_); std::string target_; CallCountingHelper call_counter_; ChannelTrace trace_; diff --git a/grpc/src/core/ext/filters/client_channel/client_channel_factory.h b/grpc/src/core/ext/filters/client_channel/client_channel_factory.h index 79797bbc..75d74d67 100644 --- a/grpc/src/core/ext/filters/client_channel/client_channel_factory.h +++ b/grpc/src/core/ext/filters/client_channel/client_channel_factory.h @@ -32,7 +32,8 @@ class ClientChannelFactory { virtual ~ClientChannelFactory() = default; // Creates a subchannel with the specified args. - virtual Subchannel* CreateSubchannel(const grpc_channel_args* args) = 0; + virtual RefCountedPtr<Subchannel> CreateSubchannel( + const grpc_channel_args* args) = 0; // Returns a channel arg containing the specified factory. static grpc_arg CreateChannelArg(ClientChannelFactory* factory); diff --git a/grpc/src/core/ext/filters/client_channel/client_channel_plugin.cc b/grpc/src/core/ext/filters/client_channel/client_channel_plugin.cc index 5690545c..1d33d25b 100644 --- a/grpc/src/core/ext/filters/client_channel/client_channel_plugin.cc +++ b/grpc/src/core/ext/filters/client_channel/client_channel_plugin.cc @@ -34,6 +34,7 @@ #include "src/core/ext/filters/client_channel/proxy_mapper_registry.h" #include "src/core/ext/filters/client_channel/resolver_registry.h" #include "src/core/ext/filters/client_channel/resolver_result_parsing.h" +#include "src/core/ext/filters/client_channel/retry_service_config.h" #include "src/core/ext/filters/client_channel/retry_throttle.h" #include "src/core/ext/filters/client_channel/service_config_parser.h" #include "src/core/lib/surface/channel_init.h" @@ -46,6 +47,7 @@ static bool append_filter(grpc_channel_stack_builder* builder, void* arg) { void grpc_client_channel_init(void) { grpc_core::ServiceConfigParser::Init(); grpc_core::internal::ClientChannelServiceConfigParser::Register(); + grpc_core::internal::RetryServiceConfigParser::Register(); grpc_core::LoadBalancingPolicyRegistry::Builder::InitRegistry(); grpc_core::ResolverRegistry::Builder::InitRegistry(); grpc_core::internal::ServerRetryThrottleMap::Init(); @@ -54,7 +56,8 @@ void grpc_client_channel_init(void) { grpc_core::GlobalSubchannelPool::Init(); grpc_channel_init_register_stage( GRPC_CLIENT_CHANNEL, GRPC_CHANNEL_INIT_BUILTIN_PRIORITY, append_filter, - const_cast<grpc_channel_filter*>(&grpc_client_channel_filter)); + const_cast<grpc_channel_filter*>( + &grpc_core::ClientChannel::kFilterVtable)); grpc_http_connect_register_handshaker_factory(); grpc_client_channel_global_init_backup_polling(); } diff --git a/grpc/src/core/ext/filters/client_channel/config_selector.h b/grpc/src/core/ext/filters/client_channel/config_selector.h index 62e4ce5a..98ae07e4 100644 --- a/grpc/src/core/ext/filters/client_channel/config_selector.h +++ b/grpc/src/core/ext/filters/client_channel/config_selector.h @@ -52,7 +52,7 @@ class ConfigSelector : public RefCounted<ConfigSelector> { struct CallConfig { // Can be set to indicate the call should be failed. - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; // The per-method parsed configs that will be passed to // ServiceConfigCallData. const ServiceConfigParser::ParsedConfigVector* method_configs = nullptr; @@ -82,8 +82,16 @@ class ConfigSelector : public RefCounted<ConfigSelector> { return cs1->Equals(cs2); } + // The channel will call this when the resolver returns a new ConfigSelector + // to determine what set of dynamic filters will be configured. virtual std::vector<const grpc_channel_filter*> GetFilters() { return {}; } + // Modifies channel args to be passed to the dynamic filter stack. + // Takes ownership of argument. Caller takes ownership of result. + virtual grpc_channel_args* ModifyChannelArgs(grpc_channel_args* args) { + return args; + } + virtual CallConfig GetCallConfig(GetCallConfigArgs args) = 0; grpc_arg MakeChannelArg() const; @@ -106,7 +114,7 @@ class DefaultConfigSelector : public ConfigSelector { // Only comparing the ConfigSelector itself, not the underlying // service config, so we always return true. - bool Equals(const ConfigSelector* other) const override { return true; } + bool Equals(const ConfigSelector* /*other*/) const override { return true; } CallConfig GetCallConfig(GetCallConfigArgs args) override { CallConfig call_config; diff --git a/grpc/src/core/ext/filters/client_channel/connector.h b/grpc/src/core/ext/filters/client_channel/connector.h index 25647145..20e25b5b 100644 --- a/grpc/src/core/ext/filters/client_channel/connector.h +++ b/grpc/src/core/ext/filters/client_channel/connector.h @@ -66,7 +66,7 @@ class SubchannelConnector : public InternallyRefCounted<SubchannelConnector> { // Cancels any in-flight connection attempt and shuts down the // connector. - virtual void Shutdown(grpc_error* error) = 0; + virtual void Shutdown(grpc_error_handle error) = 0; void Orphan() override { Shutdown(GRPC_ERROR_CREATE_FROM_STATIC_STRING("Subchannel disconnected")); diff --git a/grpc/src/core/ext/filters/client_channel/dynamic_filters.cc b/grpc/src/core/ext/filters/client_channel/dynamic_filters.cc index afde3c75..47c05a30 100644 --- a/grpc/src/core/ext/filters/client_channel/dynamic_filters.cc +++ b/grpc/src/core/ext/filters/client_channel/dynamic_filters.cc @@ -18,6 +18,7 @@ #include "src/core/ext/filters/client_channel/dynamic_filters.h" +#include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/surface/lame_client.h" @@ -36,7 +37,7 @@ namespace grpc_core { // DynamicFilters::Call // -DynamicFilters::Call::Call(Args args, grpc_error** error) +DynamicFilters::Call::Call(Args args, grpc_error_handle* error) : channel_stack_(std::move(args.channel_stack)) { grpc_call_stack* call_stack = CALL_TO_CALL_STACK(this); const grpc_call_element_args call_args = { @@ -52,8 +53,7 @@ DynamicFilters::Call::Call(Args args, grpc_error** error) *error = grpc_call_stack_init(channel_stack_->channel_stack_, 1, Destroy, this, &call_args); if (GPR_UNLIKELY(*error != GRPC_ERROR_NONE)) { - const char* error_string = grpc_error_string(*error); - gpr_log(GPR_ERROR, "error: %s", error_string); + gpr_log(GPR_ERROR, "error: %s", grpc_error_std_string(*error).c_str()); return; } grpc_call_stack_set_pollset_or_pollset_set(call_stack, args.pollent); @@ -93,7 +93,7 @@ void DynamicFilters::Call::Unref(const DebugLocation& /*location*/, GRPC_CALL_STACK_UNREF(CALL_TO_CALL_STACK(this), reason); } -void DynamicFilters::Call::Destroy(void* arg, grpc_error* /*error*/) { +void DynamicFilters::Call::Destroy(void* arg, grpc_error_handle /*error*/) { DynamicFilters::Call* self = static_cast<DynamicFilters::Call*>(arg); // Keep some members before destroying the subchannel call. grpc_closure* after_call_stack_destroy = self->after_call_stack_destroy_; @@ -123,13 +123,13 @@ void DynamicFilters::Call::IncrementRefCount( namespace { -void DestroyChannelStack(void* arg, grpc_error* /*error*/) { +void DestroyChannelStack(void* arg, grpc_error_handle /*error*/) { grpc_channel_stack* channel_stack = static_cast<grpc_channel_stack*>(arg); grpc_channel_stack_destroy(channel_stack); gpr_free(channel_stack); } -std::pair<grpc_channel_stack*, grpc_error*> CreateChannelStack( +std::pair<grpc_channel_stack*, grpc_error_handle> CreateChannelStack( const grpc_channel_args* args, std::vector<const grpc_channel_filter*> filters) { // Allocate memory for channel stack. @@ -138,13 +138,13 @@ std::pair<grpc_channel_stack*, grpc_error*> CreateChannelStack( grpc_channel_stack* channel_stack = reinterpret_cast<grpc_channel_stack*>(gpr_zalloc(channel_stack_size)); // Initialize stack. - grpc_error* error = grpc_channel_stack_init( + grpc_error_handle error = grpc_channel_stack_init( /*initial_refs=*/1, DestroyChannelStack, channel_stack, filters.data(), filters.size(), args, /*optional_transport=*/nullptr, "DynamicFilters", channel_stack); if (error != GRPC_ERROR_NONE) { gpr_log(GPR_ERROR, "error initializing client internal stack: %s", - grpc_error_string(error)); + grpc_error_std_string(error).c_str()); grpc_channel_stack_destroy(channel_stack); gpr_free(channel_stack); return {nullptr, error}; @@ -160,12 +160,16 @@ RefCountedPtr<DynamicFilters> DynamicFilters::Create( // Attempt to create channel stack from requested filters. auto p = CreateChannelStack(args, std::move(filters)); if (p.second != GRPC_ERROR_NONE) { - // Initial pass failed. Create with lame filter. - grpc_error* error = p.second; - p = CreateChannelStack(args, {&grpc_lame_filter}); + // Channel stack creation failed with requested filters. + // Create with lame filter instead. + grpc_error_handle error = p.second; + grpc_arg error_arg = MakeLameClientErrorArg(error); + grpc_channel_args* new_args = + grpc_channel_args_copy_and_add(args, &error_arg, 1); + GRPC_ERROR_UNREF(error); + p = CreateChannelStack(new_args, {&grpc_lame_filter}); GPR_ASSERT(p.second == GRPC_ERROR_NONE); - grpc_channel_element* elem = grpc_channel_stack_element(p.first, 0); - SetLameFilterError(elem, error); + grpc_channel_args_destroy(new_args); } return MakeRefCounted<DynamicFilters>(p.first); } @@ -175,7 +179,7 @@ DynamicFilters::~DynamicFilters() { } RefCountedPtr<DynamicFilters::Call> DynamicFilters::CreateCall( - DynamicFilters::Call::Args args, grpc_error** error) { + DynamicFilters::Call::Args args, grpc_error_handle* error) { size_t allocation_size = GPR_ROUND_UP_TO_ALIGNMENT_SIZE(sizeof(Call)) + channel_stack_->call_stack_size; Call* call = static_cast<Call*>(args.arena->Alloc(allocation_size)); diff --git a/grpc/src/core/ext/filters/client_channel/dynamic_filters.h b/grpc/src/core/ext/filters/client_channel/dynamic_filters.h index bcdc6d3b..08a7f498 100644 --- a/grpc/src/core/ext/filters/client_channel/dynamic_filters.h +++ b/grpc/src/core/ext/filters/client_channel/dynamic_filters.h @@ -46,7 +46,7 @@ class DynamicFilters : public RefCounted<DynamicFilters> { CallCombiner* call_combiner; }; - Call(Args args, grpc_error** error); + Call(Args args, grpc_error_handle* error); // Continues processing a transport stream op batch. void StartTransportStreamOpBatch(grpc_transport_stream_op_batch* batch); @@ -73,7 +73,7 @@ class DynamicFilters : public RefCounted<DynamicFilters> { void IncrementRefCount(); void IncrementRefCount(const DebugLocation& location, const char* reason); - static void Destroy(void* arg, grpc_error* error); + static void Destroy(void* arg, grpc_error_handle error); RefCountedPtr<DynamicFilters> channel_stack_; grpc_closure* after_call_stack_destroy_ = nullptr; @@ -88,7 +88,7 @@ class DynamicFilters : public RefCounted<DynamicFilters> { ~DynamicFilters() override; - RefCountedPtr<Call> CreateCall(Call::Args args, grpc_error** error); + RefCountedPtr<Call> CreateCall(Call::Args args, grpc_error_handle* error); private: grpc_channel_stack* channel_stack_; diff --git a/grpc/src/core/ext/filters/client_channel/global_subchannel_pool.cc b/grpc/src/core/ext/filters/client_channel/global_subchannel_pool.cc index 546d1c44..72593a6f 100644 --- a/grpc/src/core/ext/filters/client_channel/global_subchannel_pool.cc +++ b/grpc/src/core/ext/filters/client_channel/global_subchannel_pool.cc @@ -27,16 +27,6 @@ namespace grpc_core { #define GRPC_REGISTER_SUBCHANNEL_CALM_DOWN_AFTER_ATTEMPTS 100 #define GRPC_REGISTER_SUBCHANNEL_CALM_DOWN_MICROS 10 -GlobalSubchannelPool::GlobalSubchannelPool() { - subchannel_map_ = grpc_avl_create(&subchannel_avl_vtable_); - gpr_mu_init(&mu_); -} - -GlobalSubchannelPool::~GlobalSubchannelPool() { - gpr_mu_destroy(&mu_); - grpc_avl_unref(subchannel_map_, nullptr); -} - void GlobalSubchannelPool::Init() { instance_ = new RefCountedPtr<GlobalSubchannelPool>( MakeRefCounted<GlobalSubchannelPool>()); @@ -57,145 +47,37 @@ RefCountedPtr<GlobalSubchannelPool> GlobalSubchannelPool::instance() { return *instance_; } -Subchannel* GlobalSubchannelPool::RegisterSubchannel(SubchannelKey* key, - Subchannel* constructed) { - Subchannel* c = nullptr; - // Compare and swap (CAS) loop: - for (int attempt_count = 0; c == nullptr; attempt_count++) { - // Ref the shared map to have a local copy. - gpr_mu_lock(&mu_); - grpc_avl old_map = grpc_avl_ref(subchannel_map_, nullptr); - gpr_mu_unlock(&mu_); - // Check to see if a subchannel already exists. - c = static_cast<Subchannel*>(grpc_avl_get(old_map, key, nullptr)); - if (c != nullptr) { - // The subchannel already exists. Try to reuse it. - c = GRPC_SUBCHANNEL_REF_FROM_WEAK_REF(c, "subchannel_register+reuse"); - if (c != nullptr) { - GRPC_SUBCHANNEL_UNREF(constructed, - "subchannel_register+found_existing"); - // Exit the CAS loop without modifying the shared map. - } else { - // Reuse of the subchannel failed, so retry CAS loop - if (attempt_count >= - GRPC_REGISTER_SUBCHANNEL_CALM_DOWN_AFTER_ATTEMPTS) { - // GRPC_SUBCHANNEL_REF_FROM_WEAK_REF returning nullptr means that the - // subchannel we got is no longer valid and it's going to be removed - // from the AVL tree soon. Spinning here excesively here can actually - // prevent another thread from removing the subchannel, basically - // resulting in a live lock. See b/157516542 for more details. - // TODO(jtattermusch): the entire ref-counting mechanism for - // subchannels should be overhaulded, but the current workaround - // is fine for short-term. - // TODO(jtattermusch): gpr does not support thread yield operation, - // so a very short wait is the best we can do. - gpr_sleep_until(gpr_time_add( - gpr_now(GPR_CLOCK_REALTIME), - gpr_time_from_micros(GRPC_REGISTER_SUBCHANNEL_CALM_DOWN_MICROS, - GPR_TIMESPAN))); - } - } - } else { - // There hasn't been such subchannel. Add one. - // Note that we should ref the old map first because grpc_avl_add() will - // unref it while we still need to access it later. - grpc_avl new_map = grpc_avl_add( - grpc_avl_ref(old_map, nullptr), new SubchannelKey(*key), - GRPC_SUBCHANNEL_WEAK_REF(constructed, "subchannel_register+new"), - nullptr); - // Try to publish the change to the shared map. It may happen (but - // unlikely) that some other thread has changed the shared map, so compare - // to make sure it's unchanged before swapping. Retry if it's changed. - gpr_mu_lock(&mu_); - if (old_map.root == subchannel_map_.root) { - GPR_SWAP(grpc_avl, new_map, subchannel_map_); - c = constructed; - } - gpr_mu_unlock(&mu_); - grpc_avl_unref(new_map, nullptr); - } - grpc_avl_unref(old_map, nullptr); - } - return c; -} - -void GlobalSubchannelPool::UnregisterSubchannel(SubchannelKey* key) { - bool done = false; - // Compare and swap (CAS) loop: - while (!done) { - // Ref the shared map to have a local copy. - gpr_mu_lock(&mu_); - grpc_avl old_map = grpc_avl_ref(subchannel_map_, nullptr); - gpr_mu_unlock(&mu_); - // Remove the subchannel. - // Note that we should ref the old map first because grpc_avl_remove() will - // unref it while we still need to access it later. - grpc_avl new_map = - grpc_avl_remove(grpc_avl_ref(old_map, nullptr), key, nullptr); - // Try to publish the change to the shared map. It may happen (but - // unlikely) that some other thread has changed the shared map, so compare - // to make sure it's unchanged before swapping. Retry if it's changed. - gpr_mu_lock(&mu_); - if (old_map.root == subchannel_map_.root) { - GPR_SWAP(grpc_avl, new_map, subchannel_map_); - done = true; - } - gpr_mu_unlock(&mu_); - grpc_avl_unref(new_map, nullptr); - grpc_avl_unref(old_map, nullptr); +RefCountedPtr<Subchannel> GlobalSubchannelPool::RegisterSubchannel( + const SubchannelKey& key, RefCountedPtr<Subchannel> constructed) { + MutexLock lock(&mu_); + auto it = subchannel_map_.find(key); + if (it != subchannel_map_.end()) { + RefCountedPtr<Subchannel> existing = it->second->RefIfNonZero(); + if (existing != nullptr) return existing; } -} - -Subchannel* GlobalSubchannelPool::FindSubchannel(SubchannelKey* key) { - // Lock, and take a reference to the subchannel map. - // We don't need to do the search under a lock as AVL's are immutable. - gpr_mu_lock(&mu_); - grpc_avl index = grpc_avl_ref(subchannel_map_, nullptr); - gpr_mu_unlock(&mu_); - Subchannel* c = static_cast<Subchannel*>(grpc_avl_get(index, key, nullptr)); - if (c != nullptr) c = GRPC_SUBCHANNEL_REF_FROM_WEAK_REF(c, "found_from_pool"); - grpc_avl_unref(index, nullptr); - return c; + subchannel_map_[key] = constructed.get(); + return constructed; } RefCountedPtr<GlobalSubchannelPool>* GlobalSubchannelPool::instance_ = nullptr; -namespace { - -void sck_avl_destroy(void* p, void* /*user_data*/) { - SubchannelKey* key = static_cast<SubchannelKey*>(p); - delete key; -} - -void* sck_avl_copy(void* p, void* /*unused*/) { - const SubchannelKey* key = static_cast<const SubchannelKey*>(p); - auto* new_key = new SubchannelKey(*key); - return static_cast<void*>(new_key); -} - -long sck_avl_compare(void* a, void* b, void* /*unused*/) { - const SubchannelKey* key_a = static_cast<const SubchannelKey*>(a); - const SubchannelKey* key_b = static_cast<const SubchannelKey*>(b); - return key_a->Cmp(*key_b); -} - -void scv_avl_destroy(void* p, void* /*user_data*/) { - GRPC_SUBCHANNEL_WEAK_UNREF((Subchannel*)p, "global_subchannel_pool"); +void GlobalSubchannelPool::UnregisterSubchannel(const SubchannelKey& key, + Subchannel* subchannel) { + MutexLock lock(&mu_); + auto it = subchannel_map_.find(key); + // delete only if key hasn't been re-registered to a different subchannel + // between strong-unreffing and unregistration of subchannel. + if (it != subchannel_map_.end() && it->second == subchannel) { + subchannel_map_.erase(it); + } } -void* scv_avl_copy(void* p, void* /*unused*/) { - GRPC_SUBCHANNEL_WEAK_REF((Subchannel*)p, "global_subchannel_pool"); - return p; +RefCountedPtr<Subchannel> GlobalSubchannelPool::FindSubchannel( + const SubchannelKey& key) { + MutexLock lock(&mu_); + auto it = subchannel_map_.find(key); + if (it == subchannel_map_.end()) return nullptr; + return it->second->RefIfNonZero(); } -} // namespace - -const grpc_avl_vtable GlobalSubchannelPool::subchannel_avl_vtable_ = { - sck_avl_destroy, // destroy_key - sck_avl_copy, // copy_key - sck_avl_compare, // compare_keys - scv_avl_destroy, // destroy_value - scv_avl_copy // copy_value -}; - } // namespace grpc_core diff --git a/grpc/src/core/ext/filters/client_channel/global_subchannel_pool.h b/grpc/src/core/ext/filters/client_channel/global_subchannel_pool.h index 96dc8d7b..7ff9b070 100644 --- a/grpc/src/core/ext/filters/client_channel/global_subchannel_pool.h +++ b/grpc/src/core/ext/filters/client_channel/global_subchannel_pool.h @@ -21,7 +21,10 @@ #include <grpc/support/port_platform.h> +#include <map> + #include "src/core/ext/filters/client_channel/subchannel_pool_interface.h" +#include "src/core/lib/gprpp/sync.h" namespace grpc_core { @@ -33,8 +36,8 @@ namespace grpc_core { class GlobalSubchannelPool final : public SubchannelPoolInterface { public: // The ctor and dtor are not intended to use directly. - GlobalSubchannelPool(); - ~GlobalSubchannelPool() override; + GlobalSubchannelPool() {} + ~GlobalSubchannelPool() override {} // Should be called exactly once at filter initialization time. static void Init(); @@ -45,22 +48,24 @@ class GlobalSubchannelPool final : public SubchannelPoolInterface { static RefCountedPtr<GlobalSubchannelPool> instance(); // Implements interface methods. - Subchannel* RegisterSubchannel(SubchannelKey* key, - Subchannel* constructed) override; - void UnregisterSubchannel(SubchannelKey* key) override; - Subchannel* FindSubchannel(SubchannelKey* key) override; + RefCountedPtr<Subchannel> RegisterSubchannel( + const SubchannelKey& key, RefCountedPtr<Subchannel> constructed) override + ABSL_LOCKS_EXCLUDED(mu_); + void UnregisterSubchannel(const SubchannelKey& key, + Subchannel* subchannel) override + ABSL_LOCKS_EXCLUDED(mu_); + RefCountedPtr<Subchannel> FindSubchannel(const SubchannelKey& key) override + ABSL_LOCKS_EXCLUDED(mu_); private: // The singleton instance. (It's a pointer to RefCountedPtr so that this // non-local static object can be trivially destructible.) static RefCountedPtr<GlobalSubchannelPool>* instance_; - // The vtable for subchannel operations in an AVL tree. - static const grpc_avl_vtable subchannel_avl_vtable_; // A map from subchannel key to subchannel. - grpc_avl subchannel_map_; + std::map<SubchannelKey, Subchannel*> subchannel_map_ ABSL_GUARDED_BY(mu_); // To protect subchannel_map_. - gpr_mu mu_; + Mutex mu_; }; } // namespace grpc_core diff --git a/grpc/src/core/ext/filters/client_channel/health/health_check_client.cc b/grpc/src/core/ext/filters/client_channel/health/health_check_client.cc index 7885fadd..adde23d3 100644 --- a/grpc/src/core/ext/filters/client_channel/health/health_check_client.cc +++ b/grpc/src/core/ext/filters/client_channel/health/health_check_client.cc @@ -157,7 +157,7 @@ void HealthCheckClient::StartRetryTimerLocked() { grpc_timer_init(&retry_timer_, next_try, &retry_timer_callback_); } -void HealthCheckClient::OnRetryTimer(void* arg, grpc_error* error) { +void HealthCheckClient::OnRetryTimer(void* arg, grpc_error_handle error) { HealthCheckClient* self = static_cast<HealthCheckClient*>(arg); { MutexLock lock(&self->mu_); @@ -202,7 +202,7 @@ void EncodeRequest(const std::string& service_name, // Returns true if healthy. // If there was an error parsing the response, sets *error and returns false. -bool DecodeResponse(grpc_slice_buffer* slice_buffer, grpc_error** error) { +bool DecodeResponse(grpc_slice_buffer* slice_buffer, grpc_error_handle* error) { // If message is empty, assume unhealthy. if (slice_buffer->length == 0) { *error = @@ -269,11 +269,8 @@ HealthCheckClient::CallState::~CallState() { // Unset the call combiner cancellation closure. This has the // effect of scheduling the previously set cancellation closure, if // any, so that it can release any internal references it may be - // holding to the call stack. Also flush the closures on exec_ctx so that - // filters that schedule cancel notification closures on exec_ctx do not - // need to take a ref of the call stack to guarantee closure liveness. + // holding to the call stack. call_combiner_.SetNotifyOnCancel(nullptr); - ExecCtx::Get()->Flush(); arena_->Destroy(); } @@ -293,7 +290,7 @@ void HealthCheckClient::CallState::StartCall() { context_, &call_combiner_, }; - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; call_ = SubchannelCall::Create(std::move(args), &error).release(); // Register after-destruction callback. GRPC_CLOSURE_INIT(&after_call_stack_destruction_, AfterCallStackDestruction, @@ -304,7 +301,8 @@ void HealthCheckClient::CallState::StartCall() { gpr_log(GPR_ERROR, "HealthCheckClient %p CallState %p: error creating health " "checking call on subchannel (%s); will retry", - health_check_client_.get(), this, grpc_error_string(error)); + health_check_client_.get(), this, + grpc_error_std_string(error).c_str()); GRPC_ERROR_UNREF(error); CallEndedLocked(/*retry=*/true); return; @@ -381,7 +379,7 @@ void HealthCheckClient::CallState::StartCall() { } void HealthCheckClient::CallState::StartBatchInCallCombiner( - void* arg, grpc_error* /*error*/) { + void* arg, grpc_error_handle /*error*/) { grpc_transport_stream_op_batch* batch = static_cast<grpc_transport_stream_op_batch*>(arg); SubchannelCall* call = @@ -399,14 +397,14 @@ void HealthCheckClient::CallState::StartBatch( } void HealthCheckClient::CallState::AfterCallStackDestruction( - void* arg, grpc_error* /*error*/) { + void* arg, grpc_error_handle /*error*/) { HealthCheckClient::CallState* self = static_cast<HealthCheckClient::CallState*>(arg); delete self; } -void HealthCheckClient::CallState::OnCancelComplete(void* arg, - grpc_error* /*error*/) { +void HealthCheckClient::CallState::OnCancelComplete( + void* arg, grpc_error_handle /*error*/) { HealthCheckClient::CallState* self = static_cast<HealthCheckClient::CallState*>(arg); GRPC_CALL_COMBINER_STOP(&self->call_combiner_, "health_cancel"); @@ -414,7 +412,7 @@ void HealthCheckClient::CallState::OnCancelComplete(void* arg, } void HealthCheckClient::CallState::StartCancel(void* arg, - grpc_error* /*error*/) { + grpc_error_handle /*error*/) { HealthCheckClient::CallState* self = static_cast<HealthCheckClient::CallState*>(arg); auto* batch = grpc_make_transport_stream_op( @@ -437,7 +435,7 @@ void HealthCheckClient::CallState::Cancel() { } void HealthCheckClient::CallState::OnComplete(void* arg, - grpc_error* /*error*/) { + grpc_error_handle /*error*/) { HealthCheckClient::CallState* self = static_cast<HealthCheckClient::CallState*>(arg); GRPC_CALL_COMBINER_STOP(&self->call_combiner_, "on_complete"); @@ -447,7 +445,7 @@ void HealthCheckClient::CallState::OnComplete(void* arg, } void HealthCheckClient::CallState::RecvInitialMetadataReady( - void* arg, grpc_error* /*error*/) { + void* arg, grpc_error_handle /*error*/) { HealthCheckClient::CallState* self = static_cast<HealthCheckClient::CallState*>(arg); GRPC_CALL_COMBINER_STOP(&self->call_combiner_, "recv_initial_metadata_ready"); @@ -455,7 +453,8 @@ void HealthCheckClient::CallState::RecvInitialMetadataReady( self->call_->Unref(DEBUG_LOCATION, "recv_initial_metadata_ready"); } -void HealthCheckClient::CallState::DoneReadingRecvMessage(grpc_error* error) { +void HealthCheckClient::CallState::DoneReadingRecvMessage( + grpc_error_handle error) { recv_message_.reset(); if (error != GRPC_ERROR_NONE) { GRPC_ERROR_UNREF(error); @@ -467,10 +466,10 @@ void HealthCheckClient::CallState::DoneReadingRecvMessage(grpc_error* error) { const bool healthy = DecodeResponse(&recv_message_buffer_, &error); const grpc_connectivity_state state = healthy ? GRPC_CHANNEL_READY : GRPC_CHANNEL_TRANSIENT_FAILURE; - const char* reason = error == GRPC_ERROR_NONE && !healthy - ? "backend unhealthy" - : grpc_error_string(error); - health_check_client_->SetHealthStatus(state, reason); + health_check_client_->SetHealthStatus( + state, error == GRPC_ERROR_NONE && !healthy + ? "backend unhealthy" + : grpc_error_std_string(error).c_str()); seen_response_.Store(true, MemoryOrder::RELEASE); grpc_slice_buffer_destroy_internal(&recv_message_buffer_); // Start another recv_message batch. @@ -485,9 +484,9 @@ void HealthCheckClient::CallState::DoneReadingRecvMessage(grpc_error* error) { StartBatch(&recv_message_batch_); } -grpc_error* HealthCheckClient::CallState::PullSliceFromRecvMessage() { +grpc_error_handle HealthCheckClient::CallState::PullSliceFromRecvMessage() { grpc_slice slice; - grpc_error* error = recv_message_->Pull(&slice); + grpc_error_handle error = recv_message_->Pull(&slice); if (error == GRPC_ERROR_NONE) { grpc_slice_buffer_add(&recv_message_buffer_, slice); } @@ -496,7 +495,7 @@ grpc_error* HealthCheckClient::CallState::PullSliceFromRecvMessage() { void HealthCheckClient::CallState::ContinueReadingRecvMessage() { while (recv_message_->Next(SIZE_MAX, &recv_message_ready_)) { - grpc_error* error = PullSliceFromRecvMessage(); + grpc_error_handle error = PullSliceFromRecvMessage(); if (error != GRPC_ERROR_NONE) { DoneReadingRecvMessage(error); return; @@ -509,7 +508,7 @@ void HealthCheckClient::CallState::ContinueReadingRecvMessage() { } void HealthCheckClient::CallState::OnByteStreamNext(void* arg, - grpc_error* error) { + grpc_error_handle error) { HealthCheckClient::CallState* self = static_cast<HealthCheckClient::CallState*>(arg); if (error != GRPC_ERROR_NONE) { @@ -528,8 +527,8 @@ void HealthCheckClient::CallState::OnByteStreamNext(void* arg, } } -void HealthCheckClient::CallState::RecvMessageReady(void* arg, - grpc_error* /*error*/) { +void HealthCheckClient::CallState::RecvMessageReady( + void* arg, grpc_error_handle /*error*/) { HealthCheckClient::CallState* self = static_cast<HealthCheckClient::CallState*>(arg); GRPC_CALL_COMBINER_STOP(&self->call_combiner_, "recv_message_ready"); @@ -545,7 +544,7 @@ void HealthCheckClient::CallState::RecvMessageReady(void* arg, } void HealthCheckClient::CallState::RecvTrailingMetadataReady( - void* arg, grpc_error* error) { + void* arg, grpc_error_handle error) { HealthCheckClient::CallState* self = static_cast<HealthCheckClient::CallState*>(arg); GRPC_CALL_COMBINER_STOP(&self->call_combiner_, diff --git a/grpc/src/core/ext/filters/client_channel/health/health_check_client.h b/grpc/src/core/ext/filters/client_channel/health/health_check_client.h index 0fc39b04..d1f063b5 100644 --- a/grpc/src/core/ext/filters/client_channel/health/health_check_client.h +++ b/grpc/src/core/ext/filters/client_channel/health/health_check_client.h @@ -64,30 +64,30 @@ class HealthCheckClient : public InternallyRefCounted<HealthCheckClient> { void Orphan() override; - void StartCall(); + void StartCall() ABSL_EXCLUSIVE_LOCKS_REQUIRED(&HealthCheckClient::mu_); private: void Cancel(); void StartBatch(grpc_transport_stream_op_batch* batch); - static void StartBatchInCallCombiner(void* arg, grpc_error* error); + static void StartBatchInCallCombiner(void* arg, grpc_error_handle error); - // Requires holding health_check_client_->mu_. - void CallEndedLocked(bool retry); + void CallEndedLocked(bool retry) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(health_check_client_->mu_); - static void OnComplete(void* arg, grpc_error* error); - static void RecvInitialMetadataReady(void* arg, grpc_error* error); - static void RecvMessageReady(void* arg, grpc_error* error); - static void RecvTrailingMetadataReady(void* arg, grpc_error* error); - static void StartCancel(void* arg, grpc_error* error); - static void OnCancelComplete(void* arg, grpc_error* error); + static void OnComplete(void* arg, grpc_error_handle error); + static void RecvInitialMetadataReady(void* arg, grpc_error_handle error); + static void RecvMessageReady(void* arg, grpc_error_handle error); + static void RecvTrailingMetadataReady(void* arg, grpc_error_handle error); + static void StartCancel(void* arg, grpc_error_handle error); + static void OnCancelComplete(void* arg, grpc_error_handle error); - static void OnByteStreamNext(void* arg, grpc_error* error); + static void OnByteStreamNext(void* arg, grpc_error_handle error); void ContinueReadingRecvMessage(); - grpc_error* PullSliceFromRecvMessage(); - void DoneReadingRecvMessage(grpc_error* error); + grpc_error_handle PullSliceFromRecvMessage(); + void DoneReadingRecvMessage(grpc_error_handle error); - static void AfterCallStackDestruction(void* arg, grpc_error* error); + static void AfterCallStackDestruction(void* arg, grpc_error_handle error); RefCountedPtr<HealthCheckClient> health_check_client_; grpc_polling_entity pollent_; @@ -141,14 +141,14 @@ class HealthCheckClient : public InternallyRefCounted<HealthCheckClient> { }; void StartCall(); - void StartCallLocked(); // Requires holding mu_. + void StartCallLocked() ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_); - void StartRetryTimerLocked(); // Requires holding mu_. - static void OnRetryTimer(void* arg, grpc_error* error); + void StartRetryTimerLocked() ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_); + static void OnRetryTimer(void* arg, grpc_error_handle error); void SetHealthStatus(grpc_connectivity_state state, const char* reason); - void SetHealthStatusLocked(grpc_connectivity_state state, - const char* reason); // Requires holding mu_. + void SetHealthStatusLocked(grpc_connectivity_state state, const char* reason) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_); std::string service_name_; RefCountedPtr<ConnectedSubchannel> connected_subchannel_; @@ -156,18 +156,19 @@ class HealthCheckClient : public InternallyRefCounted<HealthCheckClient> { RefCountedPtr<channelz::SubchannelNode> channelz_node_; Mutex mu_; - RefCountedPtr<ConnectivityStateWatcherInterface> watcher_; - bool shutting_down_ = false; + RefCountedPtr<ConnectivityStateWatcherInterface> watcher_ + ABSL_GUARDED_BY(mu_); + bool shutting_down_ ABSL_GUARDED_BY(mu_) = false; // The data associated with the current health check call. It holds a ref // to this HealthCheckClient object. - OrphanablePtr<CallState> call_state_; + OrphanablePtr<CallState> call_state_ ABSL_GUARDED_BY(mu_); // Call retry state. - BackOff retry_backoff_; - grpc_timer retry_timer_; - grpc_closure retry_timer_callback_; - bool retry_timer_callback_pending_ = false; + BackOff retry_backoff_ ABSL_GUARDED_BY(mu_); + grpc_timer retry_timer_ ABSL_GUARDED_BY(mu_); + grpc_closure retry_timer_callback_ ABSL_GUARDED_BY(mu_); + bool retry_timer_callback_pending_ ABSL_GUARDED_BY(mu_) = false; }; } // namespace grpc_core diff --git a/grpc/src/core/ext/filters/client_channel/http_connect_handshaker.cc b/grpc/src/core/ext/filters/client_channel/http_connect_handshaker.cc index f469a5a9..3dff8249 100644 --- a/grpc/src/core/ext/filters/client_channel/http_connect_handshaker.cc +++ b/grpc/src/core/ext/filters/client_channel/http_connect_handshaker.cc @@ -47,7 +47,7 @@ namespace { class HttpConnectHandshaker : public Handshaker { public: HttpConnectHandshaker(); - void Shutdown(grpc_error* why) override; + void Shutdown(grpc_error_handle why) override; void DoHandshake(grpc_tcp_server_acceptor* acceptor, grpc_closure* on_handshake_done, HandshakerArgs* args) override; @@ -55,30 +55,31 @@ class HttpConnectHandshaker : public Handshaker { private: ~HttpConnectHandshaker() override; - void CleanupArgsForFailureLocked(); - void HandshakeFailedLocked(grpc_error* error); - static void OnWriteDone(void* arg, grpc_error* error); - static void OnReadDone(void* arg, grpc_error* error); - static void OnWriteDoneScheduler(void* arg, grpc_error* error); - static void OnReadDoneScheduler(void* arg, grpc_error* error); + void CleanupArgsForFailureLocked() ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_); + void HandshakeFailedLocked(grpc_error_handle error) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_); + static void OnWriteDone(void* arg, grpc_error_handle error); + static void OnReadDone(void* arg, grpc_error_handle error); + static void OnWriteDoneScheduler(void* arg, grpc_error_handle error); + static void OnReadDoneScheduler(void* arg, grpc_error_handle error); Mutex mu_; - bool is_shutdown_ = false; + bool is_shutdown_ ABSL_GUARDED_BY(mu_) = false; // Endpoint and read buffer to destroy after a shutdown. - grpc_endpoint* endpoint_to_destroy_ = nullptr; - grpc_slice_buffer* read_buffer_to_destroy_ = nullptr; + grpc_endpoint* endpoint_to_destroy_ ABSL_GUARDED_BY(mu_) = nullptr; + grpc_slice_buffer* read_buffer_to_destroy_ ABSL_GUARDED_BY(mu_) = nullptr; // State saved while performing the handshake. HandshakerArgs* args_ = nullptr; grpc_closure* on_handshake_done_ = nullptr; // Objects for processing the HTTP CONNECT request and response. - grpc_slice_buffer write_buffer_; - grpc_closure request_done_closure_; - grpc_closure response_read_closure_; - grpc_http_parser http_parser_; - grpc_http_response http_response_; + grpc_slice_buffer write_buffer_ ABSL_GUARDED_BY(mu_); + grpc_closure request_done_closure_ ABSL_GUARDED_BY(mu_); + grpc_closure response_read_closure_ ABSL_GUARDED_BY(mu_); + grpc_http_parser http_parser_ ABSL_GUARDED_BY(mu_); + grpc_http_response http_response_ ABSL_GUARDED_BY(mu_); }; HttpConnectHandshaker::~HttpConnectHandshaker() { @@ -107,7 +108,7 @@ void HttpConnectHandshaker::CleanupArgsForFailureLocked() { // If the handshake failed or we're shutting down, clean up and invoke the // callback with the error. -void HttpConnectHandshaker::HandshakeFailedLocked(grpc_error* error) { +void HttpConnectHandshaker::HandshakeFailedLocked(grpc_error_handle error) { if (error == GRPC_ERROR_NONE) { // If we were shut down after an endpoint operation succeeded but // before the endpoint callback was invoked, we need to generate our @@ -133,7 +134,8 @@ void HttpConnectHandshaker::HandshakeFailedLocked(grpc_error* error) { // This callback can be invoked inline while already holding onto the mutex. To // avoid deadlocks, schedule OnWriteDone on ExecCtx. -void HttpConnectHandshaker::OnWriteDoneScheduler(void* arg, grpc_error* error) { +void HttpConnectHandshaker::OnWriteDoneScheduler(void* arg, + grpc_error_handle error) { auto* handshaker = static_cast<HttpConnectHandshaker*>(arg); grpc_core::ExecCtx::Run( DEBUG_LOCATION, @@ -144,14 +146,14 @@ void HttpConnectHandshaker::OnWriteDoneScheduler(void* arg, grpc_error* error) { } // Callback invoked when finished writing HTTP CONNECT request. -void HttpConnectHandshaker::OnWriteDone(void* arg, grpc_error* error) { +void HttpConnectHandshaker::OnWriteDone(void* arg, grpc_error_handle error) { auto* handshaker = static_cast<HttpConnectHandshaker*>(arg); ReleasableMutexLock lock(&handshaker->mu_); if (error != GRPC_ERROR_NONE || handshaker->is_shutdown_) { // If the write failed or we're shutting down, clean up and invoke the // callback with the error. handshaker->HandshakeFailedLocked(GRPC_ERROR_REF(error)); - lock.Unlock(); + lock.Release(); handshaker->Unref(); } else { // Otherwise, read the response. @@ -167,7 +169,8 @@ void HttpConnectHandshaker::OnWriteDone(void* arg, grpc_error* error) { // This callback can be invoked inline while already holding onto the mutex. To // avoid deadlocks, schedule OnReadDone on ExecCtx. -void HttpConnectHandshaker::OnReadDoneScheduler(void* arg, grpc_error* error) { +void HttpConnectHandshaker::OnReadDoneScheduler(void* arg, + grpc_error_handle error) { auto* handshaker = static_cast<HttpConnectHandshaker*>(arg); grpc_core::ExecCtx::Run( DEBUG_LOCATION, @@ -178,7 +181,7 @@ void HttpConnectHandshaker::OnReadDoneScheduler(void* arg, grpc_error* error) { } // Callback invoked for reading HTTP CONNECT response. -void HttpConnectHandshaker::OnReadDone(void* arg, grpc_error* error) { +void HttpConnectHandshaker::OnReadDone(void* arg, grpc_error_handle error) { auto* handshaker = static_cast<HttpConnectHandshaker*>(arg); ReleasableMutexLock lock(&handshaker->mu_); if (error != GRPC_ERROR_NONE || handshaker->is_shutdown_) { @@ -256,7 +259,7 @@ done: // Set shutdown to true so that subsequent calls to // http_connect_handshaker_shutdown() do nothing. handshaker->is_shutdown_ = true; - lock.Unlock(); + lock.Release(); handshaker->Unref(); } @@ -264,7 +267,7 @@ done: // Public handshaker methods // -void HttpConnectHandshaker::Shutdown(grpc_error* why) { +void HttpConnectHandshaker::Shutdown(grpc_error_handle why) { { MutexLock lock(&mu_); if (!is_shutdown_) { diff --git a/grpc/src/core/ext/filters/client_channel/lb_policy.cc b/grpc/src/core/ext/filters/client_channel/lb_policy.cc index 4ef8cbb8..b9272249 100644 --- a/grpc/src/core/ext/filters/client_channel/lb_policy.cc +++ b/grpc/src/core/ext/filters/client_channel/lb_policy.cc @@ -70,6 +70,9 @@ LoadBalancingPolicy::UpdateArgs::UpdateArgs(UpdateArgs&& other) noexcept { LoadBalancingPolicy::UpdateArgs& LoadBalancingPolicy::UpdateArgs::operator=( const UpdateArgs& other) { + if (&other == this) { + return *this; + } addresses = other.addresses; config = other.config; grpc_channel_args_destroy(args); @@ -110,7 +113,7 @@ LoadBalancingPolicy::PickResult LoadBalancingPolicy::QueuePicker::Pick( auto* parent = parent_->Ref().release(); // ref held by lambda. ExecCtx::Run(DEBUG_LOCATION, GRPC_CLOSURE_CREATE( - [](void* arg, grpc_error* /*error*/) { + [](void* arg, grpc_error_handle /*error*/) { auto* parent = static_cast<LoadBalancingPolicy*>(arg); parent->work_serializer()->Run( [parent]() { diff --git a/grpc/src/core/ext/filters/client_channel/lb_policy.h b/grpc/src/core/ext/filters/client_channel/lb_policy.h index c9fc1429..1c6f3098 100644 --- a/grpc/src/core/ext/filters/client_channel/lb_policy.h +++ b/grpc/src/core/ext/filters/client_channel/lb_policy.h @@ -230,7 +230,7 @@ class LoadBalancingPolicy : public InternallyRefCounted<LoadBalancingPolicy> { /// Error to be set when returning a failure. // TODO(roth): Replace this with something similar to grpc::Status, // so that we don't expose grpc_error to this API. - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; /// Used only if type is PICK_COMPLETE. /// Callback set by LB policy to be notified of trailing metadata. @@ -243,7 +243,7 @@ class LoadBalancingPolicy : public InternallyRefCounted<LoadBalancingPolicy> { // TODO(roth): The arguments to this callback should be moved into a // struct, so that we can later add new fields without breaking // existing implementations. - std::function<void(grpc_error*, MetadataInterface*, CallState*)> + std::function<void(grpc_error_handle, MetadataInterface*, CallState*)> recv_trailing_metadata_ready; }; @@ -387,13 +387,13 @@ class LoadBalancingPolicy : public InternallyRefCounted<LoadBalancingPolicy> { // A picker that returns PICK_TRANSIENT_FAILURE for all picks. class TransientFailurePicker : public SubchannelPicker { public: - explicit TransientFailurePicker(grpc_error* error) : error_(error) {} + explicit TransientFailurePicker(grpc_error_handle error) : error_(error) {} ~TransientFailurePicker() override { GRPC_ERROR_UNREF(error_); } PickResult Pick(PickArgs args) override; private: - grpc_error* error_; + grpc_error_handle error_; }; protected: diff --git a/grpc/src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc b/grpc/src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc index c8d1b1d7..5f7d75c0 100644 --- a/grpc/src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc +++ b/grpc/src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc @@ -30,8 +30,8 @@ #include "src/core/lib/iomgr/error.h" #include "src/core/lib/profiling/timers.h" -static grpc_error* clr_init_channel_elem(grpc_channel_element* /*elem*/, - grpc_channel_element_args* /*args*/) { +static grpc_error_handle clr_init_channel_elem( + grpc_channel_element* /*elem*/, grpc_channel_element_args* /*args*/) { return GRPC_ERROR_NONE; } @@ -54,7 +54,7 @@ struct call_data { } // namespace -static void on_complete_for_send(void* arg, grpc_error* error) { +static void on_complete_for_send(void* arg, grpc_error_handle error) { call_data* calld = static_cast<call_data*>(arg); if (error == GRPC_ERROR_NONE) { calld->send_initial_metadata_succeeded = true; @@ -63,7 +63,7 @@ static void on_complete_for_send(void* arg, grpc_error* error) { GRPC_ERROR_REF(error)); } -static void recv_initial_metadata_ready(void* arg, grpc_error* error) { +static void recv_initial_metadata_ready(void* arg, grpc_error_handle error) { call_data* calld = static_cast<call_data*>(arg); if (error == GRPC_ERROR_NONE) { calld->recv_initial_metadata_succeeded = true; @@ -73,8 +73,8 @@ static void recv_initial_metadata_ready(void* arg, grpc_error* error) { GRPC_ERROR_REF(error)); } -static grpc_error* clr_init_call_elem(grpc_call_element* elem, - const grpc_call_element_args* args) { +static grpc_error_handle clr_init_call_elem( + grpc_call_element* elem, const grpc_call_element_args* args) { GPR_ASSERT(args->context != nullptr); new (elem->call_data) call_data(); return GRPC_ERROR_NONE; diff --git a/grpc/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc b/grpc/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc index 6a46a0bb..4b4f1ab6 100644 --- a/grpc/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc +++ b/grpc/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc @@ -90,6 +90,8 @@ #include "src/core/ext/filters/client_channel/lb_policy_registry.h" #include "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h" #include "src/core/ext/filters/client_channel/server_address.h" +#include "src/core/lib/address_utils/parse_address.h" +#include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/backoff/backoff.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_stack.h" @@ -98,9 +100,7 @@ #include "src/core/lib/gprpp/memory.h" #include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/iomgr/parse_address.h" #include "src/core/lib/iomgr/sockaddr.h" -#include "src/core/lib/iomgr/sockaddr_utils.h" #include "src/core/lib/iomgr/timer.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/slice/slice_string_helpers.h" @@ -186,17 +186,17 @@ class GrpcLb : public LoadBalancingPolicy { void ScheduleNextClientLoadReportLocked(); void SendClientLoadReportLocked(); - static void MaybeSendClientLoadReport(void* arg, grpc_error* error); - static void ClientLoadReportDone(void* arg, grpc_error* error); - static void OnInitialRequestSent(void* arg, grpc_error* error); - static void OnBalancerMessageReceived(void* arg, grpc_error* error); - static void OnBalancerStatusReceived(void* arg, grpc_error* error); + static void MaybeSendClientLoadReport(void* arg, grpc_error_handle error); + static void ClientLoadReportDone(void* arg, grpc_error_handle error); + static void OnInitialRequestSent(void* arg, grpc_error_handle error); + static void OnBalancerMessageReceived(void* arg, grpc_error_handle error); + static void OnBalancerStatusReceived(void* arg, grpc_error_handle error); - void MaybeSendClientLoadReportLocked(grpc_error* error); - void ClientLoadReportDoneLocked(grpc_error* error); + void MaybeSendClientLoadReportLocked(grpc_error_handle error); + void ClientLoadReportDoneLocked(grpc_error_handle error); void OnInitialRequestSentLocked(); void OnBalancerMessageReceivedLocked(); - void OnBalancerStatusReceivedLocked(grpc_error* error); + void OnBalancerStatusReceivedLocked(grpc_error_handle error); // The owning LB policy. RefCountedPtr<LoadBalancingPolicy> grpclb_policy_; @@ -410,14 +410,14 @@ class GrpcLb : public LoadBalancingPolicy { // Methods for dealing with fallback state. void MaybeEnterFallbackModeAfterStartup(); - static void OnFallbackTimer(void* arg, grpc_error* error); - void OnFallbackTimerLocked(grpc_error* error); + static void OnFallbackTimer(void* arg, grpc_error_handle error); + void OnFallbackTimerLocked(grpc_error_handle error); // Methods for dealing with the balancer call. void StartBalancerCallLocked(); void StartBalancerCallRetryTimerLocked(); - static void OnBalancerCallRetryTimer(void* arg, grpc_error* error); - void OnBalancerCallRetryTimerLocked(grpc_error* error); + static void OnBalancerCallRetryTimer(void* arg, grpc_error_handle error); + void OnBalancerCallRetryTimerLocked(grpc_error_handle error); // Methods for dealing with the child policy. grpc_channel_args* CreateChildPolicyArgsLocked( @@ -893,6 +893,10 @@ void GrpcLb::BalancerCallState::StartQuery() { } void GrpcLb::BalancerCallState::ScheduleNextClientLoadReportLocked() { + // InvalidateNow to avoid getting stuck re-initializing this timer + // in a loop while draining the currently-held WorkSerializer. + // Also see https://github.com/grpc/grpc/issues/26079. + ExecCtx::Get()->InvalidateNow(); const grpc_millis next_client_load_report_time = ExecCtx::Get()->Now() + client_stats_report_interval_; GRPC_CLOSURE_INIT(&client_load_report_closure_, MaybeSendClientLoadReport, @@ -902,8 +906,8 @@ void GrpcLb::BalancerCallState::ScheduleNextClientLoadReportLocked() { client_load_report_timer_callback_pending_ = true; } -void GrpcLb::BalancerCallState::MaybeSendClientLoadReport(void* arg, - grpc_error* error) { +void GrpcLb::BalancerCallState::MaybeSendClientLoadReport( + void* arg, grpc_error_handle error) { BalancerCallState* lb_calld = static_cast<BalancerCallState*>(arg); GRPC_ERROR_REF(error); // ref owned by lambda lb_calld->grpclb_policy()->work_serializer()->Run( @@ -912,7 +916,7 @@ void GrpcLb::BalancerCallState::MaybeSendClientLoadReport(void* arg, } void GrpcLb::BalancerCallState::MaybeSendClientLoadReportLocked( - grpc_error* error) { + grpc_error_handle error) { client_load_report_timer_callback_pending_ = false; if (error != GRPC_ERROR_NONE || this != grpclb_policy()->lb_calld_.get()) { Unref(DEBUG_LOCATION, "client_load_report"); @@ -982,7 +986,7 @@ void GrpcLb::BalancerCallState::SendClientLoadReportLocked() { } void GrpcLb::BalancerCallState::ClientLoadReportDone(void* arg, - grpc_error* error) { + grpc_error_handle error) { BalancerCallState* lb_calld = static_cast<BalancerCallState*>(arg); GRPC_ERROR_REF(error); // ref owned by lambda lb_calld->grpclb_policy()->work_serializer()->Run( @@ -990,7 +994,8 @@ void GrpcLb::BalancerCallState::ClientLoadReportDone(void* arg, DEBUG_LOCATION); } -void GrpcLb::BalancerCallState::ClientLoadReportDoneLocked(grpc_error* error) { +void GrpcLb::BalancerCallState::ClientLoadReportDoneLocked( + grpc_error_handle error) { grpc_byte_buffer_destroy(send_message_payload_); send_message_payload_ = nullptr; if (error != GRPC_ERROR_NONE || this != grpclb_policy()->lb_calld_.get()) { @@ -1001,8 +1006,8 @@ void GrpcLb::BalancerCallState::ClientLoadReportDoneLocked(grpc_error* error) { ScheduleNextClientLoadReportLocked(); } -void GrpcLb::BalancerCallState::OnInitialRequestSent(void* arg, - grpc_error* /*error*/) { +void GrpcLb::BalancerCallState::OnInitialRequestSent( + void* arg, grpc_error_handle /*error*/) { BalancerCallState* lb_calld = static_cast<BalancerCallState*>(arg); lb_calld->grpclb_policy()->work_serializer()->Run( [lb_calld]() { lb_calld->OnInitialRequestSentLocked(); }, DEBUG_LOCATION); @@ -1021,7 +1026,7 @@ void GrpcLb::BalancerCallState::OnInitialRequestSentLocked() { } void GrpcLb::BalancerCallState::OnBalancerMessageReceived( - void* arg, grpc_error* /*error*/) { + void* arg, grpc_error_handle /*error*/) { BalancerCallState* lb_calld = static_cast<BalancerCallState*>(arg); lb_calld->grpclb_policy()->work_serializer()->Run( [lb_calld]() { lb_calld->OnBalancerMessageReceivedLocked(); }, @@ -1183,8 +1188,8 @@ void GrpcLb::BalancerCallState::OnBalancerMessageReceivedLocked() { } } -void GrpcLb::BalancerCallState::OnBalancerStatusReceived(void* arg, - grpc_error* error) { +void GrpcLb::BalancerCallState::OnBalancerStatusReceived( + void* arg, grpc_error_handle error) { BalancerCallState* lb_calld = static_cast<BalancerCallState*>(arg); GRPC_ERROR_REF(error); // owned by lambda lb_calld->grpclb_policy()->work_serializer()->Run( @@ -1193,7 +1198,7 @@ void GrpcLb::BalancerCallState::OnBalancerStatusReceived(void* arg, } void GrpcLb::BalancerCallState::OnBalancerStatusReceivedLocked( - grpc_error* error) { + grpc_error_handle error) { GPR_ASSERT(lb_call_ != nullptr); if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_glb_trace)) { char* status_details = grpc_slice_to_c_string(lb_call_status_details_); @@ -1201,7 +1206,7 @@ void GrpcLb::BalancerCallState::OnBalancerStatusReceivedLocked( "[grpclb %p] lb_calld=%p: Status from LB server received. " "Status = %d, details = '%s', (lb_call: %p), error '%s'", grpclb_policy(), this, lb_call_status_, status_details, lb_call_, - grpc_error_string(error)); + grpc_error_std_string(error).c_str()); gpr_free(status_details); } GRPC_ERROR_UNREF(error); @@ -1259,12 +1264,10 @@ ServerAddressList ExtractBalancerAddresses(const grpc_channel_args& args) { * stream for the reception of load balancing updates. * * Inputs: - * - \a addresses: corresponding to the balancers. * - \a response_generator: in order to propagate updates from the resolver * above the grpclb policy. * - \a args: other args inherited from the grpclb policy. */ grpc_channel_args* BuildBalancerChannelArgs( - const ServerAddressList& addresses, FakeResolverResponseGenerator* response_generator, const grpc_channel_args* args) { // Channel args to remove. @@ -1313,7 +1316,7 @@ grpc_channel_args* BuildBalancerChannelArgs( args, args_to_remove, GPR_ARRAY_SIZE(args_to_remove), args_to_add.data(), args_to_add.size()); // Make any necessary modifications for security. - return ModifyGrpclbBalancerChannelArgs(addresses, new_args); + return ModifyGrpclbBalancerChannelArgs(new_args); } // @@ -1422,13 +1425,12 @@ void GrpcLb::UpdateLocked(UpdateArgs args) { // Start watching the channel's connectivity state. If the channel // goes into state TRANSIENT_FAILURE before the timer fires, we go into // fallback mode even if the fallback timeout has not elapsed. - grpc_channel_element* client_channel_elem = grpc_channel_stack_last_element( - grpc_channel_get_channel_stack(lb_channel_)); - GPR_ASSERT(client_channel_elem->filter == &grpc_client_channel_filter); + ClientChannel* client_channel = ClientChannel::GetFromChannel(lb_channel_); + GPR_ASSERT(client_channel != nullptr); // Ref held by callback. watcher_ = new StateWatcher(Ref(DEBUG_LOCATION, "StateWatcher")); - grpc_client_channel_start_connectivity_watch( - client_channel_elem, GRPC_CHANNEL_IDLE, + client_channel->AddConnectivityWatcher( + GRPC_CHANNEL_IDLE, OrphanablePtr<AsyncConnectivityStateWatcherInterface>(watcher_)); // Start balancer call. StartBalancerCallLocked(); @@ -1464,8 +1466,8 @@ void GrpcLb::ProcessAddressesAndChannelArgsLocked( &args, args_to_remove, GPR_ARRAY_SIZE(args_to_remove), &new_arg, 1); // Construct args for balancer channel. ServerAddressList balancer_addresses = ExtractBalancerAddresses(args); - grpc_channel_args* lb_channel_args = BuildBalancerChannelArgs( - balancer_addresses, response_generator_.get(), &args); + grpc_channel_args* lb_channel_args = + BuildBalancerChannelArgs(response_generator_.get(), &args); // Create balancer channel if needed. if (lb_channel_ == nullptr) { std::string uri_str = absl::StrCat("fake:///", server_name_); @@ -1492,10 +1494,9 @@ void GrpcLb::ProcessAddressesAndChannelArgsLocked( } void GrpcLb::CancelBalancerChannelConnectivityWatchLocked() { - grpc_channel_element* client_channel_elem = grpc_channel_stack_last_element( - grpc_channel_get_channel_stack(lb_channel_)); - GPR_ASSERT(client_channel_elem->filter == &grpc_client_channel_filter); - grpc_client_channel_stop_connectivity_watch(client_channel_elem, watcher_); + ClientChannel* client_channel = ClientChannel::GetFromChannel(lb_channel_); + GPR_ASSERT(client_channel != nullptr); + client_channel->RemoveConnectivityWatcher(watcher_); } // @@ -1538,7 +1539,7 @@ void GrpcLb::StartBalancerCallRetryTimerLocked() { grpc_timer_init(&lb_call_retry_timer_, next_try, &lb_on_call_retry_); } -void GrpcLb::OnBalancerCallRetryTimer(void* arg, grpc_error* error) { +void GrpcLb::OnBalancerCallRetryTimer(void* arg, grpc_error_handle error) { GrpcLb* grpclb_policy = static_cast<GrpcLb*>(arg); GRPC_ERROR_REF(error); // ref owned by lambda grpclb_policy->work_serializer()->Run( @@ -1548,7 +1549,7 @@ void GrpcLb::OnBalancerCallRetryTimer(void* arg, grpc_error* error) { DEBUG_LOCATION); } -void GrpcLb::OnBalancerCallRetryTimerLocked(grpc_error* error) { +void GrpcLb::OnBalancerCallRetryTimerLocked(grpc_error_handle error) { retry_timer_callback_pending_ = false; if (!shutting_down_ && error == GRPC_ERROR_NONE && lb_calld_ == nullptr) { if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_glb_trace)) { @@ -1582,7 +1583,7 @@ void GrpcLb::MaybeEnterFallbackModeAfterStartup() { } } -void GrpcLb::OnFallbackTimer(void* arg, grpc_error* error) { +void GrpcLb::OnFallbackTimer(void* arg, grpc_error_handle error) { GrpcLb* grpclb_policy = static_cast<GrpcLb*>(arg); GRPC_ERROR_REF(error); // ref owned by lambda grpclb_policy->work_serializer()->Run( @@ -1590,7 +1591,7 @@ void GrpcLb::OnFallbackTimer(void* arg, grpc_error* error) { DEBUG_LOCATION); } -void GrpcLb::OnFallbackTimerLocked(grpc_error* error) { +void GrpcLb::OnFallbackTimerLocked(grpc_error_handle error) { // If we receive a serverlist after the timer fires but before this callback // actually runs, don't fall back. if (fallback_at_startup_checks_pending_ && !shutting_down_ && @@ -1694,12 +1695,12 @@ class GrpcLbFactory : public LoadBalancingPolicyFactory { const char* name() const override { return kGrpclb; } RefCountedPtr<LoadBalancingPolicy::Config> ParseLoadBalancingConfig( - const Json& json, grpc_error** error) const override { + const Json& json, grpc_error_handle* error) const override { GPR_DEBUG_ASSERT(error != nullptr && *error == GRPC_ERROR_NONE); if (json.type() == Json::Type::JSON_NULL) { return MakeRefCounted<GrpcLbConfig>(nullptr, ""); } - std::vector<grpc_error*> error_list; + std::vector<grpc_error_handle> error_list; Json child_policy_config_json_tmp; const Json* child_policy_config_json; std::string service_name; @@ -1722,12 +1723,12 @@ class GrpcLbFactory : public LoadBalancingPolicyFactory { } else { child_policy_config_json = &it->second; } - grpc_error* parse_error = GRPC_ERROR_NONE; + grpc_error_handle parse_error = GRPC_ERROR_NONE; RefCountedPtr<LoadBalancingPolicy::Config> child_policy_config = LoadBalancingPolicyRegistry::ParseLoadBalancingConfig( *child_policy_config_json, &parse_error); if (parse_error != GRPC_ERROR_NONE) { - std::vector<grpc_error*> child_errors; + std::vector<grpc_error_handle> child_errors; child_errors.push_back(parse_error); error_list.push_back( GRPC_ERROR_CREATE_FROM_VECTOR("field:childPolicy", &child_errors)); diff --git a/grpc/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.cc b/grpc/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.cc index f8197a89..07c5fd6f 100644 --- a/grpc/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.cc +++ b/grpc/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.cc @@ -24,8 +24,7 @@ namespace grpc_core { -grpc_channel_args* ModifyGrpclbBalancerChannelArgs( - const ServerAddressList& /*addresses*/, grpc_channel_args* args) { +grpc_channel_args* ModifyGrpclbBalancerChannelArgs(grpc_channel_args* args) { return args; } diff --git a/grpc/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h b/grpc/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h index 14582330..8ea48852 100644 --- a/grpc/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h +++ b/grpc/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h @@ -33,8 +33,7 @@ namespace grpc_core { /// Takes ownership of \a args. /// /// Caller takes ownership of the returned args. -grpc_channel_args* ModifyGrpclbBalancerChannelArgs( - const ServerAddressList& addresses, grpc_channel_args* args); +grpc_channel_args* ModifyGrpclbBalancerChannelArgs(grpc_channel_args* args); grpc_channel* CreateGrpclbBalancerChannel(const char* target_uri, const grpc_channel_args& args); diff --git a/grpc/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc b/grpc/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc index 62fbe15b..837cc09b 100644 --- a/grpc/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc +++ b/grpc/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc @@ -31,16 +31,15 @@ #include "src/core/ext/filters/client_channel/client_channel.h" #include "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.h" #include "src/core/ext/filters/client_channel/server_address.h" +#include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gpr/string.h" -#include "src/core/lib/iomgr/sockaddr_utils.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/slice/slice_internal.h" namespace grpc_core { -grpc_channel_args* ModifyGrpclbBalancerChannelArgs( - const ServerAddressList& addresses, grpc_channel_args* args) { +grpc_channel_args* ModifyGrpclbBalancerChannelArgs(grpc_channel_args* args) { absl::InlinedVector<const char*, 1> args_to_remove; absl::InlinedVector<grpc_arg, 1> args_to_add; // Substitute the channel credentials with a version without call diff --git a/grpc/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h b/grpc/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h index f6e9440d..c369827d 100644 --- a/grpc/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h +++ b/grpc/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h @@ -66,7 +66,8 @@ class GrpcLbClientStats : public RefCounted<GrpcLbClientStats> { gpr_atm num_calls_finished_with_client_failed_to_send_ = 0; gpr_atm num_calls_finished_known_received_ = 0; Mutex drop_count_mu_; // Guards drop_token_counts_. - std::unique_ptr<DroppedCallCounts> drop_token_counts_; + std::unique_ptr<DroppedCallCounts> drop_token_counts_ + ABSL_GUARDED_BY(drop_count_mu_); }; } // namespace grpc_core diff --git a/grpc/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc b/grpc/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc index 8b64f2b4..6b7568c8 100644 --- a/grpc/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc +++ b/grpc/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc @@ -26,9 +26,9 @@ #include "src/core/ext/filters/client_channel/lb_policy_registry.h" #include "src/core/ext/filters/client_channel/server_address.h" #include "src/core/ext/filters/client_channel/subchannel.h" +#include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/iomgr/sockaddr_utils.h" #include "src/core/lib/transport/connectivity_state.h" #include "src/core/lib/transport/error_utils.h" @@ -197,7 +197,7 @@ void PickFirst::AttemptToConnectUsingLatestUpdateArgsLocked() { // (If we are idle, then this will happen in ExitIdleLocked() if we // haven't gotten a non-empty update by the time the application tries // to start a new call.) - grpc_error* error = + grpc_error_handle error = grpc_error_set_int(GRPC_ERROR_CREATE_FROM_STATIC_STRING("Empty update"), GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_UNAVAILABLE); channel_control_helper()->UpdateState( @@ -314,7 +314,7 @@ void PickFirst::PickFirstSubchannelData::ProcessConnectivityChangeLocked( p->subchannel_list_ = std::move(p->latest_pending_subchannel_list_); // Set our state to that of the pending subchannel list. if (p->subchannel_list_->in_transient_failure()) { - grpc_error* error = grpc_error_set_int( + grpc_error_handle error = grpc_error_set_int( GRPC_ERROR_CREATE_FROM_STATIC_STRING( "selected subchannel failed; switching to pending update"), GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_UNAVAILABLE); @@ -393,7 +393,7 @@ void PickFirst::PickFirstSubchannelData::ProcessConnectivityChangeLocked( subchannel_list()->set_in_transient_failure(true); // Only report new state in case 1. if (subchannel_list() == p->subchannel_list_.get()) { - grpc_error* error = grpc_error_set_int( + grpc_error_handle error = grpc_error_set_int( GRPC_ERROR_CREATE_FROM_STATIC_STRING( "failed to connect to all addresses"), GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_UNAVAILABLE); @@ -497,7 +497,7 @@ class PickFirstFactory : public LoadBalancingPolicyFactory { const char* name() const override { return kPickFirst; } RefCountedPtr<LoadBalancingPolicy::Config> ParseLoadBalancingConfig( - const Json& json, grpc_error** /*error*/) const override { + const Json& /*json*/, grpc_error_handle* /*error*/) const override { return MakeRefCounted<PickFirstConfig>(); } }; diff --git a/grpc/src/core/ext/filters/client_channel/lb_policy/priority/priority.cc b/grpc/src/core/ext/filters/client_channel/lb_policy/priority/priority.cc index 037eea58..3cd7c541 100644 --- a/grpc/src/core/ext/filters/client_channel/lb_policy/priority/priority.cc +++ b/grpc/src/core/ext/filters/client_channel/lb_policy/priority/priority.cc @@ -179,10 +179,10 @@ class PriorityLb : public LoadBalancingPolicy { void StartFailoverTimerLocked(); - static void OnFailoverTimer(void* arg, grpc_error* error); - void OnFailoverTimerLocked(grpc_error* error); - static void OnDeactivationTimer(void* arg, grpc_error* error); - void OnDeactivationTimerLocked(grpc_error* error); + static void OnFailoverTimer(void* arg, grpc_error_handle error); + void OnFailoverTimerLocked(grpc_error_handle error); + static void OnDeactivationTimer(void* arg, grpc_error_handle error); + void OnDeactivationTimerLocked(grpc_error_handle error); RefCountedPtr<PriorityLb> priority_policy_; const std::string name_; @@ -363,8 +363,10 @@ void PriorityLb::HandleChildConnectivityStateChangeLocked( // Otherwise, find the child's priority. uint32_t child_priority = GetChildPriorityLocked(child->name()); if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_priority_trace)) { - gpr_log(GPR_INFO, "[priority_lb %p] state update for priority %d, child %s", - this, child_priority, child->name().c_str()); + gpr_log(GPR_INFO, + "[priority_lb %p] state update for priority %u, child %s, current " + "priority %u", + this, child_priority, child->name().c_str(), current_priority_); } // Ignore priorities not in the current config. if (child_priority == UINT32_MAX) return; @@ -412,12 +414,13 @@ void PriorityLb::DeleteChild(ChildPriority* child) { } void PriorityLb::TryNextPriorityLocked(bool report_connecting) { + current_priority_ = UINT32_MAX; for (uint32_t priority = 0; priority < config_->priorities().size(); ++priority) { // If the child for the priority does not exist yet, create it. const std::string& child_name = config_->priorities()[priority]; if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_priority_trace)) { - gpr_log(GPR_INFO, "[priority_lb %p] trying priority %d, child %s", this, + gpr_log(GPR_INFO, "[priority_lb %p] trying priority %u, child %s", this, priority, child_name.c_str()); } auto& child = children_[child_name]; @@ -448,7 +451,7 @@ void PriorityLb::TryNextPriorityLocked(bool report_connecting) { if (child->failover_timer_callback_pending()) { if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_priority_trace)) { gpr_log(GPR_INFO, - "[priority_lb %p] priority %d, child %s: child still " + "[priority_lb %p] priority %u, child %s: child still " "attempting to connect, will wait", this, priority, child_name.c_str()); } @@ -468,9 +471,8 @@ void PriorityLb::TryNextPriorityLocked(bool report_connecting) { "TRANSIENT_FAILURE", this); } - current_priority_ = UINT32_MAX; current_child_from_before_update_ = nullptr; - grpc_error* error = grpc_error_set_int( + grpc_error_handle error = grpc_error_set_int( GRPC_ERROR_CREATE_FROM_STATIC_STRING("no ready priority"), GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_UNAVAILABLE); channel_control_helper()->UpdateState( @@ -480,7 +482,7 @@ void PriorityLb::TryNextPriorityLocked(bool report_connecting) { void PriorityLb::SelectPriorityLocked(uint32_t priority) { if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_priority_trace)) { - gpr_log(GPR_INFO, "[priority_lb %p] selected priority %d, child %s", this, + gpr_log(GPR_INFO, "[priority_lb %p] selected priority %u, child %s", this, priority, config_->priorities()[priority].c_str()); } current_priority_ = priority; @@ -653,14 +655,15 @@ void PriorityLb::ChildPriority::MaybeCancelFailoverTimerLocked() { } } -void PriorityLb::ChildPriority::OnFailoverTimer(void* arg, grpc_error* error) { +void PriorityLb::ChildPriority::OnFailoverTimer(void* arg, + grpc_error_handle error) { ChildPriority* self = static_cast<ChildPriority*>(arg); GRPC_ERROR_REF(error); // ref owned by lambda self->priority_policy_->work_serializer()->Run( [self, error]() { self->OnFailoverTimerLocked(error); }, DEBUG_LOCATION); } -void PriorityLb::ChildPriority::OnFailoverTimerLocked(grpc_error* error) { +void PriorityLb::ChildPriority::OnFailoverTimerLocked(grpc_error_handle error) { if (error == GRPC_ERROR_NONE && failover_timer_callback_pending_ && !priority_policy_->shutting_down_) { if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_priority_trace)) { @@ -710,7 +713,7 @@ void PriorityLb::ChildPriority::MaybeReactivateLocked() { } void PriorityLb::ChildPriority::OnDeactivationTimer(void* arg, - grpc_error* error) { + grpc_error_handle error) { ChildPriority* self = static_cast<ChildPriority*>(arg); GRPC_ERROR_REF(error); // ref owned by lambda self->priority_policy_->work_serializer()->Run( @@ -718,7 +721,8 @@ void PriorityLb::ChildPriority::OnDeactivationTimer(void* arg, DEBUG_LOCATION); } -void PriorityLb::ChildPriority::OnDeactivationTimerLocked(grpc_error* error) { +void PriorityLb::ChildPriority::OnDeactivationTimerLocked( + grpc_error_handle error) { if (error == GRPC_ERROR_NONE && deactivation_timer_callback_pending_ && !priority_policy_->shutting_down_) { if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_priority_trace)) { @@ -783,7 +787,7 @@ class PriorityLbFactory : public LoadBalancingPolicyFactory { const char* name() const override { return kPriority; } RefCountedPtr<LoadBalancingPolicy::Config> ParseLoadBalancingConfig( - const Json& json, grpc_error** error) const override { + const Json& json, grpc_error_handle* error) const override { GPR_DEBUG_ASSERT(error != nullptr && *error == GRPC_ERROR_NONE); if (json.type() == Json::Type::JSON_NULL) { // priority was mentioned as a policy in the deprecated @@ -794,7 +798,7 @@ class PriorityLbFactory : public LoadBalancingPolicyFactory { "config instead."); return nullptr; } - std::vector<grpc_error*> error_list; + std::vector<grpc_error_handle> error_list; // Children. std::map<std::string, PriorityLbConfig::PriorityLbChild> children; auto it = json.object_value().find("children"); @@ -822,7 +826,7 @@ class PriorityLbFactory : public LoadBalancingPolicyFactory { " error:missing 'config' field") .c_str())); } else { - grpc_error* parse_error = GRPC_ERROR_NONE; + grpc_error_handle parse_error = GRPC_ERROR_NONE; auto config = LoadBalancingPolicyRegistry::ParseLoadBalancingConfig( it2->second, &parse_error); bool ignore_resolution_requests = false; diff --git a/grpc/src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.cc b/grpc/src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.cc new file mode 100644 index 00000000..921bd2e0 --- /dev/null +++ b/grpc/src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.cc @@ -0,0 +1,23 @@ +// +// 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> + +namespace grpc_core { + +const char* kRequestRingHashAttribute = "request_ring_hash"; + +} // namespace grpc_core diff --git a/grpc/src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.h b/grpc/src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.h new file mode 100644 index 00000000..dc176c2d --- /dev/null +++ b/grpc/src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.h @@ -0,0 +1,27 @@ +// +// 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_FILTERS_CLIENT_CHANNEL_LB_POLICY_RING_HASH_RING_HASH_H +#define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_RING_HASH_RING_HASH_H + +#include <grpc/support/port_platform.h> + +namespace grpc_core { +extern const char* kRequestRingHashAttribute; + +} // namespace grpc_core + +#endif // GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_RING_HASH_RING_HASH_H diff --git a/grpc/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc b/grpc/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc index efc7942a..529d90d3 100644 --- a/grpc/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc +++ b/grpc/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc @@ -34,11 +34,11 @@ #include "src/core/ext/filters/client_channel/lb_policy/subchannel_list.h" #include "src/core/ext/filters/client_channel/lb_policy_registry.h" #include "src/core/ext/filters/client_channel/subchannel.h" +#include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/iomgr/sockaddr_utils.h" #include "src/core/lib/transport/connectivity_state.h" #include "src/core/lib/transport/error_utils.h" #include "src/core/lib/transport/static_metadata.h" @@ -331,7 +331,7 @@ void RoundRobin::RoundRobinSubchannelList:: absl::make_unique<QueuePicker>(p->Ref(DEBUG_LOCATION, "QueuePicker"))); } else if (num_transient_failure_ == num_subchannels()) { /* 3) TRANSIENT_FAILURE */ - grpc_error* error = + grpc_error_handle error = grpc_error_set_int(GRPC_ERROR_CREATE_FROM_STATIC_STRING( "connections to all backends failing"), GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_UNAVAILABLE); @@ -449,7 +449,7 @@ void RoundRobin::UpdateLocked(UpdateArgs args) { if (latest_pending_subchannel_list_->num_subchannels() == 0) { // If the new list is empty, immediately promote the new list to the // current list and transition to TRANSIENT_FAILURE. - grpc_error* error = + grpc_error_handle error = grpc_error_set_int(GRPC_ERROR_CREATE_FROM_STATIC_STRING("Empty update"), GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_UNAVAILABLE); channel_control_helper()->UpdateState( @@ -487,7 +487,7 @@ class RoundRobinFactory : public LoadBalancingPolicyFactory { const char* name() const override { return kRoundRobin; } RefCountedPtr<LoadBalancingPolicy::Config> ParseLoadBalancingConfig( - const Json& /*json*/, grpc_error** /*error*/) const override { + const Json& /*json*/, grpc_error_handle* /*error*/) const override { return MakeRefCounted<RoundRobinConfig>(); } }; diff --git a/grpc/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h b/grpc/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h index a240a2d0..b894c592 100644 --- a/grpc/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h +++ b/grpc/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h @@ -33,13 +33,13 @@ // that implementation should be hidden from the LB policy API. #include "src/core/ext/filters/client_channel/subchannel.h" #include "src/core/ext/filters/client_channel/subchannel_interface.h" +#include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/gprpp/ref_counted.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/closure.h" -#include "src/core/lib/iomgr/sockaddr_utils.h" #include "src/core/lib/transport/connectivity_state.h" // Code for maintaining a list of subchannels within an LB policy. diff --git a/grpc/src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc b/grpc/src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc index 1eca478b..ac1857be 100644 --- a/grpc/src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc +++ b/grpc/src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc @@ -165,8 +165,8 @@ class WeightedTargetLb : public LoadBalancingPolicy { grpc_connectivity_state state, const absl::Status& status, std::unique_ptr<SubchannelPicker> picker); - static void OnDelayedRemovalTimer(void* arg, grpc_error* error); - void OnDelayedRemovalTimerLocked(grpc_error* error); + static void OnDelayedRemovalTimer(void* arg, grpc_error_handle error); + void OnDelayedRemovalTimerLocked(grpc_error_handle error); // The owning LB policy. RefCountedPtr<WeightedTargetLb> weighted_target_policy_; @@ -387,7 +387,7 @@ void WeightedTargetLb::UpdateStateLocked() { absl::make_unique<QueuePicker>(Ref(DEBUG_LOCATION, "QueuePicker")); break; default: - grpc_error* error = grpc_error_set_int( + grpc_error_handle error = grpc_error_set_int( GRPC_ERROR_CREATE_FROM_STATIC_STRING( "weighted_target: all children report state TRANSIENT_FAILURE"), GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_UNAVAILABLE); @@ -564,8 +564,8 @@ void WeightedTargetLb::WeightedChild::DeactivateLocked() { &on_delayed_removal_timer_); } -void WeightedTargetLb::WeightedChild::OnDelayedRemovalTimer(void* arg, - grpc_error* error) { +void WeightedTargetLb::WeightedChild::OnDelayedRemovalTimer( + void* arg, grpc_error_handle error) { WeightedChild* self = static_cast<WeightedChild*>(arg); GRPC_ERROR_REF(error); // ref owned by lambda self->weighted_target_policy_->work_serializer()->Run( @@ -574,7 +574,7 @@ void WeightedTargetLb::WeightedChild::OnDelayedRemovalTimer(void* arg, } void WeightedTargetLb::WeightedChild::OnDelayedRemovalTimerLocked( - grpc_error* error) { + grpc_error_handle error) { if (error == GRPC_ERROR_NONE && delayed_removal_timer_callback_pending_ && !shutdown_ && weight_ == 0) { delayed_removal_timer_callback_pending_ = false; @@ -631,7 +631,7 @@ class WeightedTargetLbFactory : public LoadBalancingPolicyFactory { const char* name() const override { return kWeightedTarget; } RefCountedPtr<LoadBalancingPolicy::Config> ParseLoadBalancingConfig( - const Json& json, grpc_error** error) const override { + const Json& json, grpc_error_handle* error) const override { GPR_DEBUG_ASSERT(error != nullptr && *error == GRPC_ERROR_NONE); if (json.type() == Json::Type::JSON_NULL) { // weighted_target was mentioned as a policy in the deprecated @@ -642,7 +642,7 @@ class WeightedTargetLbFactory : public LoadBalancingPolicyFactory { "config instead."); return nullptr; } - std::vector<grpc_error*> error_list; + std::vector<grpc_error_handle> error_list; // Weight map. WeightedTargetLbConfig::TargetMap target_map; auto it = json.object_value().find("targets"); @@ -655,14 +655,14 @@ class WeightedTargetLbFactory : public LoadBalancingPolicyFactory { } else { for (const auto& p : it->second.object_value()) { WeightedTargetLbConfig::ChildConfig child_config; - std::vector<grpc_error*> child_errors = + std::vector<grpc_error_handle> child_errors = ParseChildConfig(p.second, &child_config); if (!child_errors.empty()) { // Can't use GRPC_ERROR_CREATE_FROM_VECTOR() here, because the error // string is not static in this case. - grpc_error* error = GRPC_ERROR_CREATE_FROM_COPIED_STRING( + grpc_error_handle error = GRPC_ERROR_CREATE_FROM_COPIED_STRING( absl::StrCat("field:targets key:", p.first).c_str()); - for (grpc_error* child_error : child_errors) { + for (grpc_error_handle child_error : child_errors) { error = grpc_error_add_child(error, child_error); } error_list.push_back(error); @@ -680,9 +680,9 @@ class WeightedTargetLbFactory : public LoadBalancingPolicyFactory { } private: - static std::vector<grpc_error*> ParseChildConfig( + static std::vector<grpc_error_handle> ParseChildConfig( const Json& json, WeightedTargetLbConfig::ChildConfig* child_config) { - std::vector<grpc_error*> error_list; + std::vector<grpc_error_handle> error_list; if (json.type() != Json::Type::OBJECT) { error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( "value should be of type object")); @@ -711,13 +711,13 @@ class WeightedTargetLbFactory : public LoadBalancingPolicyFactory { // Child policy. it = json.object_value().find("childPolicy"); if (it != json.object_value().end()) { - grpc_error* parse_error = GRPC_ERROR_NONE; + grpc_error_handle parse_error = GRPC_ERROR_NONE; child_config->config = LoadBalancingPolicyRegistry::ParseLoadBalancingConfig(it->second, &parse_error); if (child_config->config == nullptr) { GPR_DEBUG_ASSERT(parse_error != GRPC_ERROR_NONE); - std::vector<grpc_error*> child_errors; + std::vector<grpc_error_handle> child_errors; child_errors.push_back(parse_error); error_list.push_back( GRPC_ERROR_CREATE_FROM_VECTOR("field:childPolicy", &child_errors)); diff --git a/grpc/src/core/ext/filters/client_channel/lb_policy/xds/cds.cc b/grpc/src/core/ext/filters/client_channel/lb_policy/xds/cds.cc index 8a10db52..49bff276 100644 --- a/grpc/src/core/ext/filters/client_channel/lb_policy/xds/cds.cc +++ b/grpc/src/core/ext/filters/client_channel/lb_policy/xds/cds.cc @@ -63,40 +63,55 @@ class CdsLb : public LoadBalancingPolicy { void UpdateLocked(UpdateArgs args) override; void ResetBackoffLocked() override; + void ExitIdleLocked() override; private: // Watcher for getting cluster data from XdsClient. class ClusterWatcher : public XdsClient::ClusterWatcherInterface { public: - explicit ClusterWatcher(RefCountedPtr<CdsLb> parent) - : parent_(std::move(parent)) {} + ClusterWatcher(RefCountedPtr<CdsLb> parent, std::string name) + : parent_(std::move(parent)), name_(std::move(name)) {} void OnClusterChanged(XdsApi::CdsUpdate cluster_data) override { - new Notifier(parent_, std::move(cluster_data)); + new Notifier(parent_, name_, std::move(cluster_data)); } - void OnError(grpc_error* error) override { new Notifier(parent_, error); } - void OnResourceDoesNotExist() override { new Notifier(parent_); } + void OnError(grpc_error_handle error) override { + new Notifier(parent_, name_, error); + } + void OnResourceDoesNotExist() override { new Notifier(parent_, name_); } private: class Notifier { public: - Notifier(RefCountedPtr<CdsLb> parent, XdsApi::CdsUpdate update); - Notifier(RefCountedPtr<CdsLb> parent, grpc_error* error); - explicit Notifier(RefCountedPtr<CdsLb> parent); + Notifier(RefCountedPtr<CdsLb> parent, std::string name, + XdsApi::CdsUpdate update); + Notifier(RefCountedPtr<CdsLb> parent, std::string name, + grpc_error_handle error); + explicit Notifier(RefCountedPtr<CdsLb> parent, std::string name); private: enum Type { kUpdate, kError, kDoesNotExist }; - static void RunInExecCtx(void* arg, grpc_error* error); - void RunInWorkSerializer(grpc_error* error); + static void RunInExecCtx(void* arg, grpc_error_handle error); + void RunInWorkSerializer(grpc_error_handle error); RefCountedPtr<CdsLb> parent_; + std::string name_; grpc_closure closure_; XdsApi::CdsUpdate update_; Type type_; }; RefCountedPtr<CdsLb> parent_; + std::string name_; + }; + + struct WatcherState { + // Pointer to watcher, to be used when cancelling. + // Not owned, so do not dereference. + ClusterWatcher* watcher = nullptr; + // Most recent update obtained from this watcher. + absl::optional<XdsApi::CdsUpdate> update; }; // Delegating helper to be passed to child policy. @@ -119,12 +134,20 @@ class CdsLb : public LoadBalancingPolicy { void ShutdownLocked() override; - void OnClusterChanged(XdsApi::CdsUpdate cluster_data); - void OnError(grpc_error* error); - void OnResourceDoesNotExist(); + bool GenerateDiscoveryMechanismForCluster( + const std::string& name, Json::Array* discovery_mechanisms, + std::set<std::string>* clusters_needed); + void OnClusterChanged(const std::string& name, + XdsApi::CdsUpdate cluster_data); + void OnError(const std::string& name, grpc_error_handle error); + void OnResourceDoesNotExist(const std::string& name); - grpc_error* UpdateXdsCertificateProvider( - const XdsApi::CdsUpdate& cluster_data); + grpc_error_handle UpdateXdsCertificateProvider( + const std::string& cluster_name, const XdsApi::CdsUpdate& cluster_data); + + void CancelClusterDataWatch(absl::string_view cluster_name, + XdsClient::ClusterWatcherInterface* watcher, + bool delay_unsubscription = false); void MaybeDestroyChildPolicyLocked(); @@ -135,9 +158,10 @@ class CdsLb : public LoadBalancingPolicy { // The xds client. RefCountedPtr<XdsClient> xds_client_; - // A pointer to the cluster watcher, to be used when cancelling the watch. - // Note that this is not owned, so this pointer must never be derefernced. - ClusterWatcher* cluster_watcher_ = nullptr; + + // Maps from cluster name to the state for that cluster. + // The root of the tree is config_->cluster(). + std::map<std::string, WatcherState> watchers_; RefCountedPtr<grpc_tls_certificate_provider> root_certificate_provider_; RefCountedPtr<grpc_tls_certificate_provider> identity_certificate_provider_; @@ -155,43 +179,50 @@ class CdsLb : public LoadBalancingPolicy { // CdsLb::ClusterWatcher::Notifier::Notifier(RefCountedPtr<CdsLb> parent, + std::string name, XdsApi::CdsUpdate update) - : parent_(std::move(parent)), update_(std::move(update)), type_(kUpdate) { + : parent_(std::move(parent)), + name_(std::move(name)), + update_(std::move(update)), + type_(kUpdate) { GRPC_CLOSURE_INIT(&closure_, &RunInExecCtx, this, nullptr); ExecCtx::Run(DEBUG_LOCATION, &closure_, GRPC_ERROR_NONE); } CdsLb::ClusterWatcher::Notifier::Notifier(RefCountedPtr<CdsLb> parent, - grpc_error* error) - : parent_(std::move(parent)), type_(kError) { + std::string name, + grpc_error_handle error) + : parent_(std::move(parent)), name_(std::move(name)), type_(kError) { GRPC_CLOSURE_INIT(&closure_, &RunInExecCtx, this, nullptr); ExecCtx::Run(DEBUG_LOCATION, &closure_, error); } -CdsLb::ClusterWatcher::Notifier::Notifier(RefCountedPtr<CdsLb> parent) - : parent_(std::move(parent)), type_(kDoesNotExist) { +CdsLb::ClusterWatcher::Notifier::Notifier(RefCountedPtr<CdsLb> parent, + std::string name) + : parent_(std::move(parent)), name_(std::move(name)), type_(kDoesNotExist) { GRPC_CLOSURE_INIT(&closure_, &RunInExecCtx, this, nullptr); ExecCtx::Run(DEBUG_LOCATION, &closure_, GRPC_ERROR_NONE); } void CdsLb::ClusterWatcher::Notifier::RunInExecCtx(void* arg, - grpc_error* error) { + grpc_error_handle error) { Notifier* self = static_cast<Notifier*>(arg); GRPC_ERROR_REF(error); self->parent_->work_serializer()->Run( [self, error]() { self->RunInWorkSerializer(error); }, DEBUG_LOCATION); } -void CdsLb::ClusterWatcher::Notifier::RunInWorkSerializer(grpc_error* error) { +void CdsLb::ClusterWatcher::Notifier::RunInWorkSerializer( + grpc_error_handle error) { switch (type_) { case kUpdate: - parent_->OnClusterChanged(std::move(update_)); + parent_->OnClusterChanged(name_, std::move(update_)); break; case kError: - parent_->OnError(error); + parent_->OnError(name_, error); break; case kDoesNotExist: - parent_->OnResourceDoesNotExist(); + parent_->OnResourceDoesNotExist(name_); break; }; delete this; @@ -261,13 +292,15 @@ void CdsLb::ShutdownLocked() { shutting_down_ = true; MaybeDestroyChildPolicyLocked(); if (xds_client_ != nullptr) { - if (cluster_watcher_ != nullptr) { + for (auto& watcher : watchers_) { if (GRPC_TRACE_FLAG_ENABLED(grpc_cds_lb_trace)) { gpr_log(GPR_INFO, "[cdslb %p] cancelling watch for cluster %s", this, - config_->cluster().c_str()); + watcher.first.c_str()); } - xds_client_->CancelClusterDataWatch(config_->cluster(), cluster_watcher_); + CancelClusterDataWatch(watcher.first, watcher.second.watcher, + /*delay_unsubscription=*/false); } + watchers_.clear(); xds_client_.reset(DEBUG_LOCATION, "CdsLb"); } grpc_channel_args_destroy(args_); @@ -286,6 +319,10 @@ void CdsLb::ResetBackoffLocked() { if (child_policy_ != nullptr) child_policy_->ResetBackoffLocked(); } +void CdsLb::ExitIdleLocked() { + if (child_policy_ != nullptr) child_policy_->ExitIdleLocked(); +} + void CdsLb::UpdateLocked(UpdateArgs args) { // Update config. auto old_config = std::move(config_); @@ -301,119 +338,214 @@ void CdsLb::UpdateLocked(UpdateArgs args) { // If cluster name changed, cancel watcher and restart. if (old_config == nullptr || old_config->cluster() != config_->cluster()) { if (old_config != nullptr) { - if (GRPC_TRACE_FLAG_ENABLED(grpc_cds_lb_trace)) { - gpr_log(GPR_INFO, "[cdslb %p] cancelling watch for cluster %s", this, - old_config->cluster().c_str()); + for (auto& watcher : watchers_) { + if (GRPC_TRACE_FLAG_ENABLED(grpc_cds_lb_trace)) { + gpr_log(GPR_INFO, "[cdslb %p] cancelling watch for cluster %s", this, + watcher.first.c_str()); + } + CancelClusterDataWatch(watcher.first, watcher.second.watcher, + /*delay_unsubscription=*/true); } - xds_client_->CancelClusterDataWatch(old_config->cluster(), - cluster_watcher_, - /*delay_unsubscription=*/true); + watchers_.clear(); } - if (GRPC_TRACE_FLAG_ENABLED(grpc_cds_lb_trace)) { - gpr_log(GPR_INFO, "[cdslb %p] starting watch for cluster %s", this, - config_->cluster().c_str()); - } - auto watcher = absl::make_unique<ClusterWatcher>(Ref()); - cluster_watcher_ = watcher.get(); + auto watcher = absl::make_unique<ClusterWatcher>(Ref(), config_->cluster()); + watchers_[config_->cluster()].watcher = watcher.get(); xds_client_->WatchClusterData(config_->cluster(), std::move(watcher)); } } -void CdsLb::OnClusterChanged(XdsApi::CdsUpdate cluster_data) { - if (GRPC_TRACE_FLAG_ENABLED(grpc_cds_lb_trace)) { - gpr_log(GPR_INFO, "[cdslb %p] received CDS update from xds client %p: %s", - this, xds_client_.get(), cluster_data.ToString().c_str()); +// This method will attempt to generate one or multiple entries of discovery +// mechanism recursively: +// For cluster types EDS or LOGICAL_DNS, one discovery mechanism entry may be +// generated cluster name, type and other data from the CdsUpdate inserted into +// the entry and the entry appended to the array of entries. +// Note, discovery mechanism entry can be generated if an CdsUpdate is +// available; otherwise, just return false. For cluster type AGGREGATE, +// recursively call the method for each child cluster. +bool CdsLb::GenerateDiscoveryMechanismForCluster( + const std::string& name, Json::Array* discovery_mechanisms, + std::set<std::string>* clusters_needed) { + clusters_needed->insert(name); + auto& state = watchers_[name]; + // Create a new watcher if needed. + if (state.watcher == nullptr) { + auto watcher = absl::make_unique<ClusterWatcher>(Ref(), name); + if (GRPC_TRACE_FLAG_ENABLED(grpc_cds_lb_trace)) { + gpr_log(GPR_INFO, "[cdslb %p] starting watch for cluster %s", this, + name.c_str()); + } + state.watcher = watcher.get(); + xds_client_->WatchClusterData(name, std::move(watcher)); + return false; } - grpc_error* error = GRPC_ERROR_NONE; - error = UpdateXdsCertificateProvider(cluster_data); - if (error != GRPC_ERROR_NONE) { - return OnError(error); + // Don't have the update we need yet. + if (!state.update.has_value()) return false; + // For AGGREGATE clusters, recursively expand to child clusters. + if (state.update->cluster_type == XdsApi::CdsUpdate::ClusterType::AGGREGATE) { + bool missing_cluster = false; + for (const std::string& child_name : + state.update->prioritized_cluster_names) { + if (!GenerateDiscoveryMechanismForCluster( + child_name, discovery_mechanisms, clusters_needed)) { + missing_cluster = true; + } + } + return !missing_cluster; + } + std::string type; + switch (state.update->cluster_type) { + case XdsApi::CdsUpdate::ClusterType::EDS: + type = "EDS"; + break; + case XdsApi::CdsUpdate::ClusterType::LOGICAL_DNS: + type = "LOGICAL_DNS"; + break; + default: + GPR_ASSERT(0); + break; } - // Construct config for child policy. - Json::Object discovery_mechanism = { - {"clusterName", config_->cluster()}, - {"max_concurrent_requests", cluster_data.max_concurrent_requests}, - {"type", "EDS"}, + Json::Object mechanism = { + {"clusterName", name}, + {"max_concurrent_requests", state.update->max_concurrent_requests}, + {"type", std::move(type)}, }; - if (!cluster_data.eds_service_name.empty()) { - discovery_mechanism["edsServiceName"] = cluster_data.eds_service_name; + if (!state.update->eds_service_name.empty()) { + mechanism["edsServiceName"] = state.update->eds_service_name; } - if (cluster_data.lrs_load_reporting_server_name.has_value()) { - discovery_mechanism["lrsLoadReportingServerName"] = - cluster_data.lrs_load_reporting_server_name.value(); + if (state.update->lrs_load_reporting_server_name.has_value()) { + mechanism["lrsLoadReportingServerName"] = + state.update->lrs_load_reporting_server_name.value(); } - Json::Object child_config = { - {"discoveryMechanisms", - Json::Array{ - discovery_mechanism, - }}, - {"localityPickingPolicy", - Json::Array{ - Json::Object{ - {"weighted_target_experimental", - Json::Object{ - {"targets", Json::Object()}, - }}, - }, - }}, - {"endpointPickingPolicy", - Json::Array{ - Json::Object{ - {"round_robin", Json::Object()}, - }, - }}, - }; - Json json = Json::Array{ - Json::Object{ - {"xds_cluster_resolver_experimental", std::move(child_config)}, - }, - }; + discovery_mechanisms->emplace_back(std::move(mechanism)); + return true; +} + +void CdsLb::OnClusterChanged(const std::string& name, + XdsApi::CdsUpdate cluster_data) { if (GRPC_TRACE_FLAG_ENABLED(grpc_cds_lb_trace)) { - std::string json_str = json.Dump(/*indent=*/1); - gpr_log(GPR_INFO, "[cdslb %p] generated config for child policy: %s", this, - json_str.c_str()); + gpr_log( + GPR_INFO, + "[cdslb %p] received CDS update for cluster %s from xds client %p: %s", + this, name.c_str(), xds_client_.get(), cluster_data.ToString().c_str()); } - RefCountedPtr<LoadBalancingPolicy::Config> config = - LoadBalancingPolicyRegistry::ParseLoadBalancingConfig(json, &error); + // Store the update in the map if we are still interested in watching this + // cluster (i.e., it is not cancelled already). + // If we've already deleted this entry, then this is an update notification + // that was scheduled before the deletion, so we can just ignore it. + auto it = watchers_.find(name); + if (it == watchers_.end()) return; + it->second.update = cluster_data; + // Take care of integration with new certificate code. + grpc_error_handle error = GRPC_ERROR_NONE; + error = UpdateXdsCertificateProvider(name, it->second.update.value()); if (error != GRPC_ERROR_NONE) { - OnError(error); - return; + return OnError(name, error); } - // Create child policy if not already present. - if (child_policy_ == nullptr) { - LoadBalancingPolicy::Args args; - args.work_serializer = work_serializer(); - args.args = args_; - args.channel_control_helper = absl::make_unique<Helper>(Ref()); - child_policy_ = LoadBalancingPolicyRegistry::CreateLoadBalancingPolicy( - config->name(), std::move(args)); - if (child_policy_ == nullptr) { - OnError(GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "failed to create child policy")); - return; + // Scan the map starting from the root cluster to generate the list of + // discovery mechanisms. If we don't have some of the data we need (i.e., we + // just started up and not all watchers have returned data yet), then don't + // update the child policy at all. + Json::Array discovery_mechanisms; + std::set<std::string> clusters_needed; + if (GenerateDiscoveryMechanismForCluster( + config_->cluster(), &discovery_mechanisms, &clusters_needed)) { + // Construct config for child policy. + Json::Object xds_lb_policy; + if (cluster_data.lb_policy == "RING_HASH") { + std::string hash_function; + switch (cluster_data.hash_function) { + case XdsApi::CdsUpdate::HashFunction::XX_HASH: + hash_function = "XX_HASH"; + break; + case XdsApi::CdsUpdate::HashFunction::MURMUR_HASH_2: + hash_function = "MURMUR_HASH_2"; + break; + default: + GPR_ASSERT(0); + break; + } + xds_lb_policy["RING_HASH"] = Json::Object{ + {"min_ring_size", cluster_data.min_ring_size}, + {"max_ring_size", cluster_data.max_ring_size}, + {"hash_function", hash_function}, + }; + } else { + xds_lb_policy["ROUND_ROBIN"] = Json::Object(); } - grpc_pollset_set_add_pollset_set(child_policy_->interested_parties(), - interested_parties()); + Json::Object child_config = { + {"xdsLbPolicy", + Json::Array{ + xds_lb_policy, + }}, + {"discoveryMechanisms", std::move(discovery_mechanisms)}, + }; + Json json = Json::Array{ + Json::Object{ + {"xds_cluster_resolver_experimental", std::move(child_config)}, + }, + }; if (GRPC_TRACE_FLAG_ENABLED(grpc_cds_lb_trace)) { - gpr_log(GPR_INFO, "[cdslb %p] created child policy %s (%p)", this, - config->name(), child_policy_.get()); + std::string json_str = json.Dump(/*indent=*/1); + gpr_log(GPR_INFO, "[cdslb %p] generated config for child policy: %s", + this, json_str.c_str()); } + RefCountedPtr<LoadBalancingPolicy::Config> config = + LoadBalancingPolicyRegistry::ParseLoadBalancingConfig(json, &error); + if (error != GRPC_ERROR_NONE) { + OnError(name, error); + return; + } + // Create child policy if not already present. + if (child_policy_ == nullptr) { + LoadBalancingPolicy::Args args; + args.work_serializer = work_serializer(); + args.args = args_; + args.channel_control_helper = absl::make_unique<Helper>(Ref()); + child_policy_ = LoadBalancingPolicyRegistry::CreateLoadBalancingPolicy( + config->name(), std::move(args)); + if (child_policy_ == nullptr) { + OnError(name, GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "failed to create child policy")); + return; + } + grpc_pollset_set_add_pollset_set(child_policy_->interested_parties(), + interested_parties()); + if (GRPC_TRACE_FLAG_ENABLED(grpc_cds_lb_trace)) { + gpr_log(GPR_INFO, "[cdslb %p] created child policy %s (%p)", this, + config->name(), child_policy_.get()); + } + } + // Update child policy. + UpdateArgs args; + args.config = std::move(config); + if (xds_certificate_provider_ != nullptr) { + grpc_arg arg_to_add = xds_certificate_provider_->MakeChannelArg(); + args.args = grpc_channel_args_copy_and_add(args_, &arg_to_add, 1); + } else { + args.args = grpc_channel_args_copy(args_); + } + child_policy_->UpdateLocked(std::move(args)); } - // Update child policy. - UpdateArgs args; - args.config = std::move(config); - if (xds_certificate_provider_ != nullptr) { - grpc_arg arg_to_add = xds_certificate_provider_->MakeChannelArg(); - args.args = grpc_channel_args_copy_and_add(args_, &arg_to_add, 1); - } else { - args.args = grpc_channel_args_copy(args_); + // Remove entries in watchers_ for any clusters not in clusters_needed + for (auto it = watchers_.begin(); it != watchers_.end();) { + const std::string& cluster_name = it->first; + if (clusters_needed.find(cluster_name) != clusters_needed.end()) { + ++it; + continue; + } + if (GRPC_TRACE_FLAG_ENABLED(grpc_cds_lb_trace)) { + gpr_log(GPR_INFO, "[cdslb %p] cancelling watch for cluster %s", this, + cluster_name.c_str()); + } + CancelClusterDataWatch(cluster_name, it->second.watcher, + /*delay_unsubscription=*/false); + it = watchers_.erase(it); } - child_policy_->UpdateLocked(std::move(args)); } -void CdsLb::OnError(grpc_error* error) { +void CdsLb::OnError(const std::string& name, grpc_error_handle error) { gpr_log(GPR_ERROR, "[cdslb %p] xds error obtaining data for cluster %s: %s", - this, config_->cluster().c_str(), grpc_error_string(error)); + this, name.c_str(), grpc_error_std_string(error).c_str()); // Go into TRANSIENT_FAILURE if we have not yet created the child // policy (i.e., we have not yet received data from xds). Otherwise, // we keep running with the data we had previously. @@ -426,12 +558,12 @@ void CdsLb::OnError(grpc_error* error) { } } -void CdsLb::OnResourceDoesNotExist() { +void CdsLb::OnResourceDoesNotExist(const std::string& name) { gpr_log(GPR_ERROR, "[cdslb %p] CDS resource for %s does not exist -- reporting " "TRANSIENT_FAILURE", - this, config_->cluster().c_str()); - grpc_error* error = + this, name.c_str()); + grpc_error_handle error = grpc_error_set_int(GRPC_ERROR_CREATE_FROM_COPIED_STRING( absl::StrCat("CDS resource \"", config_->cluster(), "\" does not exist") @@ -443,8 +575,8 @@ void CdsLb::OnResourceDoesNotExist() { MaybeDestroyChildPolicyLocked(); } -grpc_error* CdsLb::UpdateXdsCertificateProvider( - const XdsApi::CdsUpdate& cluster_data) { +grpc_error_handle CdsLb::UpdateXdsCertificateProvider( + const std::string& cluster_name, const XdsApi::CdsUpdate& cluster_data) { // Early out if channel is not configured to use xds security. grpc_channel_credentials* channel_credentials = grpc_channel_credentials_find_in_args(args_); @@ -453,28 +585,28 @@ grpc_error* CdsLb::UpdateXdsCertificateProvider( xds_certificate_provider_ = nullptr; return GRPC_ERROR_NONE; } + if (xds_certificate_provider_ == nullptr) { + xds_certificate_provider_ = MakeRefCounted<XdsCertificateProvider>(); + } + // Configure root cert. absl::string_view root_provider_instance_name = cluster_data.common_tls_context.combined_validation_context .validation_context_certificate_provider_instance.instance_name; absl::string_view root_provider_cert_name = cluster_data.common_tls_context.combined_validation_context .validation_context_certificate_provider_instance.certificate_name; - absl::string_view identity_provider_instance_name = - cluster_data.common_tls_context - .tls_certificate_certificate_provider_instance.instance_name; - absl::string_view identity_provider_cert_name = - cluster_data.common_tls_context - .tls_certificate_certificate_provider_instance.certificate_name; RefCountedPtr<XdsCertificateProvider> new_root_provider; if (!root_provider_instance_name.empty()) { new_root_provider = xds_client_->certificate_provider_store() .CreateOrGetCertificateProvider(root_provider_instance_name); if (new_root_provider == nullptr) { - return GRPC_ERROR_CREATE_FROM_COPIED_STRING( - absl::StrCat("Certificate provider instance name: \"", - root_provider_instance_name, "\" not recognized.") - .c_str()); + return grpc_error_set_int( + GRPC_ERROR_CREATE_FROM_COPIED_STRING( + absl::StrCat("Certificate provider instance name: \"", + root_provider_instance_name, "\" not recognized.") + .c_str()), + GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_UNAVAILABLE); } } if (root_certificate_provider_ != new_root_provider) { @@ -491,16 +623,31 @@ grpc_error* CdsLb::UpdateXdsCertificateProvider( } root_certificate_provider_ = std::move(new_root_provider); } + xds_certificate_provider_->UpdateRootCertNameAndDistributor( + cluster_name, root_provider_cert_name, + root_certificate_provider_ == nullptr + ? nullptr + : root_certificate_provider_->distributor()); + // Configure identity cert. + absl::string_view identity_provider_instance_name = + cluster_data.common_tls_context + .tls_certificate_certificate_provider_instance.instance_name; + absl::string_view identity_provider_cert_name = + cluster_data.common_tls_context + .tls_certificate_certificate_provider_instance.certificate_name; RefCountedPtr<XdsCertificateProvider> new_identity_provider; if (!identity_provider_instance_name.empty()) { new_identity_provider = xds_client_->certificate_provider_store() .CreateOrGetCertificateProvider(identity_provider_instance_name); if (new_identity_provider == nullptr) { - return GRPC_ERROR_CREATE_FROM_COPIED_STRING( - absl::StrCat("Certificate provider instance name: \"", - identity_provider_instance_name, "\" not recognized.") - .c_str()); + return grpc_error_set_int( + GRPC_ERROR_CREATE_FROM_COPIED_STRING( + absl::StrCat("Certificate provider instance name: \"", + identity_provider_instance_name, + "\" not recognized.") + .c_str()), + GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_UNAVAILABLE); } } if (identity_certificate_provider_ != new_identity_provider) { @@ -517,56 +664,34 @@ grpc_error* CdsLb::UpdateXdsCertificateProvider( } identity_certificate_provider_ = std::move(new_identity_provider); } - const std::vector<XdsApi::StringMatcher>& match_subject_alt_names = + xds_certificate_provider_->UpdateIdentityCertNameAndDistributor( + cluster_name, identity_provider_cert_name, + identity_certificate_provider_ == nullptr + ? nullptr + : identity_certificate_provider_->distributor()); + // Configure SAN matchers. + const std::vector<StringMatcher>& match_subject_alt_names = cluster_data.common_tls_context.combined_validation_context .default_validation_context.match_subject_alt_names; - if (!root_provider_instance_name.empty() && - !identity_provider_instance_name.empty()) { - // Using mTLS configuration - if (xds_certificate_provider_ != nullptr && - xds_certificate_provider_->ProvidesRootCerts() && - xds_certificate_provider_->ProvidesIdentityCerts()) { - xds_certificate_provider_->UpdateRootCertNameAndDistributor( - root_provider_cert_name, root_certificate_provider_->distributor()); - xds_certificate_provider_->UpdateIdentityCertNameAndDistributor( - identity_provider_cert_name, - identity_certificate_provider_->distributor()); - xds_certificate_provider_->UpdateSubjectAlternativeNameMatchers( - match_subject_alt_names); - } else { - // Existing xDS certificate provider does not have mTLS configuration. - // Create new certificate provider so that new subchannel connectors are - // created. - xds_certificate_provider_ = MakeRefCounted<XdsCertificateProvider>( - root_provider_cert_name, root_certificate_provider_->distributor(), - identity_provider_cert_name, - identity_certificate_provider_->distributor(), - match_subject_alt_names); - } - } else if (!root_provider_instance_name.empty()) { - // Using TLS configuration - if (xds_certificate_provider_ != nullptr && - xds_certificate_provider_->ProvidesRootCerts() && - !xds_certificate_provider_->ProvidesIdentityCerts()) { - xds_certificate_provider_->UpdateRootCertNameAndDistributor( - root_provider_cert_name, root_certificate_provider_->distributor()); - xds_certificate_provider_->UpdateSubjectAlternativeNameMatchers( - match_subject_alt_names); - } else { - // Existing xDS certificate provider does not have TLS configuration. - // Create new certificate provider so that new subchannel connectors are - // created. - xds_certificate_provider_ = MakeRefCounted<XdsCertificateProvider>( - root_provider_cert_name, root_certificate_provider_->distributor(), - "", nullptr, match_subject_alt_names); - } - } else { - // No configuration provided. - xds_certificate_provider_ = nullptr; - } + xds_certificate_provider_->UpdateSubjectAlternativeNameMatchers( + cluster_name, match_subject_alt_names); return GRPC_ERROR_NONE; } +void CdsLb::CancelClusterDataWatch(absl::string_view cluster_name, + XdsClient::ClusterWatcherInterface* watcher, + bool delay_unsubscription) { + if (xds_certificate_provider_ != nullptr) { + std::string name(cluster_name); + xds_certificate_provider_->UpdateRootCertNameAndDistributor(name, "", + nullptr); + xds_certificate_provider_->UpdateIdentityCertNameAndDistributor(name, "", + nullptr); + xds_certificate_provider_->UpdateSubjectAlternativeNameMatchers(name, {}); + } + xds_client_->CancelClusterDataWatch(cluster_name, watcher, + delay_unsubscription); +} // // factory // @@ -575,13 +700,12 @@ class CdsLbFactory : public LoadBalancingPolicyFactory { public: OrphanablePtr<LoadBalancingPolicy> CreateLoadBalancingPolicy( LoadBalancingPolicy::Args args) const override { - grpc_error* error = GRPC_ERROR_NONE; - RefCountedPtr<XdsClient> xds_client = XdsClient::GetOrCreate(&error); - if (error != GRPC_ERROR_NONE) { + RefCountedPtr<XdsClient> xds_client = + XdsClient::GetFromChannelArgs(*args.args); + if (xds_client == nullptr) { gpr_log(GPR_ERROR, - "cannot get XdsClient to instantiate cds LB policy: %s", - grpc_error_string(error)); - GRPC_ERROR_UNREF(error); + "XdsClient not present in channel args -- cannot instantiate " + "cds LB policy"); return nullptr; } return MakeOrphanable<CdsLb>(std::move(xds_client), std::move(args)); @@ -590,7 +714,7 @@ class CdsLbFactory : public LoadBalancingPolicyFactory { const char* name() const override { return kCds; } RefCountedPtr<LoadBalancingPolicy::Config> ParseLoadBalancingConfig( - const Json& json, grpc_error** error) const override { + const Json& json, grpc_error_handle* error) const override { GPR_DEBUG_ASSERT(error != nullptr && *error == GRPC_ERROR_NONE); if (json.type() == Json::Type::JSON_NULL) { // xds was mentioned as a policy in the deprecated loadBalancingPolicy @@ -600,7 +724,8 @@ class CdsLbFactory : public LoadBalancingPolicyFactory { "Please use loadBalancingConfig field of service config instead."); return nullptr; } - std::vector<grpc_error*> error_list; + std::vector<grpc_error_handle> error_list; + // cluster name. std::string cluster; auto it = json.object_value().find("cluster"); if (it == json.object_value().end()) { diff --git a/grpc/src/core/ext/filters/client_channel/lb_policy/xds/xds_channel_args.h b/grpc/src/core/ext/filters/client_channel/lb_policy/xds/xds_channel_args.h index dd64ea7f..2351502c 100644 --- a/grpc/src/core/ext/filters/client_channel/lb_policy/xds/xds_channel_args.h +++ b/grpc/src/core/ext/filters/client_channel/lb_policy/xds/xds_channel_args.h @@ -21,4 +21,9 @@ // Set by xds_cluster_impl LB policy and used by GoogleDefaultCredentials. #define GRPC_ARG_XDS_CLUSTER_NAME "grpc.internal.xds_cluster_name" +// For testing purpose, this channel arg indicating xds_cluster_resolver LB +// policy should use the fake DNS resolver to resolve logical dns cluster. +#define GRPC_ARG_XDS_LOGICAL_DNS_CLUSTER_FAKE_RESOLVER_RESPONSE_GENERATOR \ + "grpc.internal.xds_logical_dns_cluster_fake_resolver_response_generator" + #endif // GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_XDS_XDS_CHANNEL_ARGS_H diff --git a/grpc/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_impl.cc b/grpc/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_impl.cc index c2d9ec00..7dbba646 100644 --- a/grpc/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_impl.cc +++ b/grpc/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_impl.cc @@ -31,6 +31,7 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gpr/env.h" #include "src/core/lib/gpr/string.h" +#include "src/core/lib/gprpp/atomic.h" #include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/sync.h" @@ -56,6 +57,7 @@ class CircuitBreakerCallCounterMap { explicit CallCounter(Key key) : key_(std::move(key)) {} ~CallCounter() override; + uint32_t Load() { return concurrent_requests_.Load(MemoryOrder::SEQ_CST); } uint32_t Increment() { return concurrent_requests_.FetchAdd(1); } void Decrement() { concurrent_requests_.FetchSub(1); } @@ -69,7 +71,7 @@ class CircuitBreakerCallCounterMap { private: Mutex mu_; - std::map<Key, CallCounter*> map_; + std::map<Key, CallCounter*> map_ ABSL_GUARDED_BY(mu_); }; CircuitBreakerCallCounterMap* g_call_counter_map = nullptr; @@ -107,17 +109,6 @@ CircuitBreakerCallCounterMap::CallCounter::~CallCounter() { constexpr char kXdsClusterImpl[] = "xds_cluster_impl_experimental"; -// TODO (donnadionne): Check to see if circuit breaking is enabled, this will be -// removed once circuit breaking feature is fully integrated and enabled by -// default. -bool XdsCircuitBreakingEnabled() { - char* value = gpr_getenv("GRPC_XDS_EXPERIMENTAL_CIRCUIT_BREAKING"); - bool parsed_value; - bool parse_succeeded = gpr_parse_bool_value(value, &parsed_value); - gpr_free(value); - return parse_succeeded && parsed_value; -} - // Config for xDS Cluster Impl LB policy. class XdsClusterImplLbConfig : public LoadBalancingPolicy::Config { public: @@ -145,9 +136,7 @@ class XdsClusterImplLbConfig : public LoadBalancingPolicy::Config { const absl::optional<std::string>& lrs_load_reporting_server_name() const { return lrs_load_reporting_server_name_; }; - const uint32_t max_concurrent_requests() const { - return max_concurrent_requests_; - } + uint32_t max_concurrent_requests() const { return max_concurrent_requests_; } RefCountedPtr<XdsApi::EdsUpdate::DropConfig> drop_config() const { return drop_config_; } @@ -210,7 +199,6 @@ class XdsClusterImplLb : public LoadBalancingPolicy { private: RefCountedPtr<CircuitBreakerCallCounterMap::CallCounter> call_counter_; - bool xds_circuit_breaking_enabled_; uint32_t max_concurrent_requests_; RefCountedPtr<XdsApi::EdsUpdate::DropConfig> drop_config_; RefCountedPtr<XdsClusterDropStats> drop_stats_; @@ -279,7 +267,6 @@ class XdsClusterImplLb : public LoadBalancingPolicy { XdsClusterImplLb::Picker::Picker(XdsClusterImplLb* xds_cluster_impl_lb, RefCountedPtr<RefCountedPicker> picker) : call_counter_(xds_cluster_impl_lb->call_counter_), - xds_circuit_breaking_enabled_(XdsCircuitBreakingEnabled()), max_concurrent_requests_( xds_cluster_impl_lb->config_->max_concurrent_requests()), drop_config_(xds_cluster_impl_lb->config_->drop_config()), @@ -302,17 +289,15 @@ LoadBalancingPolicy::PickResult XdsClusterImplLb::Picker::Pick( return result; } // Handle circuit breaking. - uint32_t current = call_counter_->Increment(); - if (xds_circuit_breaking_enabled_) { - // Check and see if we exceeded the max concurrent requests count. - if (current >= max_concurrent_requests_) { - call_counter_->Decrement(); - if (drop_stats_ != nullptr) drop_stats_->AddUncategorizedDrops(); - PickResult result; - result.type = PickResult::PICK_COMPLETE; - return result; - } + uint32_t current = call_counter_->Load(); + // Check and see if we exceeded the max concurrent requests count. + if (current >= max_concurrent_requests_) { + if (drop_stats_ != nullptr) drop_stats_->AddUncategorizedDrops(); + PickResult result; + result.type = PickResult::PICK_COMPLETE; + return result; } + call_counter_->Increment(); // If we're not dropping the call, we should always have a child picker. if (picker_ == nullptr) { // Should never happen. PickResult result; @@ -346,7 +331,7 @@ LoadBalancingPolicy::PickResult XdsClusterImplLb::Picker::Pick( // Note: This callback does not run in either the control plane // work serializer or in the data plane mutex. [locality_stats, original_recv_trailing_metadata_ready, call_counter]( - grpc_error* error, MetadataInterface* metadata, + grpc_error_handle error, MetadataInterface* metadata, CallState* call_state) { // Record call completion for load reporting. if (locality_stats != nullptr) { @@ -611,14 +596,12 @@ class XdsClusterImplLbFactory : public LoadBalancingPolicyFactory { public: OrphanablePtr<LoadBalancingPolicy> CreateLoadBalancingPolicy( LoadBalancingPolicy::Args args) const override { - grpc_error* error = GRPC_ERROR_NONE; - RefCountedPtr<XdsClient> xds_client = XdsClient::GetOrCreate(&error); - if (error != GRPC_ERROR_NONE) { - gpr_log( - GPR_ERROR, - "cannot get XdsClient to instantiate xds_cluster_impl LB policy: %s", - grpc_error_string(error)); - GRPC_ERROR_UNREF(error); + RefCountedPtr<XdsClient> xds_client = + XdsClient::GetFromChannelArgs(*args.args); + if (xds_client == nullptr) { + gpr_log(GPR_ERROR, + "XdsClient not present in channel args -- cannot instantiate " + "xds_cluster_impl LB policy"); return nullptr; } return MakeOrphanable<XdsClusterImplLb>(std::move(xds_client), @@ -628,7 +611,7 @@ class XdsClusterImplLbFactory : public LoadBalancingPolicyFactory { const char* name() const override { return kXdsClusterImpl; } RefCountedPtr<LoadBalancingPolicy::Config> ParseLoadBalancingConfig( - const Json& json, grpc_error** error) const override { + const Json& json, grpc_error_handle* error) const override { GPR_DEBUG_ASSERT(error != nullptr && *error == GRPC_ERROR_NONE); if (json.type() == Json::Type::JSON_NULL) { // This policy was configured in the deprecated loadBalancingPolicy @@ -639,7 +622,7 @@ class XdsClusterImplLbFactory : public LoadBalancingPolicyFactory { "config instead."); return nullptr; } - std::vector<grpc_error*> error_list; + std::vector<grpc_error_handle> error_list; // Child policy. RefCountedPtr<LoadBalancingPolicy::Config> child_policy; auto it = json.object_value().find("childPolicy"); @@ -647,12 +630,12 @@ class XdsClusterImplLbFactory : public LoadBalancingPolicyFactory { error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( "field:childPolicy error:required field missing")); } else { - grpc_error* parse_error = GRPC_ERROR_NONE; + grpc_error_handle parse_error = GRPC_ERROR_NONE; child_policy = LoadBalancingPolicyRegistry::ParseLoadBalancingConfig( it->second, &parse_error); if (child_policy == nullptr) { GPR_DEBUG_ASSERT(parse_error != GRPC_ERROR_NONE); - std::vector<grpc_error*> child_errors; + std::vector<grpc_error_handle> child_errors; child_errors.push_back(parse_error); error_list.push_back( GRPC_ERROR_CREATE_FROM_VECTOR("field:childPolicy", &child_errors)); @@ -711,7 +694,7 @@ class XdsClusterImplLbFactory : public LoadBalancingPolicyFactory { error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( "field:dropCategories error:required field missing")); } else { - std::vector<grpc_error*> child_errors = + std::vector<grpc_error_handle> child_errors = ParseDropCategories(it->second, drop_config.get()); if (!child_errors.empty()) { error_list.push_back(GRPC_ERROR_CREATE_FROM_VECTOR( @@ -730,9 +713,9 @@ class XdsClusterImplLbFactory : public LoadBalancingPolicyFactory { } private: - static std::vector<grpc_error*> ParseDropCategories( + static std::vector<grpc_error_handle> ParseDropCategories( const Json& json, XdsApi::EdsUpdate::DropConfig* drop_config) { - std::vector<grpc_error*> error_list; + std::vector<grpc_error_handle> error_list; if (json.type() != Json::Type::ARRAY) { error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( "dropCategories field is not an array")); @@ -740,10 +723,10 @@ class XdsClusterImplLbFactory : public LoadBalancingPolicyFactory { } for (size_t i = 0; i < json.array_value().size(); ++i) { const Json& entry = json.array_value()[i]; - std::vector<grpc_error*> child_errors = + std::vector<grpc_error_handle> child_errors = ParseDropCategory(entry, drop_config); if (!child_errors.empty()) { - grpc_error* error = GRPC_ERROR_CREATE_FROM_COPIED_STRING( + grpc_error_handle error = GRPC_ERROR_CREATE_FROM_COPIED_STRING( absl::StrCat("errors parsing index ", i).c_str()); for (size_t i = 0; i < child_errors.size(); ++i) { error = grpc_error_add_child(error, child_errors[i]); @@ -754,9 +737,9 @@ class XdsClusterImplLbFactory : public LoadBalancingPolicyFactory { return error_list; } - static std::vector<grpc_error*> ParseDropCategory( + static std::vector<grpc_error_handle> ParseDropCategory( const Json& json, XdsApi::EdsUpdate::DropConfig* drop_config) { - std::vector<grpc_error*> error_list; + std::vector<grpc_error_handle> error_list; if (json.type() != Json::Type::OBJECT) { error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( "dropCategories entry is not an object")); diff --git a/grpc/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_manager.cc b/grpc/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_manager.cc index 4d76b39d..1d4f1431 100644 --- a/grpc/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_manager.cc +++ b/grpc/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_manager.cc @@ -162,8 +162,8 @@ class XdsClusterManagerLb : public LoadBalancingPolicy { OrphanablePtr<LoadBalancingPolicy> CreateChildPolicyLocked( const grpc_channel_args* args); - static void OnDelayedRemovalTimer(void* arg, grpc_error* error); - void OnDelayedRemovalTimerLocked(grpc_error* error); + static void OnDelayedRemovalTimer(void* arg, grpc_error_handle error); + void OnDelayedRemovalTimerLocked(grpc_error_handle error); // The owning LB policy. RefCountedPtr<XdsClusterManagerLb> xds_cluster_manager_policy_; @@ -337,44 +337,29 @@ void XdsClusterManagerLb::UpdateStateLocked() { gpr_log(GPR_INFO, "[xds_cluster_manager_lb %p] connectivity changed to %s", this, ConnectivityStateName(connectivity_state)); } - std::unique_ptr<SubchannelPicker> picker; - absl::Status status; - switch (connectivity_state) { - case GRPC_CHANNEL_READY: { - ClusterPicker::ClusterMap cluster_map; - for (const auto& p : config_->cluster_map()) { - const std::string& cluster_name = p.first; - RefCountedPtr<ChildPickerWrapper>& child_picker = - cluster_map[cluster_name]; - child_picker = children_[cluster_name]->picker_wrapper(); - if (child_picker == nullptr) { - if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_cluster_manager_lb_trace)) { - gpr_log( - GPR_INFO, + ClusterPicker::ClusterMap cluster_map; + for (const auto& p : config_->cluster_map()) { + const std::string& cluster_name = p.first; + RefCountedPtr<ChildPickerWrapper>& child_picker = cluster_map[cluster_name]; + child_picker = children_[cluster_name]->picker_wrapper(); + if (child_picker == nullptr) { + if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_cluster_manager_lb_trace)) { + gpr_log(GPR_INFO, "[xds_cluster_manager_lb %p] child %s has not yet returned a " "picker; creating a QueuePicker.", this, cluster_name.c_str()); - } - child_picker = MakeRefCounted<ChildPickerWrapper>( - cluster_name, absl::make_unique<QueuePicker>( - Ref(DEBUG_LOCATION, "QueuePicker"))); - } } - picker = absl::make_unique<ClusterPicker>(std::move(cluster_map)); - break; + child_picker = MakeRefCounted<ChildPickerWrapper>( + cluster_name, + absl::make_unique<QueuePicker>(Ref(DEBUG_LOCATION, "QueuePicker"))); } - case GRPC_CHANNEL_CONNECTING: - case GRPC_CHANNEL_IDLE: - picker = - absl::make_unique<QueuePicker>(Ref(DEBUG_LOCATION, "QueuePicker")); - break; - default: - grpc_error* error = grpc_error_set_int( - GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "TRANSIENT_FAILURE from XdsClusterManagerLb"), - GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_UNAVAILABLE); - status = grpc_error_to_absl_status(error); - picker = absl::make_unique<TransientFailurePicker>(error); + } + std::unique_ptr<SubchannelPicker> picker = + absl::make_unique<ClusterPicker>(std::move(cluster_map)); + absl::Status status; + if (connectivity_state == GRPC_CHANNEL_TRANSIENT_FAILURE) { + status = absl::Status(absl::StatusCode::kUnavailable, + "TRANSIENT_FAILURE from XdsClusterManagerLb"); } channel_control_helper()->UpdateState(connectivity_state, status, std::move(picker)); @@ -501,7 +486,7 @@ void XdsClusterManagerLb::ClusterChild::ResetBackoffLocked() { void XdsClusterManagerLb::ClusterChild::DeactivateLocked() { // If already deactivated, don't do that again. - if (delayed_removal_timer_callback_pending_ == true) return; + if (delayed_removal_timer_callback_pending_) return; // Set the child weight to 0 so that future picker won't contain this child. // Start a timer to delete the child. Ref(DEBUG_LOCATION, "ClusterChild+timer").release(); @@ -513,7 +498,7 @@ void XdsClusterManagerLb::ClusterChild::DeactivateLocked() { } void XdsClusterManagerLb::ClusterChild::OnDelayedRemovalTimer( - void* arg, grpc_error* error) { + void* arg, grpc_error_handle error) { ClusterChild* self = static_cast<ClusterChild*>(arg); GRPC_ERROR_REF(error); // Ref owned by the lambda self->xds_cluster_manager_policy_->work_serializer()->Run( @@ -522,7 +507,7 @@ void XdsClusterManagerLb::ClusterChild::OnDelayedRemovalTimer( } void XdsClusterManagerLb::ClusterChild::OnDelayedRemovalTimerLocked( - grpc_error* error) { + grpc_error_handle error) { delayed_removal_timer_callback_pending_ = false; if (error == GRPC_ERROR_NONE && !shutdown_) { xds_cluster_manager_policy_->children_.erase(name_); @@ -616,7 +601,7 @@ class XdsClusterManagerLbFactory : public LoadBalancingPolicyFactory { const char* name() const override { return kXdsClusterManager; } RefCountedPtr<LoadBalancingPolicy::Config> ParseLoadBalancingConfig( - const Json& json, grpc_error** error) const override { + const Json& json, grpc_error_handle* error) const override { GPR_DEBUG_ASSERT(error != nullptr && *error == GRPC_ERROR_NONE); if (json.type() == Json::Type::JSON_NULL) { // xds_cluster_manager was mentioned as a policy in the deprecated @@ -627,7 +612,7 @@ class XdsClusterManagerLbFactory : public LoadBalancingPolicyFactory { "config instead."); return nullptr; } - std::vector<grpc_error*> error_list; + std::vector<grpc_error_handle> error_list; XdsClusterManagerLbConfig::ClusterMap cluster_map; std::set<std::string /*cluster_name*/> clusters_to_be_used; auto it = json.object_value().find("children"); @@ -646,14 +631,14 @@ class XdsClusterManagerLbFactory : public LoadBalancingPolicyFactory { continue; } RefCountedPtr<LoadBalancingPolicy::Config> child_config; - std::vector<grpc_error*> child_errors = + std::vector<grpc_error_handle> child_errors = ParseChildConfig(p.second, &child_config); if (!child_errors.empty()) { // Can't use GRPC_ERROR_CREATE_FROM_VECTOR() here, because the error // string is not static in this case. - grpc_error* error = GRPC_ERROR_CREATE_FROM_COPIED_STRING( + grpc_error_handle error = GRPC_ERROR_CREATE_FROM_COPIED_STRING( absl::StrCat("field:children name:", child_name).c_str()); - for (grpc_error* child_error : child_errors) { + for (grpc_error_handle child_error : child_errors) { error = grpc_error_add_child(error, child_error); } error_list.push_back(error); @@ -676,10 +661,10 @@ class XdsClusterManagerLbFactory : public LoadBalancingPolicyFactory { } private: - static std::vector<grpc_error*> ParseChildConfig( + static std::vector<grpc_error_handle> ParseChildConfig( const Json& json, RefCountedPtr<LoadBalancingPolicy::Config>* child_config) { - std::vector<grpc_error*> error_list; + std::vector<grpc_error_handle> error_list; if (json.type() != Json::Type::OBJECT) { error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( "value should be of type object")); @@ -690,12 +675,12 @@ class XdsClusterManagerLbFactory : public LoadBalancingPolicyFactory { error_list.push_back( GRPC_ERROR_CREATE_FROM_STATIC_STRING("did not find childPolicy")); } else { - grpc_error* parse_error = GRPC_ERROR_NONE; + grpc_error_handle parse_error = GRPC_ERROR_NONE; *child_config = LoadBalancingPolicyRegistry::ParseLoadBalancingConfig( it->second, &parse_error); if (*child_config == nullptr) { GPR_DEBUG_ASSERT(parse_error != GRPC_ERROR_NONE); - std::vector<grpc_error*> child_errors; + std::vector<grpc_error_handle> child_errors; child_errors.push_back(parse_error); error_list.push_back( GRPC_ERROR_CREATE_FROM_VECTOR("field:childPolicy", &child_errors)); diff --git a/grpc/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_resolver.cc b/grpc/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_resolver.cc index 0133a713..bcb81945 100644 --- a/grpc/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_resolver.cc +++ b/grpc/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_resolver.cc @@ -29,8 +29,10 @@ #include "src/core/ext/filters/client_channel/lb_policy/address_filtering.h" #include "src/core/ext/filters/client_channel/lb_policy/child_policy_handler.h" #include "src/core/ext/filters/client_channel/lb_policy/xds/xds.h" +#include "src/core/ext/filters/client_channel/lb_policy/xds/xds_channel_args.h" #include "src/core/ext/filters/client_channel/lb_policy_factory.h" #include "src/core/ext/filters/client_channel/lb_policy_registry.h" +#include "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h" #include "src/core/ext/filters/client_channel/resolver_registry.h" #include "src/core/ext/filters/client_channel/server_address.h" #include "src/core/ext/xds/xds_channel_args.h" @@ -80,39 +82,33 @@ class XdsClusterResolverLbConfig : public LoadBalancingPolicy::Config { }; XdsClusterResolverLbConfig( - std::vector<DiscoveryMechanism> discovery_mechanisms, - Json locality_picking_policy, Json endpoint_picking_policy) + std::vector<DiscoveryMechanism> discovery_mechanisms, Json xds_lb_policy) : discovery_mechanisms_(std::move(discovery_mechanisms)), - locality_picking_policy_(std::move(locality_picking_policy)), - endpoint_picking_policy_(std::move(endpoint_picking_policy)) {} + xds_lb_policy_(std::move(xds_lb_policy)) {} const char* name() const override { return kXdsClusterResolver; } - const std::vector<DiscoveryMechanism>& discovery_mechanisms() const { return discovery_mechanisms_; } - const Json& locality_picking_policy() const { - return locality_picking_policy_; - } - const Json& endpoint_picking_policy() const { - return endpoint_picking_policy_; - } + + const Json& xds_lb_policy() const { return xds_lb_policy_; } private: std::vector<DiscoveryMechanism> discovery_mechanisms_; - Json locality_picking_policy_; - Json endpoint_picking_policy_; + Json xds_lb_policy_; }; // Xds Cluster Resolver LB policy. class XdsClusterResolverLb : public LoadBalancingPolicy { public: - XdsClusterResolverLb(RefCountedPtr<XdsClient> xds_client, Args args); + XdsClusterResolverLb(RefCountedPtr<XdsClient> xds_client, Args args, + std::string server_name, bool is_xds_uri); const char* name() const override { return kXdsClusterResolver; } void UpdateLocked(UpdateArgs args) override; void ResetBackoffLocked() override; + void ExitIdleLocked() override; private: // Discovery Mechanism Base class @@ -132,9 +128,11 @@ class XdsClusterResolverLb : public LoadBalancingPolicy { : parent_(std::move(xds_cluster_resolver_lb)), index_(index) {} virtual void Start() = 0; void Orphan() override = 0; + virtual Json::Array override_child_policy() = 0; + virtual bool disable_reresolution() = 0; // Caller must ensure that config_ is set before calling. - const absl::string_view GetXdsClusterResolverResourceName() const { + absl::string_view GetXdsClusterResolverResourceName() const { if (!parent_->is_xds_uri_) return parent_->server_name_; if (!parent_->config_->discovery_mechanisms()[index_] .eds_service_name.empty()) { @@ -172,6 +170,8 @@ class XdsClusterResolverLb : public LoadBalancingPolicy { : DiscoveryMechanism(std::move(xds_cluster_resolver_lb), index) {} void Start() override; void Orphan() override; + Json::Array override_child_policy() override { return Json::Array{}; } + bool disable_reresolution() override { return true; } private: class EndpointWatcher : public XdsClient::EndpointWatcherInterface { @@ -185,7 +185,7 @@ class XdsClusterResolverLb : public LoadBalancingPolicy { void OnEndpointChanged(XdsApi::EdsUpdate update) override { new Notifier(discovery_mechanism_, std::move(update)); } - void OnError(grpc_error* error) override { + void OnError(grpc_error_handle error) override { new Notifier(discovery_mechanism_, error); } void OnResourceDoesNotExist() override { @@ -198,7 +198,7 @@ class XdsClusterResolverLb : public LoadBalancingPolicy { Notifier(RefCountedPtr<EdsDiscoveryMechanism> discovery_mechanism, XdsApi::EdsUpdate update); Notifier(RefCountedPtr<EdsDiscoveryMechanism> discovery_mechanism, - grpc_error* error); + grpc_error_handle error); explicit Notifier( RefCountedPtr<EdsDiscoveryMechanism> discovery_mechanism); ~Notifier() { discovery_mechanism_.reset(DEBUG_LOCATION, "Notifier"); } @@ -206,8 +206,8 @@ class XdsClusterResolverLb : public LoadBalancingPolicy { private: enum Type { kUpdate, kError, kDoesNotExist }; - static void RunInExecCtx(void* arg, grpc_error* error); - void RunInWorkSerializer(grpc_error* error); + static void RunInExecCtx(void* arg, grpc_error_handle error); + void RunInWorkSerializer(grpc_error_handle error); RefCountedPtr<EdsDiscoveryMechanism> discovery_mechanism_; grpc_closure closure_; @@ -230,6 +230,14 @@ class XdsClusterResolverLb : public LoadBalancingPolicy { : DiscoveryMechanism(std::move(xds_cluster_resolver_lb), index) {} void Start() override; void Orphan() override; + Json::Array override_child_policy() override { + return Json::Array{ + Json::Object{ + {"pick_first", Json::Object()}, + }, + }; + } + bool disable_reresolution() override { return false; }; private: class ResolverResultHandler : public Resolver::ResultHandler { @@ -242,7 +250,7 @@ class XdsClusterResolverLb : public LoadBalancingPolicy { void ReturnResult(Resolver::Result result) override; - void ReturnError(grpc_error* error) override; + void ReturnError(grpc_error_handle error) override; private: RefCountedPtr<LogicalDNSDiscoveryMechanism> discovery_mechanism_; @@ -296,7 +304,7 @@ class XdsClusterResolverLb : public LoadBalancingPolicy { void ShutdownLocked() override; void OnEndpointChanged(size_t index, XdsApi::EdsUpdate update); - void OnError(size_t index, grpc_error* error); + void OnError(size_t index, grpc_error_handle error); void OnResourceDoesNotExist(size_t index); void MaybeDestroyChildPolicyLocked(); @@ -310,6 +318,9 @@ class XdsClusterResolverLb : public LoadBalancingPolicy { grpc_channel_args* CreateChildPolicyArgsLocked( const grpc_channel_args* args_in); + // The xds client and endpoint watcher. + RefCountedPtr<XdsClient> xds_client_; + // Server name from target URI. std::string server_name_; bool is_xds_uri_; @@ -321,9 +332,6 @@ class XdsClusterResolverLb : public LoadBalancingPolicy { // Internal state. bool shutting_down_ = false; - // The xds client and endpoint watcher. - RefCountedPtr<XdsClient> xds_client_; - // Vector of discovery mechansism entries in priority order. std::vector<DiscoveryMechanismEntry> discovery_mechanisms_; @@ -422,7 +430,7 @@ XdsClusterResolverLb::EdsDiscoveryMechanism::EndpointWatcher::Notifier:: XdsClusterResolverLb::EdsDiscoveryMechanism::EndpointWatcher::Notifier:: Notifier(RefCountedPtr<XdsClusterResolverLb::EdsDiscoveryMechanism> discovery_mechanism, - grpc_error* error) + grpc_error_handle error) : discovery_mechanism_(std::move(discovery_mechanism)), type_(kError) { GRPC_CLOSURE_INIT(&closure_, &RunInExecCtx, this, nullptr); ExecCtx::Run(DEBUG_LOCATION, &closure_, error); @@ -438,7 +446,7 @@ XdsClusterResolverLb::EdsDiscoveryMechanism::EndpointWatcher::Notifier:: } void XdsClusterResolverLb::EdsDiscoveryMechanism::EndpointWatcher::Notifier:: - RunInExecCtx(void* arg, grpc_error* error) { + RunInExecCtx(void* arg, grpc_error_handle error) { Notifier* self = static_cast<Notifier*>(arg); GRPC_ERROR_REF(error); self->discovery_mechanism_->parent()->work_serializer()->Run( @@ -446,7 +454,7 @@ void XdsClusterResolverLb::EdsDiscoveryMechanism::EndpointWatcher::Notifier:: } void XdsClusterResolverLb::EdsDiscoveryMechanism::EndpointWatcher::Notifier:: - RunInWorkSerializer(grpc_error* error) { + RunInWorkSerializer(grpc_error_handle error) { switch (type_) { case kUpdate: discovery_mechanism_->parent()->OnEndpointChanged( @@ -469,11 +477,26 @@ void XdsClusterResolverLb::EdsDiscoveryMechanism::EndpointWatcher::Notifier:: // void XdsClusterResolverLb::LogicalDNSDiscoveryMechanism::Start() { + std::string target = parent()->server_name_; + grpc_channel_args* args = nullptr; + FakeResolverResponseGenerator* fake_resolver_response_generator = + grpc_channel_args_find_pointer<FakeResolverResponseGenerator>( + parent()->args_, + GRPC_ARG_XDS_LOGICAL_DNS_CLUSTER_FAKE_RESOLVER_RESPONSE_GENERATOR); + if (fake_resolver_response_generator != nullptr) { + target = absl::StrCat("fake:", target); + grpc_arg new_arg = FakeResolverResponseGenerator::MakeChannelArg( + fake_resolver_response_generator); + args = grpc_channel_args_copy_and_add(parent()->args_, &new_arg, 1); + } else { + args = grpc_channel_args_copy(parent()->args_); + } resolver_ = ResolverRegistry::CreateResolver( - parent()->server_name_.c_str(), parent()->args_, - grpc_pollset_set_create(), parent()->work_serializer(), + target.c_str(), args, parent()->interested_parties(), + parent()->work_serializer(), absl::make_unique<ResolverResultHandler>( Ref(DEBUG_LOCATION, "LogicalDNSDiscoveryMechanism"))); + grpc_channel_args_destroy(args); if (resolver_ == nullptr) { parent()->OnResourceDoesNotExist(index()); return; @@ -509,15 +532,17 @@ void XdsClusterResolverLb::LogicalDNSDiscoveryMechanism::ResolverResultHandler:: XdsApi::EdsUpdate update; XdsApi::EdsUpdate::Priority::Locality locality; locality.name = MakeRefCounted<XdsLocalityName>("", "", ""); + locality.lb_weight = 1; locality.endpoints = std::move(result.addresses); - update.priorities[0].localities.emplace(locality.name.get(), - std::move(locality)); + XdsApi::EdsUpdate::Priority priority; + priority.localities.emplace(locality.name.get(), std::move(locality)); + update.priorities.emplace_back(std::move(priority)); discovery_mechanism_->parent()->OnEndpointChanged( discovery_mechanism_->index(), std::move(update)); } void XdsClusterResolverLb::LogicalDNSDiscoveryMechanism::ResolverResultHandler:: - ReturnError(grpc_error* error) { + ReturnError(grpc_error_handle error) { discovery_mechanism_->parent()->OnError(discovery_mechanism_->index(), error); } @@ -526,26 +551,17 @@ void XdsClusterResolverLb::LogicalDNSDiscoveryMechanism::ResolverResultHandler:: // XdsClusterResolverLb::XdsClusterResolverLb(RefCountedPtr<XdsClient> xds_client, - Args args) - : LoadBalancingPolicy(std::move(args)), xds_client_(std::move(xds_client)) { + Args args, std::string server_name, + bool is_xds_uri) + : LoadBalancingPolicy(std::move(args)), + xds_client_(std::move(xds_client)), + server_name_(std::move(server_name)), + is_xds_uri_(is_xds_uri) { if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_xds_cluster_resolver_trace)) { gpr_log(GPR_INFO, - "[xds_cluster_resolver_lb %p] created -- using xds client %p", this, - xds_client_.get()); - } - // Record server name. - const char* server_uri = - grpc_channel_args_find_string(args.args, GRPC_ARG_SERVER_URI); - GPR_ASSERT(server_uri != nullptr); - absl::StatusOr<URI> uri = URI::Parse(server_uri); - GPR_ASSERT(uri.ok() && !uri->path().empty()); - server_name_ = std::string(absl::StripPrefix(uri->path(), "/")); - is_xds_uri_ = uri->scheme() == "xds"; - if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_xds_cluster_resolver_trace)) { - gpr_log(GPR_INFO, - "[xds_cluster_resolver_lb %p] server name from channel " - "(is_xds_uri=%d): %s", - this, is_xds_uri_, server_name_.c_str()); + "[xds_cluster_resolver_lb %p] created -- xds_client=%p, " + "server_name=%s, is_xds_uri=%d", + this, xds_client_.get(), server_name_.c_str(), is_xds_uri_); } // EDS-only flow. if (!is_xds_uri_) { @@ -655,6 +671,10 @@ void XdsClusterResolverLb::ResetBackoffLocked() { } } +void XdsClusterResolverLb::ExitIdleLocked() { + if (child_policy_ != nullptr) child_policy_->ExitIdleLocked(); +} + void XdsClusterResolverLb::OnEndpointChanged(size_t index, XdsApi::EdsUpdate update) { if (shutting_down_) return; @@ -673,10 +693,17 @@ void XdsClusterResolverLb::OnEndpointChanged(size_t index, discovery_mechanisms_[index].pending_priority_list = std::move(update.priorities); discovery_mechanisms_[index].first_update_received = true; - if (!discovery_mechanisms_[0].first_update_received) { - // We have not yet received an update for index 0, so wait until that - // happens to create the child policy. - return; + // If any discovery mechanism has not received its first update, + // wait until that happens before creating the child policy. + // TODO(roth): If this becomes problematic in the future (e.g., a + // secondary discovery mechanism delaying us from starting up at all), + // we can consider some sort of optimization whereby we can create the + // priority policy with only a subset of its children. But we need to + // make sure not to get into a situation where the priority policy + // will put the channel into TRANSIENT_FAILURE instead of CONNECTING + // while we're still waiting for the other discovery mechanism(s). + for (DiscoveryMechanismEntry& mechanism : discovery_mechanisms_) { + if (!mechanism.first_update_received) return; } // Construct new priority list. XdsApi::EdsUpdate::PriorityList priority_list; @@ -703,11 +730,11 @@ void XdsClusterResolverLb::OnEndpointChanged(size_t index, UpdatePriorityList(std::move(priority_list)); } -void XdsClusterResolverLb::OnError(size_t index, grpc_error* error) { +void XdsClusterResolverLb::OnError(size_t index, grpc_error_handle error) { gpr_log(GPR_ERROR, "[xds_cluster_resolver_lb %p] discovery mechanism %" PRIuPTR " xds watcher reported error: %s", - this, index, grpc_error_string(error)); + this, index, grpc_error_std_string(error).c_str()); GRPC_ERROR_UNREF(error); if (shutting_down_) return; if (!discovery_mechanisms_[index].first_update_received) { @@ -813,7 +840,11 @@ ServerAddressList XdsClusterResolverLb::CreateChildPolicyAddressesLocked() { MakeHierarchicalPathAttribute(hierarchical_path)) .WithAttribute(kXdsLocalityNameAttributeKey, absl::make_unique<XdsLocalityAttribute>( - locality_name->Ref()))); + locality_name->Ref())) + .WithAttribute(ServerAddressWeightAttribute:: + kServerAddressWeightAttributeKey, + absl::make_unique<ServerAddressWeightAttribute>( + locality.lb_weight))); } } } @@ -825,53 +856,76 @@ XdsClusterResolverLb::CreateChildPolicyConfigLocked() { Json::Object priority_children; Json::Array priority_priorities; // Setting up index to iterate through the discovery mechanisms and keeping - // track the discovery_mechanism each prioirty belongs to. + // track the discovery_mechanism each priority belongs to. size_t discovery_index = 0; // Setting up num_priorities_remaining to track the priorities in each // discovery_mechanism. size_t num_priorities_remaining_in_discovery = discovery_mechanisms_[discovery_index].num_priorities; for (size_t priority = 0; priority < priority_list_.size(); ++priority) { - // Each prioirty in the priority_list_ should correspond to a priority in a - // discovery mechanism in discovery_mechanisms_ (both in the same order). - // Keeping track of the discovery_mechanism each prioirty belongs to. - if (num_priorities_remaining_in_discovery == 0) { - ++discovery_index; - num_priorities_remaining_in_discovery = - discovery_mechanisms_[discovery_index].num_priorities; + Json child_policy; + if (!discovery_mechanisms_[discovery_index] + .discovery_mechanism->override_child_policy() + .empty()) { + child_policy = discovery_mechanisms_[discovery_index] + .discovery_mechanism->override_child_policy(); } else { - --num_priorities_remaining_in_discovery; - } - const auto& localities = priority_list_[priority].localities; - Json::Object weighted_targets; - for (const auto& p : localities) { - XdsLocalityName* locality_name = p.first; - const auto& locality = p.second; - // Construct JSON object containing locality name. - Json::Object locality_name_json; - if (!locality_name->region().empty()) { - locality_name_json["region"] = locality_name->region(); - } - if (!locality_name->zone().empty()) { - locality_name_json["zone"] = locality_name->zone(); - } - if (!locality_name->sub_zone().empty()) { - locality_name_json["subzone"] = locality_name->sub_zone(); + const auto& xds_lb_policy = config_->xds_lb_policy().object_value(); + if (xds_lb_policy.find("ROUND_ROBIN") != xds_lb_policy.end()) { + const auto& localities = priority_list_[priority].localities; + Json::Object weighted_targets; + for (const auto& p : localities) { + XdsLocalityName* locality_name = p.first; + const auto& locality = p.second; + // Construct JSON object containing locality name. + Json::Object locality_name_json; + if (!locality_name->region().empty()) { + locality_name_json["region"] = locality_name->region(); + } + if (!locality_name->zone().empty()) { + locality_name_json["zone"] = locality_name->zone(); + } + if (!locality_name->sub_zone().empty()) { + locality_name_json["sub_zone"] = locality_name->sub_zone(); + } + // Add weighted target entry. + weighted_targets[locality_name->AsHumanReadableString()] = + Json::Object{ + {"weight", locality.lb_weight}, + {"childPolicy", + Json::Array{ + Json::Object{ + {"round_robin", Json::Object()}, + }, + }}, + }; + } + // Construct locality-picking policy. + // Start with field from our config and add the "targets" field. + child_policy = Json::Array{ + Json::Object{ + {"weighted_target_experimental", + Json::Object{ + {"targets", Json::Object()}, + }}, + }, + }; + Json::Object& config = + *(*child_policy.mutable_array())[0].mutable_object(); + auto it = config.begin(); + GPR_ASSERT(it != config.end()); + (*it->second.mutable_object())["targets"] = std::move(weighted_targets); + } else { + auto it = xds_lb_policy.find("RING_HASH"); + GPR_ASSERT(it != xds_lb_policy.end()); + Json::Object ring_hash_experimental_policy = it->second.object_value(); + child_policy = Json::Array{ + Json::Object{ + {"ring_hash_experimental", ring_hash_experimental_policy}, + }, + }; } - // Add weighted target entry. - weighted_targets[locality_name->AsHumanReadableString()] = Json::Object{ - {"weight", locality.lb_weight}, - {"childPolicy", config_->endpoint_picking_policy()}, - }; } - // Construct locality-picking policy. - // Start with field from our config and add the "targets" field. - Json locality_picking_config = config_->locality_picking_policy(); - Json::Object& config = - *(*locality_picking_config.mutable_array())[0].mutable_object(); - auto it = config.begin(); - GPR_ASSERT(it != config.end()); - (*it->second.mutable_object())["targets"] = std::move(weighted_targets); // Wrap it in the drop policy. Json::Array drop_categories; if (discovery_mechanisms_[discovery_index].drop_config != nullptr) { @@ -887,7 +941,7 @@ XdsClusterResolverLb::CreateChildPolicyConfigLocked() { .discovery_mechanism->GetLrsClusterKey(); Json::Object xds_cluster_impl_config = { {"clusterName", std::string(lrs_key.first)}, - {"childPolicy", std::move(locality_picking_config)}, + {"childPolicy", std::move(child_policy)}, {"dropCategories", std::move(drop_categories)}, {"maxConcurrentRequests", config_->discovery_mechanisms()[discovery_index] @@ -909,10 +963,24 @@ XdsClusterResolverLb::CreateChildPolicyConfigLocked() { const size_t child_number = priority_child_numbers_[priority]; std::string child_name = absl::StrCat("child", child_number); priority_priorities.emplace_back(child_name); - priority_children[child_name] = Json::Object{ + Json::Object child_config = { {"config", std::move(locality_picking_policy)}, - {"ignore_reresolution_requests", true}, }; + if (discovery_mechanisms_[discovery_index] + .discovery_mechanism->disable_reresolution()) { + child_config["ignore_reresolution_requests"] = true; + } + priority_children[child_name] = std::move(child_config); + // Each priority in the priority_list_ should correspond to a priority in a + // discovery mechanism in discovery_mechanisms_ (both in the same order). + // Keeping track of the discovery_mechanism each priority belongs to. + --num_priorities_remaining_in_discovery; + while (num_priorities_remaining_in_discovery == 0 && + discovery_index < discovery_mechanisms_.size() - 1) { + ++discovery_index; + num_priorities_remaining_in_discovery = + discovery_mechanisms_[discovery_index].num_priorities; + } } // There should be matching number of priorities in discovery_mechanisms_ and // in priority_list_; therefore at the end of looping through all the @@ -934,7 +1002,7 @@ XdsClusterResolverLb::CreateChildPolicyConfigLocked() { "[xds_cluster_resolver_lb %p] generated config for child policy: %s", this, json_str.c_str()); } - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; RefCountedPtr<LoadBalancingPolicy::Config> config = LoadBalancingPolicyRegistry::ParseLoadBalancingConfig(json, &error); if (error != GRPC_ERROR_NONE) { @@ -944,7 +1012,7 @@ XdsClusterResolverLb::CreateChildPolicyConfigLocked() { "[xds_cluster_resolver_lb %p] error parsing generated child policy " "config -- " "will put channel in TRANSIENT_FAILURE: %s", - this, grpc_error_string(error)); + this, grpc_error_std_string(error).c_str()); error = grpc_error_set_int( grpc_error_add_child(GRPC_ERROR_CREATE_FROM_STATIC_STRING( "xds_cluster_resolver LB policy: error " @@ -978,10 +1046,14 @@ void XdsClusterResolverLb::UpdateChildPolicyLocked() { grpc_channel_args* XdsClusterResolverLb::CreateChildPolicyArgsLocked( const grpc_channel_args* args) { - // Inhibit client-side health checking, since the balancer does this for us. - grpc_arg new_arg = grpc_channel_arg_integer_create( - const_cast<char*>(GRPC_ARG_INHIBIT_HEALTH_CHECKING), 1); - return grpc_channel_args_copy_and_add(args, &new_arg, 1); + absl::InlinedVector<grpc_arg, 2> new_args = { + // Inhibit client-side health checking, since the balancer does this + // for us. + grpc_channel_arg_integer_create( + const_cast<char*>(GRPC_ARG_INHIBIT_HEALTH_CHECKING), 1), + }; + if (!is_xds_uri_) new_args.push_back(xds_client_->MakeChannelArg()); + return grpc_channel_args_copy_and_add(args, new_args.data(), new_args.size()); } OrphanablePtr<LoadBalancingPolicy> @@ -1020,24 +1092,45 @@ class XdsClusterResolverLbFactory : public LoadBalancingPolicyFactory { public: OrphanablePtr<LoadBalancingPolicy> CreateLoadBalancingPolicy( LoadBalancingPolicy::Args args) const override { - grpc_error* error = GRPC_ERROR_NONE; - RefCountedPtr<XdsClient> xds_client = XdsClient::GetOrCreate(&error); - if (error != GRPC_ERROR_NONE) { - gpr_log(GPR_ERROR, - "cannot get XdsClient to instantiate xds_cluster_resolver LB " - "policy: %s", - grpc_error_string(error)); - GRPC_ERROR_UNREF(error); - return nullptr; + // Find server name. + const char* server_uri = + grpc_channel_args_find_string(args.args, GRPC_ARG_SERVER_URI); + GPR_ASSERT(server_uri != nullptr); + absl::StatusOr<URI> uri = URI::Parse(server_uri); + GPR_ASSERT(uri.ok() && !uri->path().empty()); + absl::string_view server_name = absl::StripPrefix(uri->path(), "/"); + // Determine if it's an xds URI. + bool is_xds_uri = uri->scheme() == "xds"; + // Get XdsClient. + RefCountedPtr<XdsClient> xds_client = + XdsClient::GetFromChannelArgs(*args.args); + if (xds_client == nullptr) { + if (!is_xds_uri) { + grpc_error_handle error = GRPC_ERROR_NONE; + xds_client = XdsClient::GetOrCreate(args.args, &error); + if (error != GRPC_ERROR_NONE) { + gpr_log(GPR_ERROR, + "cannot get or create XdsClient to instantiate " + "xds_cluster_resolver LB policy: %s", + grpc_error_std_string(error).c_str()); + GRPC_ERROR_UNREF(error); + return nullptr; + } + } else { + gpr_log(GPR_ERROR, + "XdsClient not present in channel args -- cannot instantiate " + "xds_cluster_resolver LB policy"); + return nullptr; + } } - return MakeOrphanable<XdsClusterResolverChildHandler>(std::move(xds_client), - std::move(args)); + return MakeOrphanable<XdsClusterResolverChildHandler>( + std::move(xds_client), std::move(args), server_name, is_xds_uri); } const char* name() const override { return kXdsClusterResolver; } RefCountedPtr<LoadBalancingPolicy::Config> ParseLoadBalancingConfig( - const Json& json, grpc_error** error) const override { + const Json& json, grpc_error_handle* error) const override { GPR_DEBUG_ASSERT(error != nullptr && *error == GRPC_ERROR_NONE); if (json.type() == Json::Type::JSON_NULL) { // xds_cluster_resolver was mentioned as a policy in the deprecated @@ -1048,7 +1141,7 @@ class XdsClusterResolverLbFactory : public LoadBalancingPolicyFactory { "Please use loadBalancingConfig field of service config instead."); return nullptr; } - std::vector<grpc_error*> error_list; + std::vector<grpc_error_handle> error_list; std::vector<XdsClusterResolverLbConfig::DiscoveryMechanism> discovery_mechanisms; auto it = json.object_value().find("discoveryMechanisms"); @@ -1062,13 +1155,13 @@ class XdsClusterResolverLbFactory : public LoadBalancingPolicyFactory { const Json::Array& array = it->second.array_value(); for (size_t i = 0; i < array.size(); ++i) { XdsClusterResolverLbConfig::DiscoveryMechanism discovery_mechanism; - std::vector<grpc_error*> discovery_mechanism_errors = + std::vector<grpc_error_handle> discovery_mechanism_errors = ParseDiscoveryMechanism(array[i], &discovery_mechanism); if (!discovery_mechanism_errors.empty()) { - grpc_error* error = GRPC_ERROR_CREATE_FROM_COPIED_STRING( + grpc_error_handle error = GRPC_ERROR_CREATE_FROM_COPIED_STRING( absl::StrCat("field:discovery_mechanism element: ", i, " error") .c_str()); - for (grpc_error* discovery_mechanism_error : + for (grpc_error_handle discovery_mechanism_error : discovery_mechanism_errors) { error = grpc_error_add_child(error, discovery_mechanism_error); } @@ -1077,58 +1170,104 @@ class XdsClusterResolverLbFactory : public LoadBalancingPolicyFactory { discovery_mechanisms.emplace_back(std::move(discovery_mechanism)); } } - // Locality-picking policy. - Json locality_picking_policy; - it = json.object_value().find("localityPickingPolicy"); - if (it == json.object_value().end()) { - locality_picking_policy = Json::Array{ - Json::Object{ - {"weighted_target_experimental", - Json::Object{ - {"targets", Json::Object()}, - }}, - }, - }; - } else { - locality_picking_policy = it->second; - } - grpc_error* parse_error = GRPC_ERROR_NONE; - if (LoadBalancingPolicyRegistry::ParseLoadBalancingConfig( - locality_picking_policy, &parse_error) == nullptr) { - GPR_DEBUG_ASSERT(parse_error != GRPC_ERROR_NONE); - error_list.push_back(GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( - "localityPickingPolicy", &parse_error, 1)); - GRPC_ERROR_UNREF(parse_error); - } - // Endpoint-picking policy. Called "childPolicy" for xds policy. - Json endpoint_picking_policy; - it = json.object_value().find("endpointPickingPolicy"); - if (it == json.object_value().end()) { - endpoint_picking_policy = Json::Array{ - Json::Object{ - {"round_robin", Json::Object()}, - }, - }; - } else { - endpoint_picking_policy = it->second; - } - parse_error = GRPC_ERROR_NONE; - if (LoadBalancingPolicyRegistry::ParseLoadBalancingConfig( - endpoint_picking_policy, &parse_error) == nullptr) { - GPR_DEBUG_ASSERT(parse_error != GRPC_ERROR_NONE); - error_list.push_back(GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( - "endpointPickingPolicy", &parse_error, 1)); - GRPC_ERROR_UNREF(parse_error); - } if (discovery_mechanisms.empty()) { error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( "field:discovery_mechanism error:list is missing or empty")); } + Json xds_lb_policy = Json::Object{ + {"ROUND_ROBIN", Json::Object()}, + }; + it = json.object_value().find("xdsLbPolicy"); + if (it != json.object_value().end()) { + if (it->second.type() != Json::Type::ARRAY) { + error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "field:xdsLbPolicy error:type should be array")); + } else { + const Json::Array& array = it->second.array_value(); + for (size_t i = 0; i < array.size(); ++i) { + if (array[i].type() != Json::Type::OBJECT) { + error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "field:xdsLbPolicy error:element should be of type object")); + continue; + } + const Json::Object& policy = array[i].object_value(); + auto policy_it = policy.find("ROUND_ROBIN"); + if (policy_it != policy.end()) { + if (policy_it->second.type() != Json::Type::OBJECT) { + error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "field:ROUND_ROBIN error:type should be object")); + } + break; + } + policy_it = policy.find("RING_HASH"); + if (policy_it != policy.end()) { + if (policy_it->second.type() != Json::Type::OBJECT) { + error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "field:RING_HASH error:type should be object")); + continue; + } + // TODO(donnadionne): Move this to a method in + // ring_hash_experimental and call it here. + const Json::Object& ring_hash = policy_it->second.object_value(); + xds_lb_policy = array[i]; + size_t min_ring_size = 1024; + size_t max_ring_size = 8388608; + auto ring_hash_it = ring_hash.find("min_ring_size"); + if (ring_hash_it == ring_hash.end()) { + error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "field:min_ring_size missing")); + } else if (ring_hash_it->second.type() != Json::Type::NUMBER) { + error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "field:min_ring_size error: should be of " + "number")); + } else { + min_ring_size = gpr_parse_nonnegative_int( + ring_hash_it->second.string_value().c_str()); + } + ring_hash_it = ring_hash.find("max_ring_size"); + if (ring_hash_it == ring_hash.end()) { + error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "field:max_ring_size missing")); + } else if (ring_hash_it->second.type() != Json::Type::NUMBER) { + error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "field:max_ring_size error: should be of " + "number")); + } else { + max_ring_size = gpr_parse_nonnegative_int( + ring_hash_it->second.string_value().c_str()); + } + if (min_ring_size <= 0 || min_ring_size > 8388608 || + max_ring_size <= 0 || max_ring_size > 8388608 || + min_ring_size > max_ring_size) { + error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "field:max_ring_size and or min_ring_size error: " + "values need to be in the range of 1 to 8388608 " + "and max_ring_size cannot be smaller than " + "min_ring_size")); + } + ring_hash_it = ring_hash.find("hash_function"); + if (ring_hash_it == ring_hash.end()) { + error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "field:hash_function missing")); + } else if (ring_hash_it->second.type() != Json::Type::STRING) { + error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "field:hash_function error: should be a " + "string")); + } else if (ring_hash_it->second.string_value() != "XX_HASH" && + ring_hash_it->second.string_value() != "MURMUR_HASH_2") { + error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "field:hash_function error: unsupported " + "hash_function")); + } + break; + } + } + } + } // Construct config. if (error_list.empty()) { return MakeRefCounted<XdsClusterResolverLbConfig>( - std::move(discovery_mechanisms), std::move(locality_picking_policy), - std::move(endpoint_picking_policy)); + std::move(discovery_mechanisms), std::move(xds_lb_policy)); } else { *error = GRPC_ERROR_CREATE_FROM_VECTOR( "xds_cluster_resolver_experimental LB policy config", &error_list); @@ -1137,10 +1276,10 @@ class XdsClusterResolverLbFactory : public LoadBalancingPolicyFactory { } private: - static std::vector<grpc_error*> ParseDiscoveryMechanism( + static std::vector<grpc_error_handle> ParseDiscoveryMechanism( const Json& json, XdsClusterResolverLbConfig::DiscoveryMechanism* discovery_mechanism) { - std::vector<grpc_error*> error_list; + std::vector<grpc_error_handle> error_list; if (json.type() != Json::Type::OBJECT) { error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( "value should be of type object")); @@ -1217,10 +1356,13 @@ class XdsClusterResolverLbFactory : public LoadBalancingPolicyFactory { class XdsClusterResolverChildHandler : public ChildPolicyHandler { public: XdsClusterResolverChildHandler(RefCountedPtr<XdsClient> xds_client, - Args args) + Args args, absl::string_view server_name, + bool is_xds_uri) : ChildPolicyHandler(std::move(args), &grpc_lb_xds_cluster_resolver_trace), - xds_client_(std::move(xds_client)) {} + xds_client_(std::move(xds_client)), + server_name_(server_name), + is_xds_uri_(is_xds_uri) {} bool ConfigChangeRequiresNewPolicyInstance( LoadBalancingPolicy::Config* old_config, @@ -1236,12 +1378,15 @@ class XdsClusterResolverLbFactory : public LoadBalancingPolicyFactory { } OrphanablePtr<LoadBalancingPolicy> CreateLoadBalancingPolicy( - const char* name, LoadBalancingPolicy::Args args) const override { - return MakeOrphanable<XdsClusterResolverLb>(xds_client_, std::move(args)); + const char* /*name*/, LoadBalancingPolicy::Args args) const override { + return MakeOrphanable<XdsClusterResolverLb>(xds_client_, std::move(args), + server_name_, is_xds_uri_); } private: RefCountedPtr<XdsClient> xds_client_; + std::string server_name_; + bool is_xds_uri_; }; }; diff --git a/grpc/src/core/ext/filters/client_channel/lb_policy_factory.h b/grpc/src/core/ext/filters/client_channel/lb_policy_factory.h index 9e4425fa..a595c271 100644 --- a/grpc/src/core/ext/filters/client_channel/lb_policy_factory.h +++ b/grpc/src/core/ext/filters/client_channel/lb_policy_factory.h @@ -39,7 +39,7 @@ class LoadBalancingPolicyFactory { virtual const char* name() const = 0; virtual RefCountedPtr<LoadBalancingPolicy::Config> ParseLoadBalancingConfig( - const Json& json, grpc_error** error) const = 0; + const Json& json, grpc_error_handle* error) const = 0; }; } // namespace grpc_core diff --git a/grpc/src/core/ext/filters/client_channel/lb_policy_registry.cc b/grpc/src/core/ext/filters/client_channel/lb_policy_registry.cc index d64a6434..a3f03473 100644 --- a/grpc/src/core/ext/filters/client_channel/lb_policy_registry.cc +++ b/grpc/src/core/ext/filters/client_channel/lb_policy_registry.cc @@ -109,7 +109,7 @@ bool LoadBalancingPolicyRegistry::LoadBalancingPolicyExists( return false; } if (requires_config != nullptr) { - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; // Check if the load balancing policy allows an empty config *requires_config = factory->ParseLoadBalancingConfig(Json(), &error) == nullptr; @@ -122,7 +122,7 @@ namespace { // Returns the JSON node of policy (with both policy name and config content) // given the JSON node of a LoadBalancingConfig array. -grpc_error* ParseLoadBalancingConfigHelper( +grpc_error_handle ParseLoadBalancingConfigHelper( const Json& lb_config_array, Json::Object::const_iterator* result) { if (lb_config_array.type() != Json::Type::ARRAY) { return GRPC_ERROR_CREATE_FROM_STATIC_STRING("type should be array"); @@ -163,8 +163,8 @@ grpc_error* ParseLoadBalancingConfigHelper( } // namespace RefCountedPtr<LoadBalancingPolicy::Config> -LoadBalancingPolicyRegistry::ParseLoadBalancingConfig(const Json& json, - grpc_error** error) { +LoadBalancingPolicyRegistry::ParseLoadBalancingConfig( + const Json& json, grpc_error_handle* error) { GPR_DEBUG_ASSERT(error != nullptr && *error == GRPC_ERROR_NONE); GPR_ASSERT(g_state != nullptr); Json::Object::const_iterator policy; diff --git a/grpc/src/core/ext/filters/client_channel/lb_policy_registry.h b/grpc/src/core/ext/filters/client_channel/lb_policy_registry.h index 8d2e3e39..aba44a8a 100644 --- a/grpc/src/core/ext/filters/client_channel/lb_policy_registry.h +++ b/grpc/src/core/ext/filters/client_channel/lb_policy_registry.h @@ -57,7 +57,7 @@ class LoadBalancingPolicyRegistry { /// Returns a parsed object of the load balancing policy to be used from a /// LoadBalancingConfig array \a json. static RefCountedPtr<LoadBalancingPolicy::Config> ParseLoadBalancingConfig( - const Json& json, grpc_error** error); + const Json& json, grpc_error_handle* error); }; } // namespace grpc_core diff --git a/grpc/src/core/ext/filters/client_channel/local_subchannel_pool.cc b/grpc/src/core/ext/filters/client_channel/local_subchannel_pool.cc index e5759996..49338ecc 100644 --- a/grpc/src/core/ext/filters/client_channel/local_subchannel_pool.cc +++ b/grpc/src/core/ext/filters/client_channel/local_subchannel_pool.cc @@ -24,73 +24,33 @@ namespace grpc_core { -LocalSubchannelPool::LocalSubchannelPool() { - subchannel_map_ = grpc_avl_create(&subchannel_avl_vtable_); +RefCountedPtr<Subchannel> LocalSubchannelPool::RegisterSubchannel( + const SubchannelKey& key, RefCountedPtr<Subchannel> constructed) { + auto it = subchannel_map_.find(key); + // Because this pool is only accessed under the client channel's work + // serializer, and because FindSubchannel is checked before invoking + // RegisterSubchannel, no such subchannel should exist in the map. + GPR_ASSERT(it == subchannel_map_.end()); + subchannel_map_[key] = constructed.get(); + return constructed; +} + +void LocalSubchannelPool::UnregisterSubchannel(const SubchannelKey& key, + Subchannel* subchannel) { + auto it = subchannel_map_.find(key); + // Because this subchannel pool is accessed only under the client + // channel's work serializer, any subchannel created by RegisterSubchannel + // will be deleted from the map in UnregisterSubchannel. + GPR_ASSERT(it != subchannel_map_.end()); + GPR_ASSERT(it->second == subchannel); + subchannel_map_.erase(it); +} + +RefCountedPtr<Subchannel> LocalSubchannelPool::FindSubchannel( + const SubchannelKey& key) { + auto it = subchannel_map_.find(key); + if (it == subchannel_map_.end()) return nullptr; + return it->second->Ref(); } -LocalSubchannelPool::~LocalSubchannelPool() { - grpc_avl_unref(subchannel_map_, nullptr); -} - -Subchannel* LocalSubchannelPool::RegisterSubchannel(SubchannelKey* key, - Subchannel* constructed) { - // Check to see if a subchannel already exists. - Subchannel* c = - static_cast<Subchannel*>(grpc_avl_get(subchannel_map_, key, nullptr)); - if (c != nullptr) { - // The subchannel already exists. Reuse it. - c = GRPC_SUBCHANNEL_REF(c, "subchannel_register+reuse"); - GRPC_SUBCHANNEL_UNREF(constructed, "subchannel_register+found_existing"); - } else { - // There hasn't been such subchannel. Add one. - subchannel_map_ = grpc_avl_add(subchannel_map_, new SubchannelKey(*key), - constructed, nullptr); - c = constructed; - } - return c; -} - -void LocalSubchannelPool::UnregisterSubchannel(SubchannelKey* key) { - subchannel_map_ = grpc_avl_remove(subchannel_map_, key, nullptr); -} - -Subchannel* LocalSubchannelPool::FindSubchannel(SubchannelKey* key) { - Subchannel* c = - static_cast<Subchannel*>(grpc_avl_get(subchannel_map_, key, nullptr)); - return c == nullptr ? c : GRPC_SUBCHANNEL_REF(c, "found_from_pool"); -} - -namespace { - -void sck_avl_destroy(void* p, void* /*user_data*/) { - SubchannelKey* key = static_cast<SubchannelKey*>(p); - delete key; -} - -void* sck_avl_copy(void* p, void* /*unused*/) { - const SubchannelKey* key = static_cast<const SubchannelKey*>(p); - auto new_key = new SubchannelKey(*key); - return static_cast<void*>(new_key); -} - -long sck_avl_compare(void* a, void* b, void* /*unused*/) { - const SubchannelKey* key_a = static_cast<const SubchannelKey*>(a); - const SubchannelKey* key_b = static_cast<const SubchannelKey*>(b); - return key_a->Cmp(*key_b); -} - -void scv_avl_destroy(void* /*p*/, void* /*user_data*/) {} - -void* scv_avl_copy(void* p, void* /*unused*/) { return p; } - -} // namespace - -const grpc_avl_vtable LocalSubchannelPool::subchannel_avl_vtable_ = { - sck_avl_destroy, // destroy_key - sck_avl_copy, // copy_key - sck_avl_compare, // compare_keys - scv_avl_destroy, // destroy_value - scv_avl_copy // copy_value -}; - } // namespace grpc_core diff --git a/grpc/src/core/ext/filters/client_channel/local_subchannel_pool.h b/grpc/src/core/ext/filters/client_channel/local_subchannel_pool.h index 7d18d9b5..f039f6da 100644 --- a/grpc/src/core/ext/filters/client_channel/local_subchannel_pool.h +++ b/grpc/src/core/ext/filters/client_channel/local_subchannel_pool.h @@ -21,6 +21,8 @@ #include <grpc/support/port_platform.h> +#include <map> + #include "src/core/ext/filters/client_channel/subchannel_pool_interface.h" namespace grpc_core { @@ -34,22 +36,21 @@ namespace grpc_core { // Thread-unsafe. class LocalSubchannelPool final : public SubchannelPoolInterface { public: - LocalSubchannelPool(); - ~LocalSubchannelPool() override; + LocalSubchannelPool() {} + ~LocalSubchannelPool() override {} // Implements interface methods. // Thread-unsafe. Intended to be invoked within the client_channel work // serializer. - Subchannel* RegisterSubchannel(SubchannelKey* key, - Subchannel* constructed) override; - void UnregisterSubchannel(SubchannelKey* key) override; - Subchannel* FindSubchannel(SubchannelKey* key) override; + RefCountedPtr<Subchannel> RegisterSubchannel( + const SubchannelKey& key, RefCountedPtr<Subchannel> constructed) override; + void UnregisterSubchannel(const SubchannelKey& key, + Subchannel* subchannel) override; + RefCountedPtr<Subchannel> FindSubchannel(const SubchannelKey& key) override; private: - // The vtable for subchannel operations in an AVL tree. - static const grpc_avl_vtable subchannel_avl_vtable_; // A map from subchannel key to subchannel. - grpc_avl subchannel_map_; + std::map<SubchannelKey, Subchannel*> subchannel_map_; }; } // namespace grpc_core diff --git a/grpc/src/core/ext/filters/client_channel/resolver.cc b/grpc/src/core/ext/filters/client_channel/resolver.cc index 8831db29..a5494b16 100644 --- a/grpc/src/core/ext/filters/client_channel/resolver.cc +++ b/grpc/src/core/ext/filters/client_channel/resolver.cc @@ -29,13 +29,10 @@ namespace grpc_core { // Resolver // -Resolver::Resolver(std::shared_ptr<WorkSerializer> work_serializer, - std::unique_ptr<ResultHandler> result_handler) +Resolver::Resolver() : InternallyRefCounted(GRPC_TRACE_FLAG_ENABLED(grpc_trace_resolver_refcount) ? "Resolver" - : nullptr), - work_serializer_(std::move(work_serializer)), - result_handler_(std::move(result_handler)) {} + : nullptr) {} // // Resolver::Result @@ -63,6 +60,9 @@ Resolver::Result::Result(Result&& other) noexcept { } Resolver::Result& Resolver::Result::operator=(const Result& other) { + if (&other == this) { + return *this; + } addresses = other.addresses; service_config = other.service_config; GRPC_ERROR_UNREF(service_config_error); diff --git a/grpc/src/core/ext/filters/client_channel/resolver.h b/grpc/src/core/ext/filters/client_channel/resolver.h index 31d9c830..2ab74096 100644 --- a/grpc/src/core/ext/filters/client_channel/resolver.h +++ b/grpc/src/core/ext/filters/client_channel/resolver.h @@ -55,7 +55,7 @@ class Resolver : public InternallyRefCounted<Resolver> { struct Result { ServerAddressList addresses; RefCountedPtr<ServiceConfig> service_config; - grpc_error* service_config_error = GRPC_ERROR_NONE; + grpc_error_handle service_config_error = GRPC_ERROR_NONE; const grpc_channel_args* args = nullptr; // TODO(roth): Remove everything below once grpc_error and @@ -81,7 +81,7 @@ class Resolver : public InternallyRefCounted<Resolver> { /// Returns a transient error to the channel. /// If the resolver does not set the GRPC_ERROR_INT_GRPC_STATUS /// attribute on the error, calls will be failed with status UNKNOWN. - virtual void ReturnError(grpc_error* error) = 0; + virtual void ReturnError(grpc_error_handle error) = 0; // TODO(yashkt): As part of the service config error handling // changes, add a method to parse the service config JSON string. @@ -125,21 +125,10 @@ class Resolver : public InternallyRefCounted<Resolver> { } protected: - Resolver(std::shared_ptr<WorkSerializer> work_serializer, - std::unique_ptr<ResultHandler> result_handler); + Resolver(); /// Shuts down the resolver. virtual void ShutdownLocked() = 0; - - std::shared_ptr<WorkSerializer> work_serializer() const { - return work_serializer_; - } - - ResultHandler* result_handler() const { return result_handler_.get(); } - - private: - std::shared_ptr<WorkSerializer> work_serializer_; - std::unique_ptr<ResultHandler> result_handler_; }; } // namespace grpc_core diff --git a/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc b/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc index 0060ad98..2911eae7 100644 --- a/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc +++ b/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc @@ -80,10 +80,10 @@ class AresDnsResolver : public Resolver { void MaybeStartResolvingLocked(); void StartResolvingLocked(); - static void OnNextResolution(void* arg, grpc_error* error); - static void OnResolved(void* arg, grpc_error* error); - void OnNextResolutionLocked(grpc_error* error); - void OnResolvedLocked(grpc_error* error); + static void OnNextResolution(void* arg, grpc_error_handle error); + static void OnResolved(void* arg, grpc_error_handle error); + void OnNextResolutionLocked(grpc_error_handle error); + void OnResolvedLocked(grpc_error_handle error); /// DNS server to use (if not system default) std::string dns_server_; @@ -91,10 +91,20 @@ class AresDnsResolver : public Resolver { std::string name_to_resolve_; /// channel args grpc_channel_args* channel_args_; - /// whether to request the service config - bool request_service_config_; + std::shared_ptr<WorkSerializer> work_serializer_; + std::unique_ptr<ResultHandler> result_handler_; /// pollset_set to drive the name resolution process grpc_pollset_set* interested_parties_; + + /// whether to request the service config + bool request_service_config_; + // whether or not to enable SRV DNS queries + bool enable_srv_queries_; + // timeout in milliseconds for active DNS queries + int query_timeout_ms_; + /// min interval between DNS requests + grpc_millis min_time_between_resolutions_; + /// closures used by the work_serializer grpc_closure on_next_resolution_; grpc_closure on_resolved_; @@ -105,8 +115,6 @@ class AresDnsResolver : public Resolver { /// next resolution timer bool have_next_resolution_timer_ = false; grpc_timer next_resolution_timer_; - /// min interval between DNS requests - grpc_millis min_time_between_resolutions_; /// timestamp of last DNS request grpc_millis last_resolution_timestamp_ = -1; /// retry backoff state @@ -119,14 +127,25 @@ class AresDnsResolver : public Resolver { char* service_config_json_ = nullptr; // has shutdown been initiated bool shutdown_initiated_ = false; - // timeout in milliseconds for active DNS queries - int query_timeout_ms_; - // whether or not to enable SRV DNS queries - bool enable_srv_queries_; }; AresDnsResolver::AresDnsResolver(ResolverArgs args) - : Resolver(std::move(args.work_serializer), std::move(args.result_handler)), + : dns_server_(args.uri.authority()), + name_to_resolve_(absl::StripPrefix(args.uri.path(), "/")), + channel_args_(grpc_channel_args_copy(args.args)), + work_serializer_(std::move(args.work_serializer)), + result_handler_(std::move(args.result_handler)), + interested_parties_(args.pollset_set), + request_service_config_(!grpc_channel_args_find_bool( + channel_args_, GRPC_ARG_SERVICE_CONFIG_DISABLE_RESOLUTION, true)), + enable_srv_queries_(grpc_channel_args_find_bool( + channel_args_, GRPC_ARG_DNS_ENABLE_SRV_QUERIES, false)), + query_timeout_ms_(grpc_channel_args_find_integer( + channel_args_, GRPC_ARG_DNS_ARES_QUERY_TIMEOUT_MS, + {GRPC_DNS_ARES_DEFAULT_QUERY_TIMEOUT_MS, 0, INT_MAX})), + min_time_between_resolutions_(grpc_channel_args_find_integer( + channel_args_, GRPC_ARG_DNS_MIN_TIME_BETWEEN_RESOLUTIONS_MS, + {1000 * 30, 0, INT_MAX})), backoff_( BackOff::Options() .set_initial_backoff(GRPC_DNS_INITIAL_CONNECT_BACKOFF_SECONDS * @@ -134,42 +153,14 @@ AresDnsResolver::AresDnsResolver(ResolverArgs args) .set_multiplier(GRPC_DNS_RECONNECT_BACKOFF_MULTIPLIER) .set_jitter(GRPC_DNS_RECONNECT_JITTER) .set_max_backoff(GRPC_DNS_RECONNECT_MAX_BACKOFF_SECONDS * 1000)) { - // Closure Initialization + // Closure initialization. GRPC_CLOSURE_INIT(&on_next_resolution_, OnNextResolution, this, grpc_schedule_on_exec_ctx); GRPC_CLOSURE_INIT(&on_resolved_, OnResolved, this, grpc_schedule_on_exec_ctx); - // Get name to resolve from URI path. - name_to_resolve_ = std::string(absl::StripPrefix(args.uri.path(), "/")); - // Get DNS server from URI authority. - dns_server_ = args.uri.authority(); - channel_args_ = grpc_channel_args_copy(args.args); - // Disable service config option - const grpc_arg* arg = grpc_channel_args_find( - channel_args_, GRPC_ARG_SERVICE_CONFIG_DISABLE_RESOLUTION); - request_service_config_ = !grpc_channel_arg_get_bool(arg, true); - // Min time b/t resolutions option - arg = grpc_channel_args_find(channel_args_, - GRPC_ARG_DNS_MIN_TIME_BETWEEN_RESOLUTIONS_MS); - min_time_between_resolutions_ = - grpc_channel_arg_get_integer(arg, {1000 * 30, 0, INT_MAX}); - // Enable SRV queries option - arg = grpc_channel_args_find(channel_args_, GRPC_ARG_DNS_ENABLE_SRV_QUERIES); - enable_srv_queries_ = grpc_channel_arg_get_bool(arg, false); - interested_parties_ = grpc_pollset_set_create(); - if (args.pollset_set != nullptr) { - grpc_pollset_set_add_pollset_set(interested_parties_, args.pollset_set); - } - - const grpc_arg* query_timeout_ms_arg = - grpc_channel_args_find(channel_args_, GRPC_ARG_DNS_ARES_QUERY_TIMEOUT_MS); - query_timeout_ms_ = grpc_channel_arg_get_integer( - query_timeout_ms_arg, - {GRPC_DNS_ARES_DEFAULT_QUERY_TIMEOUT_MS, 0, INT_MAX}); } AresDnsResolver::~AresDnsResolver() { GRPC_CARES_TRACE_LOG("resolver:%p destroying AresDnsResolver", this); - grpc_pollset_set_destroy(interested_parties_); grpc_channel_args_destroy(channel_args_); } @@ -202,18 +193,18 @@ void AresDnsResolver::ShutdownLocked() { } } -void AresDnsResolver::OnNextResolution(void* arg, grpc_error* error) { +void AresDnsResolver::OnNextResolution(void* arg, grpc_error_handle error) { AresDnsResolver* r = static_cast<AresDnsResolver*>(arg); GRPC_ERROR_REF(error); // ref owned by lambda - r->work_serializer()->Run([r, error]() { r->OnNextResolutionLocked(error); }, - DEBUG_LOCATION); + r->work_serializer_->Run([r, error]() { r->OnNextResolutionLocked(error); }, + DEBUG_LOCATION); } -void AresDnsResolver::OnNextResolutionLocked(grpc_error* error) { +void AresDnsResolver::OnNextResolutionLocked(grpc_error_handle error) { GRPC_CARES_TRACE_LOG( "resolver:%p re-resolution timer fired. error: %s. shutdown_initiated_: " "%d", - this, grpc_error_string(error), shutdown_initiated_); + this, grpc_error_std_string(error).c_str(), shutdown_initiated_); have_next_resolution_timer_ = false; if (error == GRPC_ERROR_NONE && !shutdown_initiated_) { if (!resolving_) { @@ -236,7 +227,7 @@ bool ValueInJsonArray(const Json::Array& array, const char* value) { } std::string ChooseServiceConfig(char* service_config_choice_json, - grpc_error** error) { + grpc_error_handle* error) { Json json = Json::Parse(service_config_choice_json, error); if (*error != GRPC_ERROR_NONE) return ""; if (json.type() != Json::Type::ARRAY) { @@ -245,7 +236,7 @@ std::string ChooseServiceConfig(char* service_config_choice_json, return ""; } const Json* service_config = nullptr; - absl::InlinedVector<grpc_error*, 4> error_list; + absl::InlinedVector<grpc_error_handle, 4> error_list; for (const Json& choice : json.array_value()) { if (choice.type() != Json::Type::OBJECT) { error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( @@ -314,14 +305,14 @@ std::string ChooseServiceConfig(char* service_config_choice_json, return service_config->Dump(); } -void AresDnsResolver::OnResolved(void* arg, grpc_error* error) { +void AresDnsResolver::OnResolved(void* arg, grpc_error_handle error) { AresDnsResolver* r = static_cast<AresDnsResolver*>(arg); GRPC_ERROR_REF(error); // ref owned by lambda - r->work_serializer()->Run([r, error]() { r->OnResolvedLocked(error); }, - DEBUG_LOCATION); + r->work_serializer_->Run([r, error]() { r->OnResolvedLocked(error); }, + DEBUG_LOCATION); } -void AresDnsResolver::OnResolvedLocked(grpc_error* error) { +void AresDnsResolver::OnResolvedLocked(grpc_error_handle error) { GPR_ASSERT(resolving_); resolving_ = false; gpr_free(pending_request_); @@ -355,7 +346,7 @@ void AresDnsResolver::OnResolvedLocked(grpc_error* error) { } result.args = grpc_channel_args_copy_and_add(channel_args_, new_args.data(), new_args.size()); - result_handler()->ReturnResult(std::move(result)); + result_handler_->ReturnResult(std::move(result)); addresses_.reset(); balancer_addresses_.reset(); // Reset backoff state so that we start from the beginning when the @@ -363,18 +354,22 @@ void AresDnsResolver::OnResolvedLocked(grpc_error* error) { backoff_.Reset(); } else { GRPC_CARES_TRACE_LOG("resolver:%p dns resolution failed: %s", this, - grpc_error_string(error)); + grpc_error_std_string(error).c_str()); std::string error_message = absl::StrCat("DNS resolution failed for service: ", name_to_resolve_); - result_handler()->ReturnError(grpc_error_set_int( + result_handler_->ReturnError(grpc_error_set_int( GRPC_ERROR_CREATE_REFERENCING_FROM_COPIED_STRING(error_message.c_str(), &error, 1), GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_UNAVAILABLE)); // Set retry timer. + // InvalidateNow to avoid getting stuck re-initializing this timer + // in a loop while draining the currently-held WorkSerializer. + // Also see https://github.com/grpc/grpc/issues/26079. + ExecCtx::Get()->InvalidateNow(); grpc_millis next_try = backoff_.NextAttemptTime(); grpc_millis timeout = next_try - ExecCtx::Get()->Now(); GRPC_CARES_TRACE_LOG("resolver:%p dns resolution failed (will retry): %s", - this, grpc_error_string(error)); + this, grpc_error_std_string(error).c_str()); GPR_ASSERT(!have_next_resolution_timer_); have_next_resolution_timer_ = true; // TODO(roth): We currently deal with this ref manually. Once the @@ -398,6 +393,10 @@ void AresDnsResolver::MaybeStartResolvingLocked() { // can start the next resolution. if (have_next_resolution_timer_) return; if (last_resolution_timestamp_ >= 0) { + // InvalidateNow to avoid getting stuck re-initializing this timer + // in a loop while draining the currently-held WorkSerializer. + // Also see https://github.com/grpc/grpc/issues/26079. + ExecCtx::Get()->InvalidateNow(); const grpc_millis earliest_next_resolution = last_resolution_timestamp_ + min_time_between_resolutions_; const grpc_millis ms_until_next_resolution = @@ -436,7 +435,7 @@ void AresDnsResolver::StartResolvingLocked() { interested_parties_, &on_resolved_, &addresses_, enable_srv_queries_ ? &balancer_addresses_ : nullptr, request_service_config_ ? &service_config_json_ : nullptr, - query_timeout_ms_, work_serializer()); + query_timeout_ms_, work_serializer_); last_resolution_timestamp_ = grpc_core::ExecCtx::Get()->Now(); GRPC_CARES_TRACE_LOG("resolver:%p Started resolving. pending_request_:%p", this, pending_request_); @@ -464,7 +463,7 @@ class AresDnsResolverFactory : public ResolverFactory { extern grpc_address_resolver_vtable* grpc_resolve_address_impl; static grpc_address_resolver_vtable* default_resolver; -static grpc_error* blocking_resolve_address_ares( +static grpc_error_handle blocking_resolve_address_ares( const char* name, const char* default_port, grpc_resolved_addresses** addresses) { return default_resolver->blocking_resolve_address(name, default_port, @@ -499,7 +498,7 @@ void grpc_resolver_dns_ares_init() { g_use_ares_dns_resolver = true; gpr_log(GPR_DEBUG, "Using ares dns resolver"); address_sorting_init(); - grpc_error* error = grpc_ares_init(); + grpc_error_handle error = grpc_ares_init(); if (error != GRPC_ERROR_NONE) { GRPC_LOG_IF_ERROR("grpc_ares_init() failed", error); return; diff --git a/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h b/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h index cc884864..08069232 100644 --- a/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h +++ b/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h @@ -42,7 +42,7 @@ class GrpcPolledFd { virtual bool IsFdStillReadableLocked() = 0; /* Called once and only once. Must cause cancellation of any pending * read/write callbacks. */ - virtual void ShutdownLocked(grpc_error* error) = 0; + virtual void ShutdownLocked(grpc_error_handle error) = 0; /* Get the underlying ares_socket_t that this was created from */ virtual ares_socket_t GetWrappedAresSocketLocked() = 0; /* A unique name, for logging */ diff --git a/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_libuv.cc b/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_libuv.cc index e5eea5c6..5c4c5350 100644 --- a/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_libuv.cc +++ b/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_libuv.cc @@ -75,7 +75,7 @@ class GrpcPolledFdLibuv : public GrpcPolledFd { return false; } - void ShutdownInternalLocked(grpc_error* error) { + void ShutdownInternalLocked(grpc_error_handle error) { uv_poll_stop(handle_); uv_close(reinterpret_cast<uv_handle_t*>(handle_), ares_uv_poll_close_cb); if (read_closure_ != nullptr) { @@ -88,7 +88,7 @@ class GrpcPolledFdLibuv : public GrpcPolledFd { } } - void ShutdownLocked(grpc_error* error) override { + void ShutdownLocked(grpc_error_handle error) override { if (grpc_core::ExecCtx::Get() == nullptr) { grpc_core::ExecCtx exec_ctx; ShutdownInternalLocked(error); @@ -127,7 +127,7 @@ static void ares_uv_poll_cb_locked(AresUvPollCbArg* arg) { int events = arg_struct->events; GrpcPolledFdLibuv* polled_fd = reinterpret_cast<GrpcPolledFdLibuv*>(handle->data); - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; if (status < 0) { error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("cares polling error"); error = diff --git a/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc b/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc index ff18f768..31de6799 100644 --- a/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc +++ b/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc @@ -33,10 +33,10 @@ #include <grpc/support/string_util.h> #include <grpc/support/time.h> #include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h" +#include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/gpr/string.h" #include "src/core/lib/iomgr/ev_posix.h" #include "src/core/lib/iomgr/iomgr_internal.h" -#include "src/core/lib/iomgr/sockaddr_utils.h" namespace grpc_core { @@ -54,8 +54,8 @@ class GrpcPolledFdPosix : public GrpcPolledFd { /* c-ares library will close the fd inside grpc_fd. This fd may be picked up immediately by another thread, and should not be closed by the following grpc_fd_orphan. */ - int dummy_release_fd; - grpc_fd_orphan(fd_, nullptr, &dummy_release_fd, "c-ares query finished"); + int phony_release_fd; + grpc_fd_orphan(fd_, nullptr, &phony_release_fd, "c-ares query finished"); } void RegisterForOnReadableLocked(grpc_closure* read_closure) override { @@ -72,7 +72,7 @@ class GrpcPolledFdPosix : public GrpcPolledFd { bytes_available > 0; } - void ShutdownLocked(grpc_error* error) override { + void ShutdownLocked(grpc_error_handle error) override { grpc_fd_shutdown(fd_, error); } diff --git a/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc b/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc index 9b6a0d50..0b4675fa 100644 --- a/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc +++ b/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_windows.cc @@ -30,10 +30,10 @@ #include <grpc/support/string_util.h> #include <grpc/support/time.h> #include <string.h> +#include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/gpr/string.h" #include "src/core/lib/gprpp/memory.h" #include "src/core/lib/iomgr/iocp_windows.h" -#include "src/core/lib/iomgr/sockaddr_utils.h" #include "src/core/lib/iomgr/sockaddr_windows.h" #include "src/core/lib/iomgr/socket_windows.h" #include "src/core/lib/iomgr/tcp_windows.h" @@ -131,12 +131,12 @@ class GrpcPolledFdWindows { grpc_winsocket_destroy(winsocket_); } - void ScheduleAndNullReadClosure(grpc_error* error) { + void ScheduleAndNullReadClosure(grpc_error_handle error) { grpc_core::ExecCtx::Run(DEBUG_LOCATION, read_closure_, error); read_closure_ = nullptr; } - void ScheduleAndNullWriteClosure(grpc_error* error) { + void ScheduleAndNullWriteClosure(grpc_error_handle error) { grpc_core::ExecCtx::Run(DEBUG_LOCATION, write_closure_, error); write_closure_ = nullptr; } @@ -251,9 +251,9 @@ class GrpcPolledFdWindows { } } - bool IsFdStillReadableLocked() { return GRPC_SLICE_LENGTH(read_buf_) > 0; } + bool IsFdStillReadableLocked() { return read_buf_has_data_; } - void ShutdownLocked(grpc_error* error) { + void ShutdownLocked(grpc_error_handle error) { grpc_winsocket_shutdown(winsocket_); } @@ -362,6 +362,8 @@ class GrpcPolledFdWindows { DWORD bytes_sent = 0; int wsa_error_code = 0; if (SendWriteBuf(&bytes_sent, nullptr, &wsa_error_code) != 0) { + grpc_slice_unref_internal(write_buf_); + write_buf_ = grpc_empty_slice(); wsa_error_ctx->SetWSAError(wsa_error_code); char* msg = gpr_format_message(wsa_error_code); GRPC_CARES_TRACE_LOG( @@ -418,7 +420,7 @@ class GrpcPolledFdWindows { abort(); } - static void OnTcpConnect(void* arg, grpc_error* error) { + static void OnTcpConnect(void* arg, grpc_error_handle error) { GrpcPolledFdWindows* grpc_polled_fd = static_cast<GrpcPolledFdWindows*>(arg); GRPC_ERROR_REF(error); // ref owned by lambda @@ -429,12 +431,12 @@ class GrpcPolledFdWindows { DEBUG_LOCATION); } - void OnTcpConnectLocked(grpc_error* error) { + void OnTcpConnectLocked(grpc_error_handle error) { GRPC_CARES_TRACE_LOG( "fd:%s InnerOnTcpConnectLocked error:|%s| " "pending_register_for_readable:%d" " pending_register_for_writeable:%d", - GetName(), grpc_error_string(error), + GetName(), grpc_error_std_string(error).c_str(), pending_continue_register_for_on_readable_locked_, pending_continue_register_for_on_writeable_locked_); GPR_ASSERT(!connect_done_); @@ -574,7 +576,7 @@ class GrpcPolledFdWindows { return out; } - static void OnIocpReadable(void* arg, grpc_error* error) { + static void OnIocpReadable(void* arg, grpc_error_handle error) { GrpcPolledFdWindows* polled_fd = static_cast<GrpcPolledFdWindows*>(arg); GRPC_ERROR_REF(error); // ref owned by lambda polled_fd->work_serializer_->Run( @@ -587,7 +589,7 @@ class GrpcPolledFdWindows { // c-ares reads from this socket later, but it shouldn't necessarily cancel // the entire resolution attempt. Doing so will allow the "inject broken // nameserver list" test to pass on Windows. - void OnIocpReadableLocked(grpc_error* error) { + void OnIocpReadableLocked(grpc_error_handle error) { if (error == GRPC_ERROR_NONE) { if (winsocket_->read_info.wsa_error != 0) { /* WSAEMSGSIZE would be due to receiving more data @@ -601,7 +603,7 @@ class GrpcPolledFdWindows { "fd:|%s| OnIocpReadableInner winsocket_->read_info.wsa_error " "code:|%d| msg:|%s|", GetName(), winsocket_->read_info.wsa_error, - grpc_error_string(error)); + grpc_error_std_string(error).c_str()); } } } @@ -619,7 +621,7 @@ class GrpcPolledFdWindows { ScheduleAndNullReadClosure(error); } - static void OnIocpWriteable(void* arg, grpc_error* error) { + static void OnIocpWriteable(void* arg, grpc_error_handle error) { GrpcPolledFdWindows* polled_fd = static_cast<GrpcPolledFdWindows*>(arg); GRPC_ERROR_REF(error); // error owned by lambda polled_fd->work_serializer_->Run( @@ -627,7 +629,7 @@ class GrpcPolledFdWindows { DEBUG_LOCATION); } - void OnIocpWriteableLocked(grpc_error* error) { + void OnIocpWriteableLocked(grpc_error_handle error) { GRPC_CARES_TRACE_LOG("OnIocpWriteableInner. fd:|%s|", GetName()); GPR_ASSERT(socket_type_ == SOCK_STREAM); if (error == GRPC_ERROR_NONE) { @@ -638,7 +640,7 @@ class GrpcPolledFdWindows { "fd:|%s| OnIocpWriteableInner. winsocket_->write_info.wsa_error " "code:|%d| msg:|%s|", GetName(), winsocket_->write_info.wsa_error, - grpc_error_string(error)); + grpc_error_std_string(error).c_str()); } } GPR_ASSERT(tcp_write_state_ == WRITE_PENDING); @@ -849,7 +851,7 @@ class GrpcPolledFdWindowsWrapper : public GrpcPolledFd { return wrapped_->IsFdStillReadableLocked(); } - void ShutdownLocked(grpc_error* error) override { + void ShutdownLocked(grpc_error_handle error) override { wrapped_->ShutdownLocked(error); } diff --git a/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc b/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc index ede80450..82dbb00e 100644 --- a/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc +++ b/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc @@ -38,14 +38,14 @@ #include <address_sorting/address_sorting.h> #include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h" +#include "src/core/lib/address_utils/parse_address.h" +#include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/gpr/string.h" #include "src/core/lib/gprpp/host_port.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/executor.h" #include "src/core/lib/iomgr/iomgr_internal.h" #include "src/core/lib/iomgr/nameser.h" -#include "src/core/lib/iomgr/parse_address.h" -#include "src/core/lib/iomgr/sockaddr_utils.h" #include "src/core/lib/iomgr/timer.h" #include "src/core/lib/transport/authority_override.h" @@ -77,7 +77,7 @@ struct grpc_ares_request { size_t pending_queries; /** the errors explaining query failures, appended to in query callbacks */ - grpc_error* error; + grpc_error_handle error; }; typedef struct fd_node { @@ -114,8 +114,6 @@ struct grpc_ares_ev_driver { std::shared_ptr<grpc_core::WorkSerializer> work_serializer; /** a list of grpc_fd that this event driver is currently using. */ fd_node* fds; - /** is this event driver currently working? */ - bool working; /** is this event driver being shut down */ bool shutting_down; /** request object that's using this ev driver */ @@ -219,9 +217,9 @@ static void fd_node_shutdown_locked(fd_node* fdn, const char* reason) { void grpc_ares_ev_driver_on_queries_complete_locked( grpc_ares_ev_driver* ev_driver) { - // We mark the event driver as being shut down. If the event driver - // is working, grpc_ares_notify_on_event_locked will shut down the - // fds; if it's not working, there are no fds to shut down. + // We mark the event driver as being shut down. + // grpc_ares_notify_on_event_locked will shut down any remaining + // fds. ev_driver->shutting_down = true; grpc_timer_cancel(&ev_driver->query_timeout); grpc_timer_cancel(&ev_driver->ares_backup_poll_alarm); @@ -240,14 +238,14 @@ void grpc_ares_ev_driver_shutdown_locked(grpc_ares_ev_driver* ev_driver) { // Search fd in the fd_node list head. This is an O(n) search, the max possible // value of n is ARES_GETSOCK_MAXNUM (16). n is typically 1 - 2 in our tests. static fd_node* pop_fd_node_locked(fd_node** head, ares_socket_t as) { - fd_node dummy_head; - dummy_head.next = *head; - fd_node* node = &dummy_head; + fd_node phony_head; + phony_head.next = *head; + fd_node* node = &phony_head; while (node->next != nullptr) { if (node->next->grpc_polled_fd->GetWrappedAresSocketLocked() == as) { fd_node* ret = node->next; node->next = node->next->next; - *head = dummy_head.next; + *head = phony_head.next; return ret; } node = node->next; @@ -270,11 +268,13 @@ static grpc_millis calculate_next_ares_backup_poll_alarm_ms( grpc_core::ExecCtx::Get()->Now(); } -static void on_timeout_locked(grpc_ares_ev_driver* driver, grpc_error* error) { +static void on_timeout_locked(grpc_ares_ev_driver* driver, + grpc_error_handle error) { GRPC_CARES_TRACE_LOG( "request:%p ev_driver=%p on_timeout_locked. driver->shutting_down=%d. " "err=%s", - driver->request, driver, driver->shutting_down, grpc_error_string(error)); + driver->request, driver, driver->shutting_down, + grpc_error_std_string(error).c_str()); if (!driver->shutting_down && error == GRPC_ERROR_NONE) { grpc_ares_ev_driver_shutdown_locked(driver); } @@ -282,7 +282,7 @@ static void on_timeout_locked(grpc_ares_ev_driver* driver, grpc_error* error) { GRPC_ERROR_UNREF(error); } -static void on_timeout(void* arg, grpc_error* error) { +static void on_timeout(void* arg, grpc_error_handle error) { grpc_ares_ev_driver* driver = static_cast<grpc_ares_ev_driver*>(arg); GRPC_ERROR_REF(error); // ref owned by lambda driver->work_serializer->Run( @@ -292,9 +292,9 @@ static void on_timeout(void* arg, grpc_error* error) { static void grpc_ares_notify_on_event_locked(grpc_ares_ev_driver* ev_driver); static void on_ares_backup_poll_alarm_locked(grpc_ares_ev_driver* driver, - grpc_error* error); + grpc_error_handle error); -static void on_ares_backup_poll_alarm(void* arg, grpc_error* error) { +static void on_ares_backup_poll_alarm(void* arg, grpc_error_handle error) { grpc_ares_ev_driver* driver = static_cast<grpc_ares_ev_driver*>(arg); GRPC_ERROR_REF(error); driver->work_serializer->Run( @@ -311,12 +311,13 @@ static void on_ares_backup_poll_alarm(void* arg, grpc_error* error) { * For the latter, we use this backup poller. Also see * https://github.com/grpc/grpc/pull/17688 description for more details. */ static void on_ares_backup_poll_alarm_locked(grpc_ares_ev_driver* driver, - grpc_error* error) { + grpc_error_handle error) { GRPC_CARES_TRACE_LOG( "request:%p ev_driver=%p on_ares_backup_poll_alarm_locked. " "driver->shutting_down=%d. " "err=%s", - driver->request, driver, driver->shutting_down, grpc_error_string(error)); + driver->request, driver, driver->shutting_down, + grpc_error_std_string(error).c_str()); if (!driver->shutting_down && error == GRPC_ERROR_NONE) { fd_node* fdn = driver->fds; while (fdn != nullptr) { @@ -331,6 +332,10 @@ static void on_ares_backup_poll_alarm_locked(grpc_ares_ev_driver* driver, fdn = fdn->next; } if (!driver->shutting_down) { + // InvalidateNow to avoid getting stuck re-initializing this timer + // in a loop while draining the currently-held WorkSerializer. + // Also see https://github.com/grpc/grpc/issues/26079. + grpc_core::ExecCtx::Get()->InvalidateNow(); grpc_millis next_ares_backup_poll_alarm = calculate_next_ares_backup_poll_alarm_ms(driver); grpc_ares_ev_driver_ref(driver); @@ -347,7 +352,7 @@ static void on_ares_backup_poll_alarm_locked(grpc_ares_ev_driver* driver, GRPC_ERROR_UNREF(error); } -static void on_readable_locked(fd_node* fdn, grpc_error* error) { +static void on_readable_locked(fd_node* fdn, grpc_error_handle error) { GPR_ASSERT(fdn->readable_registered); grpc_ares_ev_driver* ev_driver = fdn->ev_driver; const ares_socket_t as = fdn->grpc_polled_fd->GetWrappedAresSocketLocked(); @@ -372,14 +377,14 @@ static void on_readable_locked(fd_node* fdn, grpc_error* error) { GRPC_ERROR_UNREF(error); } -static void on_readable(void* arg, grpc_error* error) { +static void on_readable(void* arg, grpc_error_handle error) { fd_node* fdn = static_cast<fd_node*>(arg); GRPC_ERROR_REF(error); /* ref owned by lambda */ fdn->ev_driver->work_serializer->Run( [fdn, error]() { on_readable_locked(fdn, error); }, DEBUG_LOCATION); } -static void on_writable_locked(fd_node* fdn, grpc_error* error) { +static void on_writable_locked(fd_node* fdn, grpc_error_handle error) { GPR_ASSERT(fdn->writable_registered); grpc_ares_ev_driver* ev_driver = fdn->ev_driver; const ares_socket_t as = fdn->grpc_polled_fd->GetWrappedAresSocketLocked(); @@ -402,7 +407,7 @@ static void on_writable_locked(fd_node* fdn, grpc_error* error) { GRPC_ERROR_UNREF(error); } -static void on_writable(void* arg, grpc_error* error) { +static void on_writable(void* arg, grpc_error_handle error) { fd_node* fdn = static_cast<fd_node*>(arg); GRPC_ERROR_REF(error); /* ref owned by lambda */ fdn->ev_driver->work_serializer->Run( @@ -483,43 +488,34 @@ static void grpc_ares_notify_on_event_locked(grpc_ares_ev_driver* ev_driver) { } } ev_driver->fds = new_list; - // If the ev driver has no working fd, all the tasks are done. - if (new_list == nullptr) { - ev_driver->working = false; - GRPC_CARES_TRACE_LOG("request:%p ev driver stop working", - ev_driver->request); - } } void grpc_ares_ev_driver_start_locked(grpc_ares_ev_driver* ev_driver) { - if (!ev_driver->working) { - ev_driver->working = true; - grpc_ares_notify_on_event_locked(ev_driver); - // Initialize overall DNS resolution timeout alarm - grpc_millis timeout = - ev_driver->query_timeout_ms == 0 - ? GRPC_MILLIS_INF_FUTURE - : ev_driver->query_timeout_ms + grpc_core::ExecCtx::Get()->Now(); - GRPC_CARES_TRACE_LOG( - "request:%p ev_driver=%p grpc_ares_ev_driver_start_locked. timeout in " - "%" PRId64 " ms", - ev_driver->request, ev_driver, timeout); - grpc_ares_ev_driver_ref(ev_driver); - GRPC_CLOSURE_INIT(&ev_driver->on_timeout_locked, on_timeout, ev_driver, - grpc_schedule_on_exec_ctx); - grpc_timer_init(&ev_driver->query_timeout, timeout, - &ev_driver->on_timeout_locked); - // Initialize the backup poll alarm - grpc_millis next_ares_backup_poll_alarm = - calculate_next_ares_backup_poll_alarm_ms(ev_driver); - grpc_ares_ev_driver_ref(ev_driver); - GRPC_CLOSURE_INIT(&ev_driver->on_ares_backup_poll_alarm_locked, - on_ares_backup_poll_alarm, ev_driver, - grpc_schedule_on_exec_ctx); - grpc_timer_init(&ev_driver->ares_backup_poll_alarm, - next_ares_backup_poll_alarm, - &ev_driver->on_ares_backup_poll_alarm_locked); - } + grpc_ares_notify_on_event_locked(ev_driver); + // Initialize overall DNS resolution timeout alarm + grpc_millis timeout = + ev_driver->query_timeout_ms == 0 + ? GRPC_MILLIS_INF_FUTURE + : ev_driver->query_timeout_ms + grpc_core::ExecCtx::Get()->Now(); + GRPC_CARES_TRACE_LOG( + "request:%p ev_driver=%p grpc_ares_ev_driver_start_locked. timeout in " + "%" PRId64 " ms", + ev_driver->request, ev_driver, timeout); + grpc_ares_ev_driver_ref(ev_driver); + GRPC_CLOSURE_INIT(&ev_driver->on_timeout_locked, on_timeout, ev_driver, + grpc_schedule_on_exec_ctx); + grpc_timer_init(&ev_driver->query_timeout, timeout, + &ev_driver->on_timeout_locked); + // Initialize the backup poll alarm + grpc_millis next_ares_backup_poll_alarm = + calculate_next_ares_backup_poll_alarm_ms(ev_driver); + grpc_ares_ev_driver_ref(ev_driver); + GRPC_CLOSURE_INIT(&ev_driver->on_ares_backup_poll_alarm_locked, + on_ares_backup_poll_alarm, ev_driver, + grpc_schedule_on_exec_ctx); + grpc_timer_init(&ev_driver->ares_backup_poll_alarm, + next_ares_backup_poll_alarm, + &ev_driver->on_ares_backup_poll_alarm_locked); } static void noop_inject_channel_config(ares_channel /*channel*/) {} @@ -527,7 +523,7 @@ static void noop_inject_channel_config(ares_channel /*channel*/) {} void (*grpc_ares_test_only_inject_config)(ares_channel channel) = noop_inject_channel_config; -grpc_error* grpc_ares_ev_driver_create_locked( +grpc_error_handle grpc_ares_ev_driver_create_locked( grpc_ares_ev_driver** ev_driver, grpc_pollset_set* pollset_set, int query_timeout_ms, std::shared_ptr<grpc_core::WorkSerializer> work_serializer, @@ -540,7 +536,7 @@ grpc_error* grpc_ares_ev_driver_create_locked( grpc_ares_test_only_inject_config((*ev_driver)->channel); GRPC_CARES_TRACE_LOG("request:%p grpc_ares_ev_driver_create_locked", request); if (status != ARES_SUCCESS) { - grpc_error* err = GRPC_ERROR_CREATE_FROM_COPIED_STRING( + grpc_error_handle err = GRPC_ERROR_CREATE_FROM_COPIED_STRING( absl::StrCat("Failed to init ares channel. C-ares error: ", ares_strerror(status)) .c_str()); @@ -551,7 +547,6 @@ grpc_error* grpc_ares_ev_driver_create_locked( gpr_ref_init(&(*ev_driver)->refs, 1); (*ev_driver)->pollset_set = pollset_set; (*ev_driver)->fds = nullptr; - (*ev_driver)->working = false; (*ev_driver)->shutting_down = false; (*ev_driver)->request = request; (*ev_driver)->polled_fd_factory = @@ -725,7 +720,8 @@ static void on_hostbyname_done_locked(void* arg, int status, int /*timeouts*/, hr->qtype, hr->host, hr->is_balancer, ares_strerror(status)); GRPC_CARES_TRACE_LOG("request:%p on_hostbyname_done_locked: %s", r, error_msg.c_str()); - grpc_error* error = GRPC_ERROR_CREATE_FROM_COPIED_STRING(error_msg.c_str()); + grpc_error_handle error = + GRPC_ERROR_CREATE_FROM_COPIED_STRING(error_msg.c_str()); r->error = grpc_error_add_child(error, r->error); } destroy_hostbyname_request_locked(hr); @@ -757,7 +753,7 @@ static void on_srv_query_done_locked(void* arg, int status, int /*timeouts*/, r, srv_it->host, htons(srv_it->port), true /* is_balancer */, "A"); ares_gethostbyname(r->ev_driver->channel, hr->host, AF_INET, on_hostbyname_done_locked, hr); - grpc_ares_ev_driver_start_locked(r->ev_driver); + grpc_ares_notify_on_event_locked(r->ev_driver); } } if (reply != nullptr) { @@ -769,7 +765,8 @@ static void on_srv_query_done_locked(void* arg, int status, int /*timeouts*/, ares_strerror(status)); GRPC_CARES_TRACE_LOG("request:%p on_srv_query_done_locked: %s", r, error_msg.c_str()); - grpc_error* error = GRPC_ERROR_CREATE_FROM_COPIED_STRING(error_msg.c_str()); + grpc_error_handle error = + GRPC_ERROR_CREATE_FROM_COPIED_STRING(error_msg.c_str()); r->error = grpc_error_add_child(error, r->error); } delete q; @@ -785,7 +782,7 @@ static void on_txt_done_locked(void* arg, int status, int /*timeouts*/, const size_t prefix_len = sizeof(g_service_config_attribute_prefix) - 1; struct ares_txt_ext* result = nullptr; struct ares_txt_ext* reply = nullptr; - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; if (status != ARES_SUCCESS) goto fail; GRPC_CARES_TRACE_LOG("request:%p on_txt_done_locked name=%s ARES_SUCCESS", r, q->name().c_str()); @@ -837,7 +834,7 @@ void grpc_dns_lookup_ares_continue_after_check_localhost_and_ip_literals_locked( const char* default_port, grpc_pollset_set* interested_parties, int query_timeout_ms, std::shared_ptr<grpc_core::WorkSerializer> work_serializer) { - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; grpc_ares_hostbyname_request* hr = nullptr; /* parse name, splitting it into host and port parts */ std::string host; @@ -983,11 +980,7 @@ static bool target_matches_localhost_inner(const char* name, std::string* host, gpr_log(GPR_ERROR, "Unable to split host and port for name: %s", name); return false; } - if (gpr_stricmp(host->c_str(), "localhost") == 0) { - return true; - } else { - return false; - } + return gpr_stricmp(host->c_str(), "localhost") == 0; } static bool target_matches_localhost(const char* name) { @@ -1132,7 +1125,7 @@ void (*grpc_cancel_ares_request_locked)(grpc_ares_request* r) = // Windows. Calling them may cause race conditions when other parts of the // binary calls these functions concurrently. #ifdef GPR_WINDOWS -grpc_error* grpc_ares_init(void) { +grpc_error_handle grpc_ares_init(void) { int status = ares_library_init(ARES_LIB_INIT_ALL); if (status != ARES_SUCCESS) { return GRPC_ERROR_CREATE_FROM_COPIED_STRING( @@ -1144,7 +1137,7 @@ grpc_error* grpc_ares_init(void) { void grpc_ares_cleanup(void) { ares_library_cleanup(); } #else -grpc_error* grpc_ares_init(void) { return GRPC_ERROR_NONE; } +grpc_error_handle grpc_ares_init(void) { return GRPC_ERROR_NONE; } void grpc_ares_cleanup(void) {} #endif // GPR_WINDOWS @@ -1175,7 +1168,7 @@ typedef struct grpc_resolve_address_ares_request { } grpc_resolve_address_ares_request; static void on_dns_lookup_done_locked(grpc_resolve_address_ares_request* r, - grpc_error* error) { + grpc_error_handle error) { gpr_free(r->ares_request); grpc_resolved_addresses** resolved_addresses = r->addrs_out; if (r->addresses == nullptr || r->addresses->empty()) { @@ -1196,7 +1189,7 @@ static void on_dns_lookup_done_locked(grpc_resolve_address_ares_request* r, delete r; } -static void on_dns_lookup_done(void* arg, grpc_error* error) { +static void on_dns_lookup_done(void* arg, grpc_error_handle error) { grpc_resolve_address_ares_request* r = static_cast<grpc_resolve_address_ares_request*>(arg); GRPC_ERROR_REF(error); // ref owned by lambda diff --git a/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h b/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h index 6c29bb68..675dfc8e 100644 --- a/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h +++ b/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h @@ -76,7 +76,7 @@ extern void (*grpc_cancel_ares_request_locked)(grpc_ares_request* request); /* Initialize gRPC ares wrapper. Must be called at least once before grpc_resolve_address_ares(). */ -grpc_error* grpc_ares_init(void); +grpc_error_handle grpc_ares_init(void); /* Uninitialized gRPC ares wrapper. If there was more than one previous call to grpc_ares_init(), this function uninitializes the gRPC ares wrapper only if diff --git a/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_libuv.cc b/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_libuv.cc index 1d4a90fb..8735aa8e 100644 --- a/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_libuv.cc +++ b/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_libuv.cc @@ -25,8 +25,8 @@ #include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h" #include "src/core/ext/filters/client_channel/server_address.h" +#include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/gpr/string.h" -#include "src/core/lib/iomgr/parse_address.h" bool grpc_ares_query_ipv6() { /* The libuv grpc code currently does not have the code to probe for this, diff --git a/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc b/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc index df11db36..f76c6a4a 100644 --- a/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc +++ b/grpc/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_windows.cc @@ -25,8 +25,8 @@ #include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h" #include "src/core/ext/filters/client_channel/server_address.h" +#include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/gpr/string.h" -#include "src/core/lib/iomgr/parse_address.h" #include "src/core/lib/iomgr/socket_windows.h" bool grpc_ares_query_ipv6() { return grpc_ipv6_loopback_available(); } diff --git a/grpc/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc b/grpc/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc index 3e072aa3..3265e29c 100644 --- a/grpc/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc +++ b/grpc/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc @@ -68,15 +68,17 @@ class NativeDnsResolver : public Resolver { void MaybeStartResolvingLocked(); void StartResolvingLocked(); - static void OnNextResolution(void* arg, grpc_error* error); - void OnNextResolutionLocked(grpc_error* error); - static void OnResolved(void* arg, grpc_error* error); - void OnResolvedLocked(grpc_error* error); + static void OnNextResolution(void* arg, grpc_error_handle error); + void OnNextResolutionLocked(grpc_error_handle error); + static void OnResolved(void* arg, grpc_error_handle error); + void OnResolvedLocked(grpc_error_handle error); /// name to resolve std::string name_to_resolve_; /// channel args grpc_channel_args* channel_args_ = nullptr; + std::shared_ptr<WorkSerializer> work_serializer_; + std::unique_ptr<ResultHandler> result_handler_; /// pollset_set to drive the name resolution process grpc_pollset_set* interested_parties_ = nullptr; /// are we shutting down? @@ -99,7 +101,14 @@ class NativeDnsResolver : public Resolver { }; NativeDnsResolver::NativeDnsResolver(ResolverArgs args) - : Resolver(std::move(args.work_serializer), std::move(args.result_handler)), + : name_to_resolve_(absl::StripPrefix(args.uri.path(), "/")), + channel_args_(grpc_channel_args_copy(args.args)), + work_serializer_(std::move(args.work_serializer)), + result_handler_(std::move(args.result_handler)), + interested_parties_(grpc_pollset_set_create()), + min_time_between_resolutions_(grpc_channel_args_find_integer( + channel_args_, GRPC_ARG_DNS_MIN_TIME_BETWEEN_RESOLUTIONS_MS, + {1000 * 30, 0, INT_MAX})), backoff_( BackOff::Options() .set_initial_backoff(GRPC_DNS_INITIAL_CONNECT_BACKOFF_SECONDS * @@ -107,13 +116,6 @@ NativeDnsResolver::NativeDnsResolver(ResolverArgs args) .set_multiplier(GRPC_DNS_RECONNECT_BACKOFF_MULTIPLIER) .set_jitter(GRPC_DNS_RECONNECT_JITTER) .set_max_backoff(GRPC_DNS_RECONNECT_MAX_BACKOFF_SECONDS * 1000)) { - name_to_resolve_ = std::string(absl::StripPrefix(args.uri.path(), "/")); - channel_args_ = grpc_channel_args_copy(args.args); - const grpc_arg* arg = grpc_channel_args_find( - args.args, GRPC_ARG_DNS_MIN_TIME_BETWEEN_RESOLUTIONS_MS); - min_time_between_resolutions_ = - grpc_channel_arg_get_integer(arg, {1000 * 30, 0, INT_MAX}); - interested_parties_ = grpc_pollset_set_create(); if (args.pollset_set != nullptr) { grpc_pollset_set_add_pollset_set(interested_parties_, args.pollset_set); } @@ -146,14 +148,14 @@ void NativeDnsResolver::ShutdownLocked() { } } -void NativeDnsResolver::OnNextResolution(void* arg, grpc_error* error) { +void NativeDnsResolver::OnNextResolution(void* arg, grpc_error_handle error) { NativeDnsResolver* r = static_cast<NativeDnsResolver*>(arg); GRPC_ERROR_REF(error); // ref owned by lambda - r->work_serializer()->Run([r, error]() { r->OnNextResolutionLocked(error); }, - DEBUG_LOCATION); + r->work_serializer_->Run([r, error]() { r->OnNextResolutionLocked(error); }, + DEBUG_LOCATION); } -void NativeDnsResolver::OnNextResolutionLocked(grpc_error* error) { +void NativeDnsResolver::OnNextResolutionLocked(grpc_error_handle error) { have_next_resolution_timer_ = false; if (error == GRPC_ERROR_NONE && !resolving_) { StartResolvingLocked(); @@ -162,14 +164,14 @@ void NativeDnsResolver::OnNextResolutionLocked(grpc_error* error) { GRPC_ERROR_UNREF(error); } -void NativeDnsResolver::OnResolved(void* arg, grpc_error* error) { +void NativeDnsResolver::OnResolved(void* arg, grpc_error_handle error) { NativeDnsResolver* r = static_cast<NativeDnsResolver*>(arg); GRPC_ERROR_REF(error); // owned by lambda - r->work_serializer()->Run([r, error]() { r->OnResolvedLocked(error); }, - DEBUG_LOCATION); + r->work_serializer_->Run([r, error]() { r->OnResolvedLocked(error); }, + DEBUG_LOCATION); } -void NativeDnsResolver::OnResolvedLocked(grpc_error* error) { +void NativeDnsResolver::OnResolvedLocked(grpc_error_handle error) { GPR_ASSERT(resolving_); resolving_ = false; if (shutdown_) { @@ -186,21 +188,25 @@ void NativeDnsResolver::OnResolvedLocked(grpc_error* error) { } grpc_resolved_addresses_destroy(addresses_); result.args = grpc_channel_args_copy(channel_args_); - result_handler()->ReturnResult(std::move(result)); + result_handler_->ReturnResult(std::move(result)); // Reset backoff state so that we start from the beginning when the // next request gets triggered. backoff_.Reset(); } else { gpr_log(GPR_INFO, "dns resolution failed (will retry): %s", - grpc_error_string(error)); + grpc_error_std_string(error).c_str()); // Return transient error. std::string error_message = absl::StrCat("DNS resolution failed for service: ", name_to_resolve_); - result_handler()->ReturnError(grpc_error_set_int( + result_handler_->ReturnError(grpc_error_set_int( GRPC_ERROR_CREATE_REFERENCING_FROM_COPIED_STRING(error_message.c_str(), &error, 1), GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_UNAVAILABLE)); // Set up for retry. + // InvalidateNow to avoid getting stuck re-initializing this timer + // in a loop while draining the currently-held WorkSerializer. + // Also see https://github.com/grpc/grpc/issues/26079. + ExecCtx::Get()->InvalidateNow(); grpc_millis next_try = backoff_.NextAttemptTime(); grpc_millis timeout = next_try - ExecCtx::Get()->Now(); GPR_ASSERT(!have_next_resolution_timer_); @@ -227,6 +233,10 @@ void NativeDnsResolver::MaybeStartResolvingLocked() { // can start the next resolution. if (have_next_resolution_timer_) return; if (last_resolution_timestamp_ >= 0) { + // InvalidateNow to avoid getting stuck re-initializing this timer + // in a loop while draining the currently-held WorkSerializer. + // Also see https://github.com/grpc/grpc/issues/26079. + ExecCtx::Get()->InvalidateNow(); const grpc_millis earliest_next_resolution = last_resolution_timestamp_ + min_time_between_resolutions_; const grpc_millis ms_until_next_resolution = diff --git a/grpc/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc b/grpc/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc index a779cd47..7978d59e 100644 --- a/grpc/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc +++ b/grpc/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc @@ -30,11 +30,11 @@ #include "src/core/ext/filters/client_channel/resolver_registry.h" #include "src/core/ext/filters/client_channel/server_address.h" +#include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/useful.h" #include "src/core/lib/iomgr/closure.h" -#include "src/core/lib/iomgr/parse_address.h" #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/unix_sockets_posix.h" #include "src/core/lib/iomgr/work_serializer.h" @@ -69,6 +69,8 @@ class FakeResolver : public Resolver { // passed-in parameters grpc_channel_args* channel_args_ = nullptr; + std::shared_ptr<WorkSerializer> work_serializer_; + std::unique_ptr<ResultHandler> result_handler_; RefCountedPtr<FakeResolverResponseGenerator> response_generator_; // If has_next_result_ is true, next_result_ is the next resolution result // to be returned. @@ -89,7 +91,8 @@ class FakeResolver : public Resolver { }; FakeResolver::FakeResolver(ResolverArgs args) - : Resolver(std::move(args.work_serializer), std::move(args.result_handler)), + : work_serializer_(std::move(args.work_serializer)), + result_handler_(std::move(args.result_handler)), response_generator_( FakeResolverResponseGenerator::GetFromArgs(args.args)) { // Channels sharing the same subchannels may have different resolver response @@ -121,8 +124,8 @@ void FakeResolver::RequestReresolutionLocked() { if (!reresolution_closure_pending_) { reresolution_closure_pending_ = true; Ref().release(); // ref held by closure - work_serializer()->Run([this]() { ReturnReresolutionResult(); }, - DEBUG_LOCATION); + work_serializer_->Run([this]() { ReturnReresolutionResult(); }, + DEBUG_LOCATION); } } } @@ -140,7 +143,7 @@ void FakeResolver::MaybeSendResultLocked() { if (return_failure_) { // TODO(roth): Change resolver result generator to be able to inject // the error to be returned. - result_handler()->ReturnError(grpc_error_set_int( + result_handler_->ReturnError(grpc_error_set_int( GRPC_ERROR_CREATE_FROM_STATIC_STRING("Resolver transient failure"), GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_UNAVAILABLE)); return_failure_ = false; @@ -155,7 +158,7 @@ void FakeResolver::MaybeSendResultLocked() { // name, only the one in next_results_ will be kept since next_results_ is // before channel_args_. result.args = grpc_channel_args_union(next_result_.args, channel_args_); - result_handler()->ReturnResult(std::move(result)); + result_handler_->ReturnResult(std::move(result)); has_next_result_ = false; } } @@ -236,8 +239,8 @@ void FakeResolverResponseGenerator::SetResponse(Resolver::Result result) { } FakeResolverResponseSetter* arg = new FakeResolverResponseSetter(resolver, std::move(result)); - resolver->work_serializer()->Run([arg]() { arg->SetResponseLocked(); }, - DEBUG_LOCATION); + resolver->work_serializer_->Run([arg]() { arg->SetResponseLocked(); }, + DEBUG_LOCATION); } void FakeResolverResponseGenerator::SetReresolutionResponse( @@ -250,7 +253,7 @@ void FakeResolverResponseGenerator::SetReresolutionResponse( } FakeResolverResponseSetter* arg = new FakeResolverResponseSetter( resolver, std::move(result), true /* has_result */); - resolver->work_serializer()->Run( + resolver->work_serializer_->Run( [arg]() { arg->SetReresolutionResponseLocked(); }, DEBUG_LOCATION); } @@ -263,7 +266,7 @@ void FakeResolverResponseGenerator::UnsetReresolutionResponse() { } FakeResolverResponseSetter* arg = new FakeResolverResponseSetter(resolver, Resolver::Result()); - resolver->work_serializer()->Run( + resolver->work_serializer_->Run( [arg]() { arg->SetReresolutionResponseLocked(); }, DEBUG_LOCATION); } @@ -276,8 +279,8 @@ void FakeResolverResponseGenerator::SetFailure() { } FakeResolverResponseSetter* arg = new FakeResolverResponseSetter(resolver, Resolver::Result()); - resolver->work_serializer()->Run([arg]() { arg->SetFailureLocked(); }, - DEBUG_LOCATION); + resolver->work_serializer_->Run([arg]() { arg->SetFailureLocked(); }, + DEBUG_LOCATION); } void FakeResolverResponseGenerator::SetFailureOnReresolution() { @@ -290,8 +293,8 @@ void FakeResolverResponseGenerator::SetFailureOnReresolution() { FakeResolverResponseSetter* arg = new FakeResolverResponseSetter( resolver, Resolver::Result(), false /* has_result */, false /* immediate */); - resolver->work_serializer()->Run([arg]() { arg->SetFailureLocked(); }, - DEBUG_LOCATION); + resolver->work_serializer_->Run([arg]() { arg->SetFailureLocked(); }, + DEBUG_LOCATION); } void FakeResolverResponseGenerator::SetFakeResolver( @@ -302,56 +305,48 @@ void FakeResolverResponseGenerator::SetFakeResolver( if (has_result_) { FakeResolverResponseSetter* arg = new FakeResolverResponseSetter(resolver_, std::move(result_)); - resolver_->work_serializer()->Run([arg]() { arg->SetResponseLocked(); }, - DEBUG_LOCATION); + resolver_->work_serializer_->Run([arg]() { arg->SetResponseLocked(); }, + DEBUG_LOCATION); has_result_ = false; } } namespace { -static void* response_generator_arg_copy(void* p) { - FakeResolverResponseGenerator* generator = - static_cast<FakeResolverResponseGenerator*>(p); - // TODO(roth): We currently deal with this ref manually. Once the - // new channel args code is converted to C++, find a way to track this ref - // in a cleaner way. - RefCountedPtr<FakeResolverResponseGenerator> copy = generator->Ref(); - copy.release(); +void* ResponseGeneratorChannelArgCopy(void* p) { + auto* generator = static_cast<FakeResolverResponseGenerator*>(p); + generator->Ref().release(); return p; } -static void response_generator_arg_destroy(void* p) { - FakeResolverResponseGenerator* generator = - static_cast<FakeResolverResponseGenerator*>(p); +void ResponseGeneratorChannelArgDestroy(void* p) { + auto* generator = static_cast<FakeResolverResponseGenerator*>(p); generator->Unref(); } -static int response_generator_cmp(void* a, void* b) { return GPR_ICMP(a, b); } - -static const grpc_arg_pointer_vtable response_generator_arg_vtable = { - response_generator_arg_copy, response_generator_arg_destroy, - response_generator_cmp}; +int ResponseGeneratorChannelArgCmp(void* a, void* b) { return GPR_ICMP(a, b); } } // namespace +const grpc_arg_pointer_vtable + FakeResolverResponseGenerator::kChannelArgPointerVtable = { + ResponseGeneratorChannelArgCopy, ResponseGeneratorChannelArgDestroy, + ResponseGeneratorChannelArgCmp}; + grpc_arg FakeResolverResponseGenerator::MakeChannelArg( FakeResolverResponseGenerator* generator) { - grpc_arg arg; - arg.type = GRPC_ARG_POINTER; - arg.key = const_cast<char*>(GRPC_ARG_FAKE_RESOLVER_RESPONSE_GENERATOR); - arg.value.pointer.p = generator; - arg.value.pointer.vtable = &response_generator_arg_vtable; - return arg; + return grpc_channel_arg_pointer_create( + const_cast<char*>(GRPC_ARG_FAKE_RESOLVER_RESPONSE_GENERATOR), generator, + &kChannelArgPointerVtable); } RefCountedPtr<FakeResolverResponseGenerator> FakeResolverResponseGenerator::GetFromArgs(const grpc_channel_args* args) { - const grpc_arg* arg = - grpc_channel_args_find(args, GRPC_ARG_FAKE_RESOLVER_RESPONSE_GENERATOR); - if (arg == nullptr || arg->type != GRPC_ARG_POINTER) return nullptr; - return static_cast<FakeResolverResponseGenerator*>(arg->value.pointer.p) - ->Ref(); + auto* response_generator = + grpc_channel_args_find_pointer<FakeResolverResponseGenerator>( + args, GRPC_ARG_FAKE_RESOLVER_RESPONSE_GENERATOR); + if (response_generator == nullptr) return nullptr; + return response_generator->Ref(); } // diff --git a/grpc/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h b/grpc/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h index b9ca69df..94d7c22c 100644 --- a/grpc/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h +++ b/grpc/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h @@ -42,6 +42,8 @@ class FakeResolver; class FakeResolverResponseGenerator : public RefCounted<FakeResolverResponseGenerator> { public: + static const grpc_arg_pointer_vtable kChannelArgPointerVtable; + FakeResolverResponseGenerator(); ~FakeResolverResponseGenerator() override; @@ -69,6 +71,7 @@ class FakeResolverResponseGenerator void SetFailureOnReresolution(); // Returns a channel arg containing \a generator. + // TODO(roth): When we have time, make this a non-static method. static grpc_arg MakeChannelArg(FakeResolverResponseGenerator* generator); // Returns the response generator in \a args, or null if not found. @@ -82,12 +85,11 @@ class FakeResolverResponseGenerator // Mutex protecting the members below. Mutex mu_; - RefCountedPtr<FakeResolver> resolver_; - Resolver::Result result_; - bool has_result_ = false; + RefCountedPtr<FakeResolver> resolver_ ABSL_GUARDED_BY(mu_); + Resolver::Result result_ ABSL_GUARDED_BY(mu_); + bool has_result_ ABSL_GUARDED_BY(mu_) = false; }; } // namespace grpc_core -#endif /* GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_FAKE_FAKE_RESOLVER_H \ - */ +#endif // GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_FAKE_FAKE_RESOLVER_H diff --git a/grpc/src/core/ext/filters/client_channel/resolver/google_c2p/google_c2p_resolver.cc b/grpc/src/core/ext/filters/client_channel/resolver/google_c2p/google_c2p_resolver.cc new file mode 100644 index 00000000..208ec670 --- /dev/null +++ b/grpc/src/core/ext/filters/client_channel/resolver/google_c2p/google_c2p_resolver.cc @@ -0,0 +1,379 @@ +// +// Copyright 2021 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/filters/client_channel/resolver_registry.h" +#include "src/core/ext/xds/xds_client.h" +#include "src/core/lib/gpr/env.h" +#include "src/core/lib/gpr/string.h" +#include "src/core/lib/http/httpcli.h" +#include "src/core/lib/iomgr/polling_entity.h" +#include "src/core/lib/security/credentials/alts/check_gcp_environment.h" + +namespace grpc_core { + +namespace { + +class GoogleCloud2ProdResolver : public Resolver { + public: + explicit GoogleCloud2ProdResolver(ResolverArgs args); + + void StartLocked() override; + void RequestReresolutionLocked() override; + void ResetBackoffLocked() override; + void ShutdownLocked() override; + + private: + // Represents an HTTP request to the metadata server. + class MetadataQuery : public InternallyRefCounted<MetadataQuery> { + public: + MetadataQuery(RefCountedPtr<GoogleCloud2ProdResolver> resolver, + const char* path, grpc_polling_entity* pollent); + ~MetadataQuery() override; + + void Orphan() override; + + private: + static void OnHttpRequestDone(void* arg, grpc_error_handle error); + + // Calls OnDone() if not already called. Releases a ref. + void MaybeCallOnDone(grpc_error_handle error); + + // If error is not GRPC_ERROR_NONE, then it's not safe to look at response. + virtual void OnDone(GoogleCloud2ProdResolver* resolver, + const grpc_http_response* response, + grpc_error_handle error) = 0; + + RefCountedPtr<GoogleCloud2ProdResolver> resolver_; + grpc_httpcli_context context_; + grpc_httpcli_response response_; + grpc_closure on_done_; + Atomic<bool> on_done_called_{false}; + }; + + // A metadata server query to get the zone. + class ZoneQuery : public MetadataQuery { + public: + ZoneQuery(RefCountedPtr<GoogleCloud2ProdResolver> resolver, + grpc_polling_entity* pollent); + + private: + void OnDone(GoogleCloud2ProdResolver* resolver, + const grpc_http_response* response, + grpc_error_handle error) override; + }; + + // A metadata server query to get the IPv6 address. + class IPv6Query : public MetadataQuery { + public: + IPv6Query(RefCountedPtr<GoogleCloud2ProdResolver> resolver, + grpc_polling_entity* pollent); + + private: + void OnDone(GoogleCloud2ProdResolver* resolver, + const grpc_http_response* response, + grpc_error_handle error) override; + }; + + void ZoneQueryDone(std::string zone); + void IPv6QueryDone(bool ipv6_supported); + void StartXdsResolver(); + + std::shared_ptr<WorkSerializer> work_serializer_; + grpc_polling_entity pollent_; + bool using_dns_ = false; + OrphanablePtr<Resolver> child_resolver_; + + OrphanablePtr<ZoneQuery> zone_query_; + absl::optional<std::string> zone_; + + OrphanablePtr<IPv6Query> ipv6_query_; + absl::optional<bool> supports_ipv6_; +}; + +// +// GoogleCloud2ProdResolver::MetadataQuery +// + +GoogleCloud2ProdResolver::MetadataQuery::MetadataQuery( + RefCountedPtr<GoogleCloud2ProdResolver> resolver, const char* path, + grpc_polling_entity* pollent) + : resolver_(std::move(resolver)) { + grpc_httpcli_context_init(&context_); + // Start HTTP request. + GRPC_CLOSURE_INIT(&on_done_, OnHttpRequestDone, this, nullptr); + Ref().release(); // Ref held by callback. + grpc_httpcli_request request; + memset(&request, 0, sizeof(grpc_httpcli_request)); + grpc_http_header header = {const_cast<char*>("Metadata-Flavor"), + const_cast<char*>("Google")}; + request.host = const_cast<char*>("metadata.google.internal"); + request.http.path = const_cast<char*>(path); + request.http.hdr_count = 1; + request.http.hdrs = &header; + grpc_resource_quota* resource_quota = + grpc_resource_quota_create("c2p_resolver"); + grpc_httpcli_get(&context_, pollent, resource_quota, &request, + ExecCtx::Get()->Now() + 10000, // 10s timeout + &on_done_, &response_); + grpc_resource_quota_unref_internal(resource_quota); +} + +GoogleCloud2ProdResolver::MetadataQuery::~MetadataQuery() { + grpc_httpcli_context_destroy(&context_); + grpc_http_response_destroy(&response_); +} + +void GoogleCloud2ProdResolver::MetadataQuery::Orphan() { + // TODO(roth): Once the HTTP client library supports cancellation, + // use that here. + MaybeCallOnDone(GRPC_ERROR_CANCELLED); +} + +void GoogleCloud2ProdResolver::MetadataQuery::OnHttpRequestDone( + void* arg, grpc_error_handle error) { + auto* self = static_cast<MetadataQuery*>(arg); + self->MaybeCallOnDone(GRPC_ERROR_REF(error)); +} + +void GoogleCloud2ProdResolver::MetadataQuery::MaybeCallOnDone( + grpc_error_handle error) { + bool expected = false; + if (!on_done_called_.CompareExchangeStrong( + &expected, true, MemoryOrder::RELAXED, MemoryOrder::RELAXED)) { + // We've already called OnDone(), so just clean up. + GRPC_ERROR_UNREF(error); + Unref(); + return; + } + // Hop back into WorkSerializer to call OnDone(). + // Note: We implicitly pass our ref to the callback here. + resolver_->work_serializer_->Run( + [this, error]() { + OnDone(resolver_.get(), &response_, error); + Unref(); + }, + DEBUG_LOCATION); +} + +// +// GoogleCloud2ProdResolver::ZoneQuery +// + +GoogleCloud2ProdResolver::ZoneQuery::ZoneQuery( + RefCountedPtr<GoogleCloud2ProdResolver> resolver, + grpc_polling_entity* pollent) + : MetadataQuery(std::move(resolver), "/computeMetadata/v1/instance/zone", + pollent) {} + +void GoogleCloud2ProdResolver::ZoneQuery::OnDone( + GoogleCloud2ProdResolver* resolver, const grpc_http_response* response, + grpc_error_handle error) { + if (error != GRPC_ERROR_NONE) { + gpr_log(GPR_ERROR, "error fetching zone from metadata server: %s", + grpc_error_std_string(error).c_str()); + } + std::string zone; + if (error == GRPC_ERROR_NONE && response->status == 200) { + absl::string_view body(response->body, response->body_length); + size_t i = body.find_last_of('/'); + if (i == body.npos) { + gpr_log(GPR_ERROR, "could not parse zone from metadata server: %s", + std::string(body).c_str()); + } else { + zone = std::string(body.substr(i)); + } + } + resolver->ZoneQueryDone(std::move(zone)); + GRPC_ERROR_UNREF(error); +} + +// +// GoogleCloud2ProdResolver::IPv6Query +// + +GoogleCloud2ProdResolver::IPv6Query::IPv6Query( + RefCountedPtr<GoogleCloud2ProdResolver> resolver, + grpc_polling_entity* pollent) + : MetadataQuery(std::move(resolver), + "/computeMetadata/v1/instance/network-interfaces/0/ipv6s", + pollent) {} + +void GoogleCloud2ProdResolver::IPv6Query::OnDone( + GoogleCloud2ProdResolver* resolver, const grpc_http_response* response, + grpc_error_handle error) { + if (error != GRPC_ERROR_NONE) { + gpr_log(GPR_ERROR, "error fetching IPv6 address from metadata server: %s", + grpc_error_std_string(error).c_str()); + } + resolver->IPv6QueryDone(error == GRPC_ERROR_NONE && response->status == 200); + GRPC_ERROR_UNREF(error); +} + +// +// GoogleCloud2ProdResolver +// + +GoogleCloud2ProdResolver::GoogleCloud2ProdResolver(ResolverArgs args) + : work_serializer_(std::move(args.work_serializer)), + pollent_(grpc_polling_entity_create_from_pollset_set(args.pollset_set)) { + absl::string_view name_to_resolve = absl::StripPrefix(args.uri.path(), "/"); + // If we're not running on GCP, we can't use DirectPath, so delegate + // to the DNS resolver. + if (!grpc_alts_is_running_on_gcp() || + // If the client is already using xDS, we can't use it here, because + // they may be talking to a completely different xDS server than we + // want to. + // TODO(roth): When we implement xDS federation, remove this constraint. + UniquePtr<char>(gpr_getenv("GRPC_XDS_BOOTSTRAP")) != nullptr || + UniquePtr<char>(gpr_getenv("GRPC_XDS_BOOTSTRAP_CONFIG")) != nullptr) { + using_dns_ = true; + child_resolver_ = ResolverRegistry::CreateResolver( + absl::StrCat("dns:", name_to_resolve).c_str(), args.args, + args.pollset_set, work_serializer_, std::move(args.result_handler)); + GPR_ASSERT(child_resolver_ != nullptr); + return; + } + // Create xds resolver. + child_resolver_ = ResolverRegistry::CreateResolver( + absl::StrCat("xds:", name_to_resolve).c_str(), args.args, + args.pollset_set, work_serializer_, std::move(args.result_handler)); + GPR_ASSERT(child_resolver_ != nullptr); +} + +void GoogleCloud2ProdResolver::StartLocked() { + if (using_dns_) { + child_resolver_->StartLocked(); + return; + } + // Using xDS. Start metadata server queries. + zone_query_ = MakeOrphanable<ZoneQuery>(Ref(), &pollent_); + ipv6_query_ = MakeOrphanable<IPv6Query>(Ref(), &pollent_); +} + +void GoogleCloud2ProdResolver::RequestReresolutionLocked() { + if (child_resolver_ != nullptr) { + child_resolver_->RequestReresolutionLocked(); + } +} + +void GoogleCloud2ProdResolver::ResetBackoffLocked() { + if (child_resolver_ != nullptr) { + child_resolver_->ResetBackoffLocked(); + } +} + +void GoogleCloud2ProdResolver::ShutdownLocked() { + zone_query_.reset(); + ipv6_query_.reset(); + child_resolver_.reset(); +} + +void GoogleCloud2ProdResolver::ZoneQueryDone(std::string zone) { + zone_query_.reset(); + zone_ = std::move(zone); + if (supports_ipv6_.has_value()) StartXdsResolver(); +} + +void GoogleCloud2ProdResolver::IPv6QueryDone(bool ipv6_supported) { + ipv6_query_.reset(); + supports_ipv6_ = ipv6_supported; + if (zone_.has_value()) StartXdsResolver(); +} + +void GoogleCloud2ProdResolver::StartXdsResolver() { + // Construct bootstrap JSON. + Json::Object node = { + {"id", "C2P"}, + }; + if (!zone_->empty()) { + node["locality"] = Json::Object{ + {"zone", *zone_}, + }; + }; + if (*supports_ipv6_) { + node["metadata"] = Json::Object{ + {"TRAFFICDIRECTOR_DIRECTPATH_C2P_IPV6_CAPABLE", true}, + }; + } + // Allow the TD server uri to be overridden for testing purposes. + UniquePtr<char> override_server( + gpr_getenv("GRPC_TEST_ONLY_GOOGLE_C2P_RESOLVER_TRAFFIC_DIRECTOR_URI")); + const char* server_uri = + override_server != nullptr && strlen(override_server.get()) > 0 + ? override_server.get() + : "directpath-trafficdirector.googleapis.com"; + Json bootstrap = Json::Object{ + {"xds_servers", + Json::Array{ + Json::Object{ + {"server_uri", server_uri}, + {"channel_creds", + Json::Array{ + Json::Object{ + {"type", "google_default"}, + }, + }}, + {"server_features", Json::Array{"xds_v3"}}, + }, + }}, + {"node", std::move(node)}, + }; + // Inject bootstrap JSON as fallback config. + internal::SetXdsFallbackBootstrapConfig(bootstrap.Dump().c_str()); + // Now start xDS resolver. + child_resolver_->StartLocked(); +} + +// +// Factory +// + +class GoogleCloud2ProdResolverFactory : public ResolverFactory { + public: + bool IsValidUri(const URI& uri) const override { + if (GPR_UNLIKELY(!uri.authority().empty())) { + gpr_log(GPR_ERROR, "google-c2p URI scheme does not support authorities"); + return false; + } + return true; + } + + OrphanablePtr<Resolver> CreateResolver(ResolverArgs args) const override { + if (!IsValidUri(args.uri)) return nullptr; + return MakeOrphanable<GoogleCloud2ProdResolver>(std::move(args)); + } + + const char* scheme() const override { return "google-c2p"; } +}; + +} // namespace + +void GoogleCloud2ProdResolverInit() { + // TODO(roth): Remove env var protection once this code is proven stable. + UniquePtr<char> value(gpr_getenv("GRPC_EXPERIMENTAL_GOOGLE_C2P_RESOLVER")); + bool parsed_value; + bool parse_succeeded = gpr_parse_bool_value(value.get(), &parsed_value); + if (parse_succeeded && parsed_value) { + ResolverRegistry::Builder::RegisterResolverFactory( + absl::make_unique<GoogleCloud2ProdResolverFactory>()); + } +} + +void GoogleCloud2ProdResolverShutdown() {} + +} // namespace grpc_core diff --git a/grpc/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc b/grpc/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc index dfa2dd9b..46efbb06 100644 --- a/grpc/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc +++ b/grpc/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc @@ -30,12 +30,11 @@ #include "src/core/ext/filters/client_channel/resolver_registry.h" #include "src/core/ext/filters/client_channel/server_address.h" +#include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gpr/string.h" -#include "src/core/lib/iomgr/parse_address.h" #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/unix_sockets_posix.h" -#include "src/core/lib/iomgr/work_serializer.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/slice/slice_string_helpers.h" @@ -53,13 +52,14 @@ class SockaddrResolver : public Resolver { void ShutdownLocked() override {} private: + std::unique_ptr<ResultHandler> result_handler_; ServerAddressList addresses_; const grpc_channel_args* channel_args_ = nullptr; }; SockaddrResolver::SockaddrResolver(ServerAddressList addresses, ResolverArgs args) - : Resolver(std::move(args.work_serializer), std::move(args.result_handler)), + : result_handler_(std::move(args.result_handler)), addresses_(std::move(addresses)), channel_args_(grpc_channel_args_copy(args.args)) {} @@ -73,7 +73,7 @@ void SockaddrResolver::StartLocked() { // TODO(roth): Use std::move() once channel args is converted to C++. result.args = channel_args_; channel_args_ = nullptr; - result_handler()->ReturnResult(std::move(result)); + result_handler_->ReturnResult(std::move(result)); } // @@ -150,7 +150,7 @@ class UnixResolverFactory : public ResolverFactory { return CreateSockaddrResolver(std::move(args), grpc_parse_unix); } - std::string GetDefaultAuthority(const URI& uri) const override { + std::string GetDefaultAuthority(const URI& /*uri*/) const override { return "localhost"; } diff --git a/grpc/src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc b/grpc/src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc index e9028099..3a10a423 100644 --- a/grpc/src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc +++ b/grpc/src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc @@ -22,13 +22,19 @@ #include "absl/strings/str_join.h" #include "absl/strings/str_split.h" #include "re2/re2.h" +#define XXH_INLINE_ALL +#include "xxhash.h" #include "src/core/ext/filters/client_channel/config_selector.h" +#include "src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.h" #include "src/core/ext/filters/client_channel/resolver_registry.h" +#include "src/core/ext/xds/xds_channel_args.h" #include "src/core/ext/xds/xds_client.h" +#include "src/core/ext/xds/xds_http_filters.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/lib/surface/lame_client.h" #include "src/core/lib/transport/timeout_encoding.h" namespace grpc_core { @@ -46,8 +52,8 @@ namespace { class XdsResolver : public Resolver { public: explicit XdsResolver(ResolverArgs args) - : Resolver(std::move(args.work_serializer), - std::move(args.result_handler)), + : work_serializer_(std::move(args.work_serializer)), + result_handler_(std::move(args.result_handler)), server_name_(absl::StripPrefix(args.uri.path(), "/")), args_(grpc_channel_args_copy(args.args)), interested_parties_(args.pollset_set) { @@ -68,19 +74,23 @@ class XdsResolver : public Resolver { void ShutdownLocked() override; + void ResetBackoffLocked() override { + if (xds_client_ != nullptr) xds_client_->ResetBackoff(); + } + private: class Notifier { public: Notifier(RefCountedPtr<XdsResolver> resolver, XdsApi::LdsUpdate update); Notifier(RefCountedPtr<XdsResolver> resolver, XdsApi::RdsUpdate update); - Notifier(RefCountedPtr<XdsResolver> resolver, grpc_error* error); + Notifier(RefCountedPtr<XdsResolver> resolver, grpc_error_handle error); explicit Notifier(RefCountedPtr<XdsResolver> resolver); private: enum Type { kLdsUpdate, kRdsUpdate, kError, kDoesNotExist }; - static void RunInExecCtx(void* arg, grpc_error* error); - void RunInWorkSerializer(grpc_error* error); + static void RunInExecCtx(void* arg, grpc_error_handle error); + void RunInWorkSerializer(grpc_error_handle error); RefCountedPtr<XdsResolver> resolver_; grpc_closure closure_; @@ -95,7 +105,9 @@ class XdsResolver : public Resolver { void OnListenerChanged(XdsApi::LdsUpdate listener) override { new Notifier(resolver_, std::move(listener)); } - void OnError(grpc_error* error) override { new Notifier(resolver_, error); } + void OnError(grpc_error_handle error) override { + new Notifier(resolver_, error); + } void OnResourceDoesNotExist() override { new Notifier(resolver_); } private: @@ -109,7 +121,9 @@ class XdsResolver : public Resolver { void OnRouteConfigChanged(XdsApi::RdsUpdate route_config) override { new Notifier(resolver_, std::move(route_config)); } - void OnError(grpc_error* error) override { new Notifier(resolver_, error); } + void OnError(grpc_error_handle error) override { + new Notifier(resolver_, error); + } void OnResourceDoesNotExist() override { new Notifier(resolver_); } private: @@ -117,7 +131,7 @@ class XdsResolver : public Resolver { }; class ClusterState - : public RefCounted<ClusterState, PolymorphicRefCount, false> { + : public RefCounted<ClusterState, PolymorphicRefCount, kUnrefNoDelete> { public: using ClusterStateMap = std::map<std::string, std::unique_ptr<ClusterState>>; @@ -136,8 +150,7 @@ class XdsResolver : public Resolver { class XdsConfigSelector : public ConfigSelector { public: XdsConfigSelector(RefCountedPtr<XdsResolver> resolver, - const std::vector<XdsApi::Route>& routes, - grpc_error* error); + grpc_error_handle* error); ~XdsConfigSelector() override; const char* name() const override { return "XdsConfigSelector"; } @@ -151,47 +164,72 @@ class XdsResolver : public Resolver { CallConfig GetCallConfig(GetCallConfigArgs args) override; + std::vector<const grpc_channel_filter*> GetFilters() override { + return filters_; + } + + grpc_channel_args* ModifyChannelArgs(grpc_channel_args* args) override; + private: struct Route { + struct ClusterWeightState { + uint32_t range_end; + absl::string_view cluster; + RefCountedPtr<ServiceConfig> method_config; + + bool operator==(const ClusterWeightState& other) const; + }; + XdsApi::Route route; - absl::InlinedVector<std::pair<uint32_t, absl::string_view>, 2> - weighted_cluster_state; RefCountedPtr<ServiceConfig> method_config; - bool operator==(const Route& other) const { - return route == other.route && - weighted_cluster_state == other.weighted_cluster_state; - } + absl::InlinedVector<ClusterWeightState, 2> weighted_cluster_state; + + bool operator==(const Route& other) const; }; using RouteTable = std::vector<Route>; void MaybeAddCluster(const std::string& name); - grpc_error* CreateMethodConfig(RefCountedPtr<ServiceConfig>* method_config, - const XdsApi::Route& route); + grpc_error_handle CreateMethodConfig( + const XdsApi::Route& route, + const XdsApi::Route::ClusterWeight* cluster_weight, + RefCountedPtr<ServiceConfig>* method_config); RefCountedPtr<XdsResolver> resolver_; RouteTable route_table_; std::map<absl::string_view, RefCountedPtr<ClusterState>> clusters_; + std::vector<const grpc_channel_filter*> filters_; + grpc_error_handle filter_error_ = GRPC_ERROR_NONE; }; void OnListenerUpdate(XdsApi::LdsUpdate listener); void OnRouteConfigUpdate(XdsApi::RdsUpdate rds_update); - void OnError(grpc_error* error); + void OnError(grpc_error_handle error); void OnResourceDoesNotExist(); - grpc_error* CreateServiceConfig(RefCountedPtr<ServiceConfig>* service_config); + grpc_error_handle CreateServiceConfig( + RefCountedPtr<ServiceConfig>* service_config); void GenerateResult(); void MaybeRemoveUnusedClusters(); + std::shared_ptr<WorkSerializer> work_serializer_; + std::unique_ptr<ResultHandler> result_handler_; std::string server_name_; const grpc_channel_args* args_; grpc_pollset_set* interested_parties_; + RefCountedPtr<XdsClient> xds_client_; + XdsClient::ListenerWatcherInterface* listener_watcher_ = nullptr; + // This will not contain the RouteConfiguration, even if it comes with the + // LDS response; instead, the relevant VirtualHost from the + // RouteConfiguration will be saved in current_virtual_host_. + XdsApi::LdsUpdate current_listener_; + std::string route_config_name_; XdsClient::RouteConfigWatcherInterface* route_config_watcher_ = nullptr; + XdsApi::RdsUpdate::VirtualHost current_virtual_host_; + ClusterState::ClusterStateMap cluster_state_map_; - std::vector<XdsApi::Route> current_update_; - XdsApi::Duration http_max_stream_duration_; }; // @@ -210,13 +248,13 @@ XdsResolver::Notifier::Notifier(RefCountedPtr<XdsResolver> resolver, XdsResolver::Notifier::Notifier(RefCountedPtr<XdsResolver> resolver, XdsApi::RdsUpdate update) : resolver_(std::move(resolver)), type_(kRdsUpdate) { - update_.rds_update = std::move(update); + update_.http_connection_manager.rds_update = std::move(update); GRPC_CLOSURE_INIT(&closure_, &RunInExecCtx, this, nullptr); ExecCtx::Run(DEBUG_LOCATION, &closure_, GRPC_ERROR_NONE); } XdsResolver::Notifier::Notifier(RefCountedPtr<XdsResolver> resolver, - grpc_error* error) + grpc_error_handle error) : resolver_(std::move(resolver)), type_(kError) { GRPC_CLOSURE_INIT(&closure_, &RunInExecCtx, this, nullptr); ExecCtx::Run(DEBUG_LOCATION, &closure_, error); @@ -228,14 +266,14 @@ XdsResolver::Notifier::Notifier(RefCountedPtr<XdsResolver> resolver) ExecCtx::Run(DEBUG_LOCATION, &closure_, GRPC_ERROR_NONE); } -void XdsResolver::Notifier::RunInExecCtx(void* arg, grpc_error* error) { +void XdsResolver::Notifier::RunInExecCtx(void* arg, grpc_error_handle error) { Notifier* self = static_cast<Notifier*>(arg); GRPC_ERROR_REF(error); - self->resolver_->work_serializer()->Run( + self->resolver_->work_serializer_->Run( [self, error]() { self->RunInWorkSerializer(error); }, DEBUG_LOCATION); } -void XdsResolver::Notifier::RunInWorkSerializer(grpc_error* error) { +void XdsResolver::Notifier::RunInWorkSerializer(grpc_error_handle error) { if (resolver_->xds_client_ == nullptr) { GRPC_ERROR_UNREF(error); delete this; @@ -246,7 +284,8 @@ void XdsResolver::Notifier::RunInWorkSerializer(grpc_error* error) { resolver_->OnListenerUpdate(std::move(update_)); break; case kRdsUpdate: - resolver_->OnRouteConfigUpdate(std::move(*update_.rds_update)); + resolver_->OnRouteConfigUpdate( + std::move(*update_.http_connection_manager.rds_update)); break; case kError: resolver_->OnError(error); @@ -259,12 +298,34 @@ void XdsResolver::Notifier::RunInWorkSerializer(grpc_error* error) { } // +// XdsResolver::XdsConfigSelector::Route +// + +bool MethodConfigsEqual(const ServiceConfig* sc1, const ServiceConfig* sc2) { + if (sc1 == nullptr) return sc2 == nullptr; + if (sc2 == nullptr) return false; + return sc1->json_string() == sc2->json_string(); +} + +bool XdsResolver::XdsConfigSelector::Route::ClusterWeightState::operator==( + const ClusterWeightState& other) const { + return range_end == other.range_end && cluster == other.cluster && + MethodConfigsEqual(method_config.get(), other.method_config.get()); +} + +bool XdsResolver::XdsConfigSelector::Route::operator==( + const Route& other) const { + return route == other.route && + weighted_cluster_state == other.weighted_cluster_state && + MethodConfigsEqual(method_config.get(), other.method_config.get()); +} + +// // XdsResolver::XdsConfigSelector // XdsResolver::XdsConfigSelector::XdsConfigSelector( - RefCountedPtr<XdsResolver> resolver, - const std::vector<XdsApi::Route>& routes, grpc_error* error) + RefCountedPtr<XdsResolver> resolver, grpc_error_handle* error) : resolver_(std::move(resolver)) { if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_resolver_trace)) { gpr_log(GPR_INFO, "[xds_resolver %p] creating XdsConfigSelector %p", @@ -279,8 +340,8 @@ XdsResolver::XdsConfigSelector::XdsConfigSelector( // weighted_cluster_state field points to the memory in the route field, so // moving the entry in a reallocation will cause the string_view to point to // invalid data. - route_table_.reserve(routes.size()); - for (auto& route : routes) { + route_table_.reserve(resolver_->current_virtual_host_.routes.size()); + for (auto& route : resolver_->current_virtual_host_.routes) { if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_resolver_trace)) { gpr_log(GPR_INFO, "[xds_resolver %p] XdsConfigSelector %p: route: %s", resolver_.get(), this, route.ToString().c_str()); @@ -292,27 +353,95 @@ XdsResolver::XdsConfigSelector::XdsConfigSelector( // one. if (!route.max_stream_duration.has_value()) { route_entry.route.max_stream_duration = - resolver_->http_max_stream_duration_; + resolver_->current_listener_.http_connection_manager + .http_max_stream_duration; } - error = CreateMethodConfig(&route_entry.method_config, route_entry.route); if (route.weighted_clusters.empty()) { + *error = CreateMethodConfig(route_entry.route, nullptr, + &route_entry.method_config); MaybeAddCluster(route.cluster_name); } else { uint32_t end = 0; for (const auto& weighted_cluster : route_entry.route.weighted_clusters) { - MaybeAddCluster(weighted_cluster.name); + Route::ClusterWeightState cluster_weight_state; + *error = CreateMethodConfig(route_entry.route, &weighted_cluster, + &cluster_weight_state.method_config); + if (*error != GRPC_ERROR_NONE) return; end += weighted_cluster.weight; - route_entry.weighted_cluster_state.emplace_back(end, - weighted_cluster.name); + cluster_weight_state.range_end = end; + cluster_weight_state.cluster = weighted_cluster.name; + route_entry.weighted_cluster_state.push_back( + std::move(cluster_weight_state)); + MaybeAddCluster(weighted_cluster.name); } } } + // Populate filter list. + bool found_router = false; + for (const auto& http_filter : + resolver_->current_listener_.http_connection_manager.http_filters) { + // Stop at the router filter. It's a no-op for us, and we ignore + // anything that may come after it, for compatibility with Envoy. + if (http_filter.config.config_proto_type_name == + kXdsHttpRouterFilterConfigName) { + found_router = true; + break; + } + // Find filter. This is guaranteed to succeed, because it's checked + // at config validation time in the XdsApi code. + const XdsHttpFilterImpl* filter_impl = + XdsHttpFilterRegistry::GetFilterForType( + http_filter.config.config_proto_type_name); + GPR_ASSERT(filter_impl != nullptr); + // Add C-core filter to list. + filters_.push_back(filter_impl->channel_filter()); + } + // For compatibility with Envoy, if the router filter is not + // configured, we fail all RPCs. + if (!found_router) { + filter_error_ = + grpc_error_set_int(GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "no xDS HTTP router filter configured"), + GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_UNAVAILABLE); + filters_.push_back(&grpc_lame_filter); + } } -grpc_error* XdsResolver::XdsConfigSelector::CreateMethodConfig( - RefCountedPtr<ServiceConfig>* method_config, const XdsApi::Route& route) { - grpc_error* error = GRPC_ERROR_NONE; +XdsResolver::XdsConfigSelector::~XdsConfigSelector() { + if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_resolver_trace)) { + gpr_log(GPR_INFO, "[xds_resolver %p] destroying XdsConfigSelector %p", + resolver_.get(), this); + } + clusters_.clear(); + resolver_->MaybeRemoveUnusedClusters(); + GRPC_ERROR_UNREF(filter_error_); +} + +const XdsHttpFilterImpl::FilterConfig* FindFilterConfigOverride( + const std::string& instance_name, + const XdsApi::RdsUpdate::VirtualHost& vhost, const XdsApi::Route& route, + const XdsApi::Route::ClusterWeight* cluster_weight) { + // Check ClusterWeight, if any. + if (cluster_weight != nullptr) { + auto it = cluster_weight->typed_per_filter_config.find(instance_name); + if (it != cluster_weight->typed_per_filter_config.end()) return &it->second; + } + // Check Route. + auto it = route.typed_per_filter_config.find(instance_name); + if (it != route.typed_per_filter_config.end()) return &it->second; + // Check VirtualHost. + it = vhost.typed_per_filter_config.find(instance_name); + if (it != vhost.typed_per_filter_config.end()) return &it->second; + // Not found. + return nullptr; +} + +grpc_error_handle XdsResolver::XdsConfigSelector::CreateMethodConfig( + const XdsApi::Route& route, + const XdsApi::Route::ClusterWeight* cluster_weight, + RefCountedPtr<ServiceConfig>* method_config) { std::vector<std::string> fields; + // Set timeout. if (route.max_stream_duration.has_value() && (route.max_stream_duration->seconds != 0 || route.max_stream_duration->nanos != 0)) { @@ -320,6 +449,51 @@ grpc_error* XdsResolver::XdsConfigSelector::CreateMethodConfig( route.max_stream_duration->seconds, route.max_stream_duration->nanos)); } + // Handle xDS HTTP filters. + std::map<std::string, std::vector<std::string>> per_filter_configs; + grpc_channel_args* args = grpc_channel_args_copy(resolver_->args_); + for (const auto& http_filter : + resolver_->current_listener_.http_connection_manager.http_filters) { + // Stop at the router filter. It's a no-op for us, and we ignore + // anything that may come after it, for compatibility with Envoy. + if (http_filter.config.config_proto_type_name == + kXdsHttpRouterFilterConfigName) { + break; + } + // Find filter. This is guaranteed to succeed, because it's checked + // at config validation time in the XdsApi code. + const XdsHttpFilterImpl* filter_impl = + XdsHttpFilterRegistry::GetFilterForType( + http_filter.config.config_proto_type_name); + GPR_ASSERT(filter_impl != nullptr); + // Allow filter to add channel args that may affect service config + // parsing. + args = filter_impl->ModifyChannelArgs(args); + // Find config override, if any. + const XdsHttpFilterImpl::FilterConfig* config_override = + FindFilterConfigOverride(http_filter.name, + resolver_->current_virtual_host_, route, + cluster_weight); + // Generate service config for filter. + auto method_config_field = + filter_impl->GenerateServiceConfig(http_filter.config, config_override); + if (!method_config_field.ok()) { + return GRPC_ERROR_CREATE_FROM_COPIED_STRING( + absl::StrCat("failed to generate method config for HTTP filter ", + http_filter.name, ": ", + method_config_field.status().ToString()) + .c_str()); + } + per_filter_configs[method_config_field->service_config_field_name] + .push_back(method_config_field->element); + } + for (const auto& p : per_filter_configs) { + fields.emplace_back(absl::StrCat(" \"", p.first, "\": [\n", + absl::StrJoin(p.second, ",\n"), + "\n ]")); + } + // Construct service config. + grpc_error_handle error = GRPC_ERROR_NONE; if (!fields.empty()) { std::string json = absl::StrCat( "{\n" @@ -331,19 +505,20 @@ grpc_error* XdsResolver::XdsConfigSelector::CreateMethodConfig( absl::StrJoin(fields, ",\n"), "\n } ]\n" "}"); - *method_config = - ServiceConfig::Create(resolver_->args_, json.c_str(), &error); + *method_config = ServiceConfig::Create(args, json.c_str(), &error); } + grpc_channel_args_destroy(args); return error; } -XdsResolver::XdsConfigSelector::~XdsConfigSelector() { - if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_resolver_trace)) { - gpr_log(GPR_INFO, "[xds_resolver %p] destroying XdsConfigSelector %p", - resolver_.get(), this); - } - clusters_.clear(); - resolver_->MaybeRemoveUnusedClusters(); +grpc_channel_args* XdsResolver::XdsConfigSelector::ModifyChannelArgs( + grpc_channel_args* args) { + if (filter_error_ == GRPC_ERROR_NONE) return args; + grpc_arg error_arg = MakeLameClientErrorArg(filter_error_); + grpc_channel_args* new_args = + grpc_channel_args_copy_and_add(args, &error_arg, 1); + grpc_channel_args_destroy(args); + return new_args; } void XdsResolver::XdsConfigSelector::MaybeAddCluster(const std::string& name) { @@ -359,108 +534,50 @@ void XdsResolver::XdsConfigSelector::MaybeAddCluster(const std::string& name) { } } -bool PathMatch(const absl::string_view& path, - const XdsApi::Route::Matchers::PathMatcher& path_matcher) { - switch (path_matcher.type) { - case XdsApi::Route::Matchers::PathMatcher::PathMatcherType::PREFIX: - return path_matcher.case_sensitive - ? absl::StartsWith(path, path_matcher.string_matcher) - : absl::StartsWithIgnoreCase(path, - path_matcher.string_matcher); - case XdsApi::Route::Matchers::PathMatcher::PathMatcherType::PATH: - return path_matcher.case_sensitive - ? path == path_matcher.string_matcher - : absl::EqualsIgnoreCase(path, path_matcher.string_matcher); - case XdsApi::Route::Matchers::PathMatcher::PathMatcherType::REGEX: - // Note: Case-sensitive option will already have been set appropriately - // in path_matcher.regex_matcher when it was constructed, so no - // need to check it here. - return RE2::FullMatch(path.data(), *path_matcher.regex_matcher); - default: - return false; - } -} - -absl::optional<absl::string_view> GetMetadataValue( - const std::string& target_key, grpc_metadata_batch* initial_metadata, +absl::optional<absl::string_view> GetHeaderValue( + grpc_metadata_batch* initial_metadata, absl::string_view header_name, std::string* concatenated_value) { - // Find all values for the specified key. - GPR_DEBUG_ASSERT(initial_metadata != nullptr); - absl::InlinedVector<absl::string_view, 1> values; - for (grpc_linked_mdelem* md = initial_metadata->list.head; md != nullptr; - md = md->next) { - absl::string_view key = StringViewFromSlice(GRPC_MDKEY(md->md)); - absl::string_view value = StringViewFromSlice(GRPC_MDVALUE(md->md)); - if (target_key == key) values.push_back(value); - } - // If none found, no match. - if (values.empty()) return absl::nullopt; - // If exactly one found, return it as-is. - if (values.size() == 1) return values.front(); - // If more than one found, concatenate the values, using - // *concatenated_values as a temporary holding place for the - // concatenated string. - *concatenated_value = absl::StrJoin(values, ","); - return *concatenated_value; -} - -bool HeaderMatchHelper( - const XdsApi::Route::Matchers::HeaderMatcher& header_matcher, - grpc_metadata_batch* initial_metadata) { - std::string concatenated_value; - absl::optional<absl::string_view> value; // Note: If we ever allow binary headers here, we still need to // special-case ignore "grpc-tags-bin" and "grpc-trace-bin", since // they are not visible to the LB policy in grpc-go. - if (absl::EndsWith(header_matcher.name, "-bin") || - header_matcher.name == "grpc-previous-rpc-attempts") { - value = absl::nullopt; - } else if (header_matcher.name == "content-type") { - value = "application/grpc"; - } else { - value = GetMetadataValue(header_matcher.name, initial_metadata, - &concatenated_value); + if (absl::EndsWith(header_name, "-bin")) { + return absl::nullopt; + } else if (header_name == "content-type") { + return "application/grpc"; } - if (!value.has_value()) { - if (header_matcher.type == - XdsApi::Route::Matchers::HeaderMatcher::HeaderMatcherType::PRESENT) { - return !header_matcher.present_match; - } else { - // For all other header matcher types, we need the header value to - // exist to consider matches. + return grpc_metadata_batch_get_value(initial_metadata, header_name, + concatenated_value); +} + +bool HeadersMatch(const std::vector<HeaderMatcher>& header_matchers, + grpc_metadata_batch* initial_metadata) { + for (const auto& header_matcher : header_matchers) { + std::string concatenated_value; + if (!header_matcher.Match(GetHeaderValue( + initial_metadata, header_matcher.name(), &concatenated_value))) { return false; } } - switch (header_matcher.type) { - case XdsApi::Route::Matchers::HeaderMatcher::HeaderMatcherType::EXACT: - return value.value() == header_matcher.string_matcher; - case XdsApi::Route::Matchers::HeaderMatcher::HeaderMatcherType::REGEX: - return RE2::FullMatch(value.value().data(), *header_matcher.regex_match); - case XdsApi::Route::Matchers::HeaderMatcher::HeaderMatcherType::RANGE: - int64_t int_value; - if (!absl::SimpleAtoi(value.value(), &int_value)) { - return false; - } - return int_value >= header_matcher.range_start && - int_value < header_matcher.range_end; - case XdsApi::Route::Matchers::HeaderMatcher::HeaderMatcherType::PREFIX: - return absl::StartsWith(value.value(), header_matcher.string_matcher); - case XdsApi::Route::Matchers::HeaderMatcher::HeaderMatcherType::SUFFIX: - return absl::EndsWith(value.value(), header_matcher.string_matcher); - default: - return false; - } + return true; } -bool HeadersMatch( - const std::vector<XdsApi::Route::Matchers::HeaderMatcher>& header_matchers, +absl::optional<uint64_t> HeaderHashHelper( + const XdsApi::Route::HashPolicy& policy, grpc_metadata_batch* initial_metadata) { - for (const auto& header_matcher : header_matchers) { - bool match = HeaderMatchHelper(header_matcher, initial_metadata); - if (header_matcher.invert_match) match = !match; - if (!match) return false; + GPR_ASSERT(policy.type == XdsApi::Route::HashPolicy::HEADER); + std::string value_buffer; + absl::optional<absl::string_view> header_value = + GetHeaderValue(initial_metadata, policy.header_name, &value_buffer); + if (policy.regex != nullptr) { + // If GetHeaderValue() did not already store the value in + // value_buffer, copy it there now, so we can modify it. + if (header_value->data() != value_buffer.data()) { + value_buffer = std::string(*header_value); + } + RE2::GlobalReplace(&value_buffer, *policy.regex, policy.regex_substitution); + header_value = value_buffer; } - return true; + return XXH64(header_value->data(), header_value->size(), 0); } bool UnderFraction(const uint32_t fraction_per_million) { @@ -473,8 +590,8 @@ ConfigSelector::CallConfig XdsResolver::XdsConfigSelector::GetCallConfig( GetCallConfigArgs args) { for (const auto& entry : route_table_) { // Path matching. - if (!PathMatch(StringViewFromSlice(*args.path), - entry.route.matchers.path_matcher)) { + if (!entry.route.matchers.path_matcher.Match( + StringViewFromSlice(*args.path))) { continue; } // Header Matching. @@ -489,13 +606,15 @@ ConfigSelector::CallConfig XdsResolver::XdsConfigSelector::GetCallConfig( } // Found a route match absl::string_view cluster_name; + RefCountedPtr<ServiceConfig> method_config; if (entry.route.weighted_clusters.empty()) { cluster_name = entry.route.cluster_name; + method_config = entry.method_config; } else { const uint32_t key = rand() % entry.weighted_cluster_state[entry.weighted_cluster_state.size() - 1] - .first; + .range_end; // Find the index in weighted clusters corresponding to key. size_t mid = 0; size_t start_index = 0; @@ -503,9 +622,9 @@ ConfigSelector::CallConfig XdsResolver::XdsConfigSelector::GetCallConfig( size_t index = 0; while (end_index > start_index) { mid = (start_index + end_index) / 2; - if (entry.weighted_cluster_state[mid].first > key) { + if (entry.weighted_cluster_state[mid].range_end > key) { end_index = mid; - } else if (entry.weighted_cluster_state[mid].first < key) { + } else if (entry.weighted_cluster_state[mid].range_end < key) { start_index = mid + 1; } else { index = mid + 1; @@ -513,21 +632,56 @@ ConfigSelector::CallConfig XdsResolver::XdsConfigSelector::GetCallConfig( } } if (index == 0) index = start_index; - GPR_ASSERT(entry.weighted_cluster_state[index].first > key); - cluster_name = entry.weighted_cluster_state[index].second; + GPR_ASSERT(entry.weighted_cluster_state[index].range_end > key); + cluster_name = entry.weighted_cluster_state[index].cluster; + method_config = entry.weighted_cluster_state[index].method_config; } auto it = clusters_.find(cluster_name); GPR_ASSERT(it != clusters_.end()); XdsResolver* resolver = static_cast<XdsResolver*>(resolver_->Ref().release()); ClusterState* cluster_state = it->second->Ref().release(); + // Generate a hash + absl::optional<uint64_t> hash; + for (const auto& hash_policy : entry.route.hash_policies) { + absl::optional<uint64_t> new_hash; + switch (hash_policy.type) { + case XdsApi::Route::HashPolicy::HEADER: + new_hash = HeaderHashHelper(hash_policy, args.initial_metadata); + break; + case XdsApi::Route::HashPolicy::CHANNEL_ID: + new_hash = + static_cast<uint64_t>(reinterpret_cast<uintptr_t>(resolver)); + break; + default: + GPR_ASSERT(0); + } + if (new_hash.has_value()) { + // Rotating the old value prevents duplicate hash rules from cancelling + // each other out and preserves all of the entropy + const uint64_t old_value = + hash.has_value() ? ((hash.value() << 1) | (hash.value() >> 63)) : 0; + hash = old_value ^ new_hash.value(); + } + // If the policy is a terminal policy and a hash has been generated, + // ignore the rest of the hash policies. + if (hash_policy.terminal && hash.has_value()) { + break; + } + } + if (!hash.has_value()) { + // If there is no hash, we just choose a random value as a default. + hash = rand(); + } CallConfig call_config; - if (entry.method_config != nullptr) { - call_config.service_config = entry.method_config; + if (method_config != nullptr) { call_config.method_configs = - entry.method_config->GetMethodParsedConfigVector(grpc_empty_slice()); + method_config->GetMethodParsedConfigVector(grpc_empty_slice()); + call_config.service_config = std::move(method_config); } call_config.call_attributes[kXdsClusterAttribute] = it->first; + call_config.call_attributes[kRequestRingHashAttribute] = + absl::StrFormat("%" PRIu64, hash.value()); call_config.on_call_committed = [resolver, cluster_state]() { cluster_state->Unref(); ExecCtx::Run( @@ -541,9 +695,9 @@ ConfigSelector::CallConfig XdsResolver::XdsConfigSelector::GetCallConfig( // the data plane mutex. DEBUG_LOCATION, GRPC_CLOSURE_CREATE( - [](void* arg, grpc_error* /*error*/) { + [](void* arg, grpc_error_handle /*error*/) { auto* resolver = static_cast<XdsResolver*>(arg); - resolver->work_serializer()->Run( + resolver->work_serializer_->Run( [resolver]() { resolver->MaybeRemoveUnusedClusters(); resolver->Unref(); @@ -563,14 +717,14 @@ ConfigSelector::CallConfig XdsResolver::XdsConfigSelector::GetCallConfig( // void XdsResolver::StartLocked() { - grpc_error* error = GRPC_ERROR_NONE; - xds_client_ = XdsClient::GetOrCreate(&error); + grpc_error_handle error = GRPC_ERROR_NONE; + xds_client_ = XdsClient::GetOrCreate(args_, &error); if (error != GRPC_ERROR_NONE) { gpr_log(GPR_ERROR, "Failed to create xds client -- channel will remain in " "TRANSIENT_FAILURE: %s", - grpc_error_string(error)); - result_handler()->ReturnError(error); + grpc_error_std_string(error).c_str()); + result_handler_->ReturnError(error); return; } grpc_pollset_set_add_pollset_set(xds_client_->interested_parties(), @@ -615,24 +769,34 @@ void XdsResolver::OnListenerUpdate(XdsApi::LdsUpdate listener) { if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_resolver_trace)) { gpr_log(GPR_INFO, "[xds_resolver %p] received updated listener data", this); } - if (listener.route_config_name != route_config_name_) { + if (listener.http_connection_manager.route_config_name != + route_config_name_) { if (route_config_watcher_ != nullptr) { xds_client_->CancelRouteConfigDataWatch( route_config_name_, route_config_watcher_, - /*delay_unsubscription=*/!listener.route_config_name.empty()); + /*delay_unsubscription=*/ + !listener.http_connection_manager.route_config_name.empty()); route_config_watcher_ = nullptr; } - route_config_name_ = std::move(listener.route_config_name); + route_config_name_ = + std::move(listener.http_connection_manager.route_config_name); if (!route_config_name_.empty()) { + current_virtual_host_.routes.clear(); auto watcher = absl::make_unique<RouteConfigWatcher>(Ref()); route_config_watcher_ = watcher.get(); xds_client_->WatchRouteConfigData(route_config_name_, std::move(watcher)); } } - http_max_stream_duration_ = listener.http_max_stream_duration; + current_listener_ = std::move(listener); if (route_config_name_.empty()) { - GPR_ASSERT(listener.rds_update.has_value()); - OnRouteConfigUpdate(std::move(*listener.rds_update)); + GPR_ASSERT( + current_listener_.http_connection_manager.rds_update.has_value()); + OnRouteConfigUpdate( + std::move(*current_listener_.http_connection_manager.rds_update)); + } else { + // HCM may contain newer filter config. We need to propagate the update as + // config selector to the channel + GenerateResult(); } } @@ -650,19 +814,20 @@ void XdsResolver::OnRouteConfigUpdate(XdsApi::RdsUpdate rds_update) { .c_str())); return; } - // Save the list of routes in the resolver. - current_update_ = std::move(vhost->routes); + // Save the virtual host in the resolver. + current_virtual_host_ = std::move(*vhost); // Send a new result to the channel. GenerateResult(); } -void XdsResolver::OnError(grpc_error* error) { +void XdsResolver::OnError(grpc_error_handle error) { gpr_log(GPR_ERROR, "[xds_resolver %p] received error from XdsClient: %s", - this, grpc_error_string(error)); + this, grpc_error_std_string(error).c_str()); Result result; - result.args = grpc_channel_args_copy(args_); + grpc_arg new_arg = xds_client_->MakeChannelArg(); + result.args = grpc_channel_args_copy_and_add(args_, &new_arg, 1); result.service_config_error = error; - result_handler()->ReturnResult(std::move(result)); + result_handler_->ReturnResult(std::move(result)); } void XdsResolver::OnResourceDoesNotExist() { @@ -670,16 +835,16 @@ void XdsResolver::OnResourceDoesNotExist() { "[xds_resolver %p] LDS/RDS resource does not exist -- clearing " "update and returning empty service config", this); - current_update_.clear(); + current_virtual_host_.routes.clear(); Result result; result.service_config = ServiceConfig::Create(args_, "{}", &result.service_config_error); GPR_ASSERT(result.service_config != nullptr); result.args = grpc_channel_args_copy(args_); - result_handler()->ReturnResult(std::move(result)); + result_handler_->ReturnResult(std::move(result)); } -grpc_error* XdsResolver::CreateServiceConfig( +grpc_error_handle XdsResolver::CreateServiceConfig( RefCountedPtr<ServiceConfig>* service_config) { std::vector<std::string> clusters; for (const auto& cluster : cluster_state_map_) { @@ -706,18 +871,17 @@ grpc_error* XdsResolver::CreateServiceConfig( " ]\n" "}"); std::string json = absl::StrJoin(config_parts, ""); - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; *service_config = ServiceConfig::Create(args_, json.c_str(), &error); return error; } void XdsResolver::GenerateResult() { - if (current_update_.empty()) return; + if (current_virtual_host_.routes.empty()) return; // First create XdsConfigSelector, which may add new entries to the cluster // state map, and then CreateServiceConfig for LB policies. - grpc_error* error = GRPC_ERROR_NONE; - auto config_selector = - MakeRefCounted<XdsConfigSelector>(Ref(), current_update_, error); + grpc_error_handle error = GRPC_ERROR_NONE; + auto config_selector = MakeRefCounted<XdsConfigSelector>(Ref(), &error); if (error != GRPC_ERROR_NONE) { OnError(error); return; @@ -732,9 +896,13 @@ void XdsResolver::GenerateResult() { gpr_log(GPR_INFO, "[xds_resolver %p] generated service config: %s", this, result.service_config->json_string().c_str()); } - grpc_arg new_arg = config_selector->MakeChannelArg(); - result.args = grpc_channel_args_copy_and_add(args_, &new_arg, 1); - result_handler()->ReturnResult(std::move(result)); + grpc_arg new_args[] = { + xds_client_->MakeChannelArg(), + config_selector->MakeChannelArg(), + }; + result.args = + grpc_channel_args_copy_and_add(args_, new_args, GPR_ARRAY_SIZE(new_args)); + result_handler_->ReturnResult(std::move(result)); } void XdsResolver::MaybeRemoveUnusedClusters() { diff --git a/grpc/src/core/ext/filters/client_channel/resolver_result_parsing.cc b/grpc/src/core/ext/filters/client_channel/resolver_result_parsing.cc index 500c7408..b0c8eebe 100644 --- a/grpc/src/core/ext/filters/client_channel/resolver_result_parsing.cc +++ b/grpc/src/core/ext/filters/client_channel/resolver_result_parsing.cc @@ -1,20 +1,18 @@ -/* - * - * 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> @@ -63,200 +61,15 @@ void ClientChannelServiceConfigParser::Register() { namespace { -std::unique_ptr<ClientChannelMethodParsedConfig::RetryPolicy> ParseRetryPolicy( - const Json& json, grpc_error** error) { - GPR_DEBUG_ASSERT(error != nullptr && *error == GRPC_ERROR_NONE); - auto retry_policy = - absl::make_unique<ClientChannelMethodParsedConfig::RetryPolicy>(); - if (json.type() != Json::Type::OBJECT) { - *error = GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "field:retryPolicy error:should be of type object"); - return nullptr; - } - std::vector<grpc_error*> error_list; - // Parse maxAttempts. - auto it = json.object_value().find("maxAttempts"); - if (it != json.object_value().end()) { - if (it->second.type() != Json::Type::NUMBER) { - error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "field:maxAttempts error:should be of type number")); - } else { - retry_policy->max_attempts = - gpr_parse_nonnegative_int(it->second.string_value().c_str()); - if (retry_policy->max_attempts <= 1) { - error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "field:maxAttempts error:should be at least 2")); - } else if (retry_policy->max_attempts > MAX_MAX_RETRY_ATTEMPTS) { - gpr_log(GPR_ERROR, - "service config: clamped retryPolicy.maxAttempts at %d", - MAX_MAX_RETRY_ATTEMPTS); - retry_policy->max_attempts = MAX_MAX_RETRY_ATTEMPTS; - } - } - } - // Parse initialBackoff. - if (ParseJsonObjectFieldAsDuration(json.object_value(), "initialBackoff", - &retry_policy->initial_backoff, - &error_list) && - retry_policy->initial_backoff == 0) { - error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "field:initialBackoff error:must be greater than 0")); - } - // Parse maxBackoff. - if (ParseJsonObjectFieldAsDuration(json.object_value(), "maxBackoff", - &retry_policy->max_backoff, &error_list) && - retry_policy->max_backoff == 0) { - error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "field:maxBackoff error:should be greater than 0")); - } - // Parse backoffMultiplier. - it = json.object_value().find("backoffMultiplier"); - if (it != json.object_value().end()) { - if (it->second.type() != Json::Type::NUMBER) { - error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "field:backoffMultiplier error:should be of type number")); - } else { - if (sscanf(it->second.string_value().c_str(), "%f", - &retry_policy->backoff_multiplier) != 1) { - error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "field:backoffMultiplier error:failed to parse")); - } else if (retry_policy->backoff_multiplier <= 0) { - error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "field:backoffMultiplier error:should be greater than 0")); - } - } - } - // Parse retryableStatusCodes. - it = json.object_value().find("retryableStatusCodes"); - if (it != json.object_value().end()) { - if (it->second.type() != Json::Type::ARRAY) { - error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "field:retryableStatusCodes error:should be of type array")); - } else { - for (const Json& element : it->second.array_value()) { - if (element.type() != Json::Type::STRING) { - error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "field:retryableStatusCodes error:status codes should be of type " - "string")); - continue; - } - grpc_status_code status; - if (!grpc_status_code_from_string(element.string_value().c_str(), - &status)) { - error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "field:retryableStatusCodes error:failed to parse status code")); - continue; - } - retry_policy->retryable_status_codes.Add(status); - } - if (retry_policy->retryable_status_codes.Empty()) { - error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "field:retryableStatusCodes error:should be non-empty")); - }; - } - } - // Make sure required fields are set. - if (error_list.empty()) { - if (retry_policy->max_attempts == 0 || retry_policy->initial_backoff == 0 || - retry_policy->max_backoff == 0 || - retry_policy->backoff_multiplier == 0 || - retry_policy->retryable_status_codes.Empty()) { - *error = GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "field:retryPolicy error:Missing required field(s)"); - return nullptr; - } - } - *error = GRPC_ERROR_CREATE_FROM_VECTOR("retryPolicy", &error_list); - return *error == GRPC_ERROR_NONE ? std::move(retry_policy) : nullptr; -} - -grpc_error* ParseRetryThrottling( - const Json& json, - ClientChannelGlobalParsedConfig::RetryThrottling* retry_throttling) { - if (json.type() != Json::Type::OBJECT) { - return GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "field:retryThrottling error:Type should be object"); - } - std::vector<grpc_error*> error_list; - // Parse maxTokens. - auto it = json.object_value().find("maxTokens"); - if (it == json.object_value().end()) { - error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "field:retryThrottling field:maxTokens error:Not found")); - } else if (it->second.type() != Json::Type::NUMBER) { - error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "field:retryThrottling field:maxTokens error:Type should be " - "number")); - } else { - retry_throttling->max_milli_tokens = - gpr_parse_nonnegative_int(it->second.string_value().c_str()) * 1000; - if (retry_throttling->max_milli_tokens <= 0) { - error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "field:retryThrottling field:maxTokens error:should be " - "greater than zero")); - } - } - // Parse tokenRatio. - it = json.object_value().find("tokenRatio"); - if (it == json.object_value().end()) { - error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "field:retryThrottling field:tokenRatio error:Not found")); - } else if (it->second.type() != Json::Type::NUMBER) { - error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "field:retryThrottling field:tokenRatio error:type should be " - "number")); - } else { - // We support up to 3 decimal digits. - size_t whole_len = it->second.string_value().size(); - const char* value = it->second.string_value().c_str(); - uint32_t multiplier = 1; - uint32_t decimal_value = 0; - const char* decimal_point = strchr(value, '.'); - if (decimal_point != nullptr) { - whole_len = static_cast<size_t>(decimal_point - value); - multiplier = 1000; - size_t decimal_len = strlen(decimal_point + 1); - if (decimal_len > 3) decimal_len = 3; - if (!gpr_parse_bytes_to_uint32(decimal_point + 1, decimal_len, - &decimal_value)) { - error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "field:retryThrottling field:tokenRatio error:Failed " - "parsing")); - return GRPC_ERROR_CREATE_FROM_VECTOR("retryPolicy", &error_list); - } - uint32_t decimal_multiplier = 1; - for (size_t i = 0; i < (3 - decimal_len); ++i) { - decimal_multiplier *= 10; - } - decimal_value *= decimal_multiplier; - } - uint32_t whole_value; - if (!gpr_parse_bytes_to_uint32(value, whole_len, &whole_value)) { - error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "field:retryThrottling field:tokenRatio error:Failed " - "parsing")); - return GRPC_ERROR_CREATE_FROM_VECTOR("retryPolicy", &error_list); - } - retry_throttling->milli_token_ratio = - static_cast<int>((whole_value * multiplier) + decimal_value); - if (retry_throttling->milli_token_ratio <= 0) { - error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "field:retryThrottling field:tokenRatio error:value should " - "be greater than 0")); - } - } - return GRPC_ERROR_CREATE_FROM_VECTOR("retryPolicy", &error_list); -} - absl::optional<std::string> ParseHealthCheckConfig(const Json& field, - grpc_error** error) { + grpc_error_handle* error) { GPR_DEBUG_ASSERT(error != nullptr && *error == GRPC_ERROR_NONE); if (field.type() != Json::Type::OBJECT) { *error = GRPC_ERROR_CREATE_FROM_STATIC_STRING( "field:healthCheckConfig error:should be of type object"); return absl::nullopt; } - std::vector<grpc_error*> error_list; + std::vector<grpc_error_handle> error_list; absl::optional<std::string> service_name; auto it = field.object_value().find("serviceName"); if (it != field.object_value().end()) { @@ -276,18 +89,19 @@ absl::optional<std::string> ParseHealthCheckConfig(const Json& field, std::unique_ptr<ServiceConfigParser::ParsedConfig> ClientChannelServiceConfigParser::ParseGlobalParams( - const grpc_channel_args* /*args*/, const Json& json, grpc_error** error) { + const grpc_channel_args* /*args*/, const Json& json, + grpc_error_handle* error) { GPR_DEBUG_ASSERT(error != nullptr && *error == GRPC_ERROR_NONE); - std::vector<grpc_error*> error_list; + std::vector<grpc_error_handle> error_list; // Parse LB config. RefCountedPtr<LoadBalancingPolicy::Config> parsed_lb_config; auto it = json.object_value().find("loadBalancingConfig"); if (it != json.object_value().end()) { - grpc_error* parse_error = GRPC_ERROR_NONE; + grpc_error_handle parse_error = GRPC_ERROR_NONE; parsed_lb_config = LoadBalancingPolicyRegistry::ParseLoadBalancingConfig( it->second, &parse_error); if (parsed_lb_config == nullptr) { - std::vector<grpc_error*> lb_errors; + std::vector<grpc_error_handle> lb_errors; lb_errors.push_back(parse_error); error_list.push_back(GRPC_ERROR_CREATE_FROM_VECTOR( "field:loadBalancingConfig", &lb_errors)); @@ -319,24 +133,11 @@ ClientChannelServiceConfigParser::ParseGlobalParams( } } } - // Parse retry throttling. - absl::optional<ClientChannelGlobalParsedConfig::RetryThrottling> - retry_throttling; - it = json.object_value().find("retryThrottling"); - if (it != json.object_value().end()) { - ClientChannelGlobalParsedConfig::RetryThrottling data; - grpc_error* parsing_error = ParseRetryThrottling(it->second, &data); - if (parsing_error != GRPC_ERROR_NONE) { - error_list.push_back(parsing_error); - } else { - retry_throttling.emplace(data); - } - } // Parse health check config. absl::optional<std::string> health_check_service_name; it = json.object_value().find("healthCheckConfig"); if (it != json.object_value().end()) { - grpc_error* parsing_error = GRPC_ERROR_NONE; + grpc_error_handle parsing_error = GRPC_ERROR_NONE; health_check_service_name = ParseHealthCheckConfig(it->second, &parsing_error); if (parsing_error != GRPC_ERROR_NONE) { @@ -348,20 +149,19 @@ ClientChannelServiceConfigParser::ParseGlobalParams( if (*error == GRPC_ERROR_NONE) { return absl::make_unique<ClientChannelGlobalParsedConfig>( std::move(parsed_lb_config), std::move(lb_policy_name), - retry_throttling, std::move(health_check_service_name)); + std::move(health_check_service_name)); } return nullptr; } std::unique_ptr<ServiceConfigParser::ParsedConfig> ClientChannelServiceConfigParser::ParsePerMethodParams( - const grpc_channel_args* /*args*/, const Json& json, grpc_error** error) { + const grpc_channel_args* /*args*/, const Json& json, + grpc_error_handle* error) { GPR_DEBUG_ASSERT(error != nullptr && *error == GRPC_ERROR_NONE); - std::vector<grpc_error*> error_list; - absl::optional<bool> wait_for_ready; - grpc_millis timeout = 0; - std::unique_ptr<ClientChannelMethodParsedConfig::RetryPolicy> retry_policy; + std::vector<grpc_error_handle> error_list; // Parse waitForReady. + absl::optional<bool> wait_for_ready; auto it = json.object_value().find("waitForReady"); if (it != json.object_value().end()) { if (it->second.type() == Json::Type::JSON_TRUE) { @@ -374,21 +174,14 @@ ClientChannelServiceConfigParser::ParsePerMethodParams( } } // Parse timeout. + grpc_millis timeout = 0; ParseJsonObjectFieldAsDuration(json.object_value(), "timeout", &timeout, &error_list, false); - // Parse retry policy. - it = json.object_value().find("retryPolicy"); - if (it != json.object_value().end()) { - grpc_error* error = GRPC_ERROR_NONE; - retry_policy = ParseRetryPolicy(it->second, &error); - if (retry_policy == nullptr) { - error_list.push_back(error); - } - } + // Return result. *error = GRPC_ERROR_CREATE_FROM_VECTOR("Client channel parser", &error_list); if (*error == GRPC_ERROR_NONE) { - return absl::make_unique<ClientChannelMethodParsedConfig>( - timeout, wait_for_ready, std::move(retry_policy)); + return absl::make_unique<ClientChannelMethodParsedConfig>(timeout, + wait_for_ready); } return nullptr; } diff --git a/grpc/src/core/ext/filters/client_channel/resolver_result_parsing.h b/grpc/src/core/ext/filters/client_channel/resolver_result_parsing.h index cdf89d35..b70068e0 100644 --- a/grpc/src/core/ext/filters/client_channel/resolver_result_parsing.h +++ b/grpc/src/core/ext/filters/client_channel/resolver_result_parsing.h @@ -1,20 +1,18 @@ -/* - * - * 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. +// #ifndef GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_RESULT_PARSING_H #define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_RESULT_PARSING_H @@ -26,7 +24,6 @@ #include "src/core/ext/filters/client_channel/lb_policy.h" #include "src/core/ext/filters/client_channel/lb_policy_factory.h" #include "src/core/ext/filters/client_channel/resolver.h" -#include "src/core/ext/filters/client_channel/retry_throttle.h" #include "src/core/ext/filters/client_channel/service_config.h" #include "src/core/lib/channel/status_util.h" #include "src/core/lib/gprpp/ref_counted.h" @@ -40,19 +37,12 @@ namespace internal { class ClientChannelGlobalParsedConfig : public ServiceConfigParser::ParsedConfig { public: - struct RetryThrottling { - intptr_t max_milli_tokens = 0; - intptr_t milli_token_ratio = 0; - }; - ClientChannelGlobalParsedConfig( RefCountedPtr<LoadBalancingPolicy::Config> parsed_lb_config, std::string parsed_deprecated_lb_policy, - const absl::optional<RetryThrottling>& retry_throttling, absl::optional<std::string> health_check_service_name) : parsed_lb_config_(std::move(parsed_lb_config)), parsed_deprecated_lb_policy_(std::move(parsed_deprecated_lb_policy)), - retry_throttling_(retry_throttling), health_check_service_name_(std::move(health_check_service_name)) {} RefCountedPtr<LoadBalancingPolicy::Config> parsed_lb_config() const { @@ -63,10 +53,6 @@ class ClientChannelGlobalParsedConfig return parsed_deprecated_lb_policy_; } - absl::optional<RetryThrottling> retry_throttling() const { - return retry_throttling_; - } - const absl::optional<std::string>& health_check_service_name() const { return health_check_service_name_; } @@ -74,49 +60,34 @@ class ClientChannelGlobalParsedConfig private: RefCountedPtr<LoadBalancingPolicy::Config> parsed_lb_config_; std::string parsed_deprecated_lb_policy_; - absl::optional<RetryThrottling> retry_throttling_; absl::optional<std::string> health_check_service_name_; }; class ClientChannelMethodParsedConfig : public ServiceConfigParser::ParsedConfig { public: - struct RetryPolicy { - int max_attempts = 0; - grpc_millis initial_backoff = 0; - grpc_millis max_backoff = 0; - float backoff_multiplier = 0; - StatusCodeSet retryable_status_codes; - }; - ClientChannelMethodParsedConfig(grpc_millis timeout, - const absl::optional<bool>& wait_for_ready, - std::unique_ptr<RetryPolicy> retry_policy) - : timeout_(timeout), - wait_for_ready_(wait_for_ready), - retry_policy_(std::move(retry_policy)) {} + const absl::optional<bool>& wait_for_ready) + : timeout_(timeout), wait_for_ready_(wait_for_ready) {} grpc_millis timeout() const { return timeout_; } absl::optional<bool> wait_for_ready() const { return wait_for_ready_; } - const RetryPolicy* retry_policy() const { return retry_policy_.get(); } - private: grpc_millis timeout_ = 0; absl::optional<bool> wait_for_ready_; - std::unique_ptr<RetryPolicy> retry_policy_; }; class ClientChannelServiceConfigParser : public ServiceConfigParser::Parser { public: std::unique_ptr<ServiceConfigParser::ParsedConfig> ParseGlobalParams( const grpc_channel_args* /*args*/, const Json& json, - grpc_error** error) override; + grpc_error_handle* error) override; std::unique_ptr<ServiceConfigParser::ParsedConfig> ParsePerMethodParams( const grpc_channel_args* /*args*/, const Json& json, - grpc_error** error) override; + grpc_error_handle* error) override; static size_t ParserIndex(); static void Register(); @@ -125,4 +96,4 @@ class ClientChannelServiceConfigParser : public ServiceConfigParser::Parser { } // namespace internal } // namespace grpc_core -#endif /* GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_RESULT_PARSING_H */ +#endif // GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RESOLVER_RESULT_PARSING_H diff --git a/grpc/src/core/ext/filters/client_channel/retry_filter.cc b/grpc/src/core/ext/filters/client_channel/retry_filter.cc new file mode 100644 index 00000000..a03d2da1 --- /dev/null +++ b/grpc/src/core/ext/filters/client_channel/retry_filter.cc @@ -0,0 +1,2188 @@ +// +// Copyright 2015 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/filters/client_channel/retry_filter.h" + +#include "absl/container/inlined_vector.h" +#include "absl/status/statusor.h" +#include "absl/strings/strip.h" + +#include <grpc/support/log.h> + +#include "src/core/ext/filters/client_channel/client_channel.h" +#include "src/core/ext/filters/client_channel/retry_service_config.h" +#include "src/core/ext/filters/client_channel/retry_throttle.h" +#include "src/core/ext/filters/client_channel/service_config.h" +#include "src/core/ext/filters/client_channel/service_config_call_data.h" +#include "src/core/lib/backoff/backoff.h" +#include "src/core/lib/channel/channel_args.h" +#include "src/core/lib/channel/channel_stack.h" +#include "src/core/lib/channel/status_util.h" +#include "src/core/lib/gprpp/manual_constructor.h" +#include "src/core/lib/iomgr/polling_entity.h" +#include "src/core/lib/slice/slice_internal.h" +#include "src/core/lib/slice/slice_string_helpers.h" +#include "src/core/lib/transport/error_utils.h" +#include "src/core/lib/transport/metadata.h" +#include "src/core/lib/transport/metadata_batch.h" +#include "src/core/lib/transport/static_metadata.h" +#include "src/core/lib/transport/status_metadata.h" +#include "src/core/lib/uri/uri_parser.h" + +// +// Retry filter +// + +// This filter is intended to be used in the DynamicFilter stack in the +// client channel, which is situated between the name resolver and the +// LB policy. Normally, the last filter in the DynamicFilter stack is +// the DynamicTerminationFilter (see client_channel.cc), which creates a +// LoadBalancedCall and delegates to it. However, when retries are +// enabled, this filter is used instead of the DynamicTerminationFilter. +// +// In order to support retries, we act as a proxy for stream op batches. +// When we get a batch from the surface, we add it to our list of pending +// batches, and we then use those batches to construct separate "child" +// batches to be started on an LB call. When the child batches return, we +// then decide which pending batches have been completed and schedule their +// callbacks accordingly. If a call attempt fails and we want to retry it, +// we create a new LB call and start again, constructing new "child" batches +// for the new LB call. +// +// Note that retries are committed when receiving data from the server +// (except for Trailers-Only responses). However, there may be many +// send ops started before receiving any data, so we may have already +// completed some number of send ops (and returned the completions up to +// the surface) by the time we realize that we need to retry. To deal +// with this, we cache data for send ops, so that we can replay them on a +// different LB call even after we have completed the original batches. +// +// The code is structured as follows: +// - In CallData (in the parent channel), we maintain a list of pending +// ops and cached data for send ops. +// - There is a CallData::CallAttempt object for each retry attempt. +// This object contains the LB call for that attempt and state to indicate +// which ops from the CallData object have already been sent down to that +// LB call. +// - There is a CallData::CallAttempt::BatchData object for each "child" +// batch sent on the LB call. +// +// When constructing the "child" batches, we compare the state in the +// CallAttempt object against the state in the CallData object to see +// which batches need to be sent on the LB call for a given attempt. + +// TODO(roth): In subsequent PRs: +// - add support for transparent retries (including initial metadata) +// - figure out how to record stats in census for retries +// (census filter is on top of this one) +// - add census stats for retries + +// By default, we buffer 256 KiB per RPC for retries. +// TODO(roth): Do we have any data to suggest a better value? +#define DEFAULT_PER_RPC_RETRY_BUFFER_SIZE (256 << 10) + +// This value was picked arbitrarily. It can be changed if there is +// any even moderately compelling reason to do so. +#define RETRY_BACKOFF_JITTER 0.2 + +namespace grpc_core { + +namespace { + +using internal::RetryGlobalConfig; +using internal::RetryMethodConfig; +using internal::RetryServiceConfigParser; +using internal::ServerRetryThrottleData; + +TraceFlag grpc_retry_trace(false, "retry"); + +// +// RetryFilter +// + +class RetryFilter { + public: + class CallData; + + static grpc_error_handle Init(grpc_channel_element* elem, + grpc_channel_element_args* args) { + GPR_ASSERT(args->is_last); + GPR_ASSERT(elem->filter == &kRetryFilterVtable); + grpc_error_handle error = GRPC_ERROR_NONE; + new (elem->channel_data) RetryFilter(args->channel_args, &error); + return error; + } + + static void Destroy(grpc_channel_element* elem) { + auto* chand = static_cast<RetryFilter*>(elem->channel_data); + chand->~RetryFilter(); + } + + // Will never be called. + static void StartTransportOp(grpc_channel_element* /*elem*/, + grpc_transport_op* /*op*/) {} + static void GetChannelInfo(grpc_channel_element* /*elem*/, + const grpc_channel_info* /*info*/) {} + + private: + static size_t GetMaxPerRpcRetryBufferSize(const grpc_channel_args* args) { + return static_cast<size_t>(grpc_channel_args_find_integer( + args, GRPC_ARG_PER_RPC_RETRY_BUFFER_SIZE, + {DEFAULT_PER_RPC_RETRY_BUFFER_SIZE, 0, INT_MAX})); + } + + RetryFilter(const grpc_channel_args* args, grpc_error_handle* error) + : client_channel_(grpc_channel_args_find_pointer<ClientChannel>( + args, GRPC_ARG_CLIENT_CHANNEL)), + per_rpc_retry_buffer_size_(GetMaxPerRpcRetryBufferSize(args)) { + // Get retry throttling parameters from service config. + auto* service_config = grpc_channel_args_find_pointer<ServiceConfig>( + args, GRPC_ARG_SERVICE_CONFIG_OBJ); + if (service_config == nullptr) return; + const auto* config = static_cast<const RetryGlobalConfig*>( + service_config->GetGlobalParsedConfig( + RetryServiceConfigParser::ParserIndex())); + if (config == nullptr) return; + // Get server name from target URI. + const char* server_uri = + grpc_channel_args_find_string(args, GRPC_ARG_SERVER_URI); + if (server_uri == nullptr) { + *error = GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "server URI channel arg missing or wrong type in client channel " + "filter"); + return; + } + absl::StatusOr<URI> uri = URI::Parse(server_uri); + if (!uri.ok() || uri->path().empty()) { + *error = GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "could not extract server name from target URI"); + return; + } + std::string server_name(absl::StripPrefix(uri->path(), "/")); + // Get throttling config for server_name. + retry_throttle_data_ = internal::ServerRetryThrottleMap::GetDataForServer( + server_name, config->max_milli_tokens(), config->milli_token_ratio()); + } + + ClientChannel* client_channel_; + size_t per_rpc_retry_buffer_size_; + RefCountedPtr<ServerRetryThrottleData> retry_throttle_data_; +}; + +// +// RetryFilter::CallData +// + +class RetryFilter::CallData { + public: + static grpc_error_handle Init(grpc_call_element* elem, + const grpc_call_element_args* args); + static void Destroy(grpc_call_element* elem, + const grpc_call_final_info* /*final_info*/, + grpc_closure* then_schedule_closure); + static void StartTransportStreamOpBatch( + grpc_call_element* elem, grpc_transport_stream_op_batch* batch); + static void SetPollent(grpc_call_element* elem, grpc_polling_entity* pollent); + + private: + class Canceller; + class CallStackDestructionBarrier; + + // Pending batches stored in call data. + struct PendingBatch { + // The pending batch. If nullptr, this slot is empty. + grpc_transport_stream_op_batch* batch = nullptr; + // Indicates whether payload for send ops has been cached in CallData. + bool send_ops_cached = false; + }; + + // State associated with each call attempt. + // Allocated on the arena. + class CallAttempt + : public RefCounted<CallAttempt, PolymorphicRefCount, kUnrefCallDtor> { + public: + explicit CallAttempt(CallData* calld); + + ClientChannel::LoadBalancedCall* lb_call() const { return lb_call_.get(); } + + // Constructs and starts whatever batches are needed on this call + // attempt. + void StartRetriableBatches(); + + // Frees cached send ops that have already been completed after + // committing the call. + void FreeCachedSendOpDataAfterCommit(); + + private: + // State used for starting a retryable batch on the call attempt's LB call. + // This provides its own grpc_transport_stream_op_batch and other data + // structures needed to populate the ops in the batch. + // We allocate one struct on the arena for each attempt at starting a + // batch on a given LB call. + class BatchData + : public RefCounted<CallAttempt, PolymorphicRefCount, kUnrefCallDtor> { + public: + BatchData(RefCountedPtr<CallAttempt> call_attempt, int refcount, + bool set_on_complete); + ~BatchData() override; + + grpc_transport_stream_op_batch* batch() { return &batch_; } + + // Adds retriable send_initial_metadata op to batch_data. + void AddRetriableSendInitialMetadataOp(); + // Adds retriable send_message op to batch_data. + void AddRetriableSendMessageOp(); + // Adds retriable send_trailing_metadata op to batch_data. + void AddRetriableSendTrailingMetadataOp(); + // Adds retriable recv_initial_metadata op to batch_data. + void AddRetriableRecvInitialMetadataOp(); + // Adds retriable recv_message op to batch_data. + void AddRetriableRecvMessageOp(); + // Adds retriable recv_trailing_metadata op to batch_data. + void AddRetriableRecvTrailingMetadataOp(); + + private: + // Returns true if the call is being retried. + bool MaybeRetry(grpc_status_code status, grpc_mdelem* server_pushback_md, + bool is_lb_drop); + + // Frees cached send ops that were completed by the completed batch in + // batch_data. Used when batches are completed after the call is + // committed. + void FreeCachedSendOpDataForCompletedBatch(); + + // Invokes recv_initial_metadata_ready for a batch. + static void InvokeRecvInitialMetadataCallback(void* arg, + grpc_error_handle error); + // Intercepts recv_initial_metadata_ready callback for retries. + // Commits the call and returns the initial metadata up the stack. + static void RecvInitialMetadataReady(void* arg, grpc_error_handle error); + + // Invokes recv_message_ready for a batch. + static void InvokeRecvMessageCallback(void* arg, grpc_error_handle error); + // Intercepts recv_message_ready callback for retries. + // Commits the call and returns the message up the stack. + static void RecvMessageReady(void* arg, grpc_error_handle error); + + // Adds recv_trailing_metadata_ready closure to closures. + void AddClosureForRecvTrailingMetadataReady( + grpc_error_handle error, CallCombinerClosureList* closures); + // Adds any necessary closures for deferred recv_initial_metadata and + // recv_message callbacks to closures. + void AddClosuresForDeferredRecvCallbacks( + CallCombinerClosureList* closures); + // For any pending batch containing an op that has not yet been started, + // adds the pending batch's completion closures to closures. + void AddClosuresToFailUnstartedPendingBatches( + grpc_error_handle error, CallCombinerClosureList* closures); + // Runs necessary closures upon completion of a call attempt. + void RunClosuresForCompletedCall(grpc_error_handle error); + // Intercepts recv_trailing_metadata_ready callback for retries. + // Commits the call and returns the trailing metadata up the stack. + static void RecvTrailingMetadataReady(void* arg, grpc_error_handle error); + + // Adds the on_complete closure for the pending batch completed in + // batch_data to closures. + void AddClosuresForCompletedPendingBatch( + grpc_error_handle error, CallCombinerClosureList* closures); + + // If there are any cached ops to replay or pending ops to start on the + // LB call, adds them to closures. + void AddClosuresForReplayOrPendingSendOps( + CallCombinerClosureList* closures); + + // Callback used to intercept on_complete from LB calls. + static void OnComplete(void* arg, grpc_error_handle error); + + RefCountedPtr<CallAttempt> call_attempt_; + // The batch to use in the LB call. + // Its payload field points to CallAttempt::batch_payload_. + grpc_transport_stream_op_batch batch_; + // For intercepting on_complete. + grpc_closure on_complete_; + }; + + // Creates a BatchData object on the call's arena with the + // specified refcount. If set_on_complete is true, the batch's + // on_complete callback will be set to point to on_complete(); + // otherwise, the batch's on_complete callback will be null. + BatchData* CreateBatch(int refcount, bool set_on_complete) { + return calld_->arena_->New<BatchData>(Ref(), refcount, set_on_complete); + } + + // If there are any cached send ops that need to be replayed on this + // call attempt, creates and returns a new batch to replay those ops. + // Otherwise, returns nullptr. + BatchData* MaybeCreateBatchForReplay(); + + // Adds batches for pending batches to closures. + void AddBatchesForPendingBatches(CallCombinerClosureList* closures); + + // Adds whatever batches are needed on this attempt to closures. + void AddRetriableBatches(CallCombinerClosureList* closures); + + // Returns true if any op in the batch was not yet started on this attempt. + bool PendingBatchIsUnstarted(PendingBatch* pending); + + // Helper function used to start a recv_trailing_metadata batch. This + // is used in the case where a recv_initial_metadata or recv_message + // op fails in a way that we know the call is over but when the application + // has not yet started its own recv_trailing_metadata op. + void StartInternalRecvTrailingMetadata(); + + CallData* calld_; + RefCountedPtr<ClientChannel::LoadBalancedCall> lb_call_; + + // BatchData.batch.payload points to this. + grpc_transport_stream_op_batch_payload batch_payload_; + // For send_initial_metadata. + // Note that we need to make a copy of the initial metadata for each + // call attempt instead of just referring to the copy in call_data, + // because filters in the subchannel stack may modify the metadata, + // so we need to start in a pristine state for each attempt of the call. + grpc_linked_mdelem* send_initial_metadata_storage_; + grpc_metadata_batch send_initial_metadata_; + // For send_message. + // TODO(roth): Restructure this to eliminate use of ManualConstructor. + ManualConstructor<ByteStreamCache::CachingByteStream> send_message_; + // For send_trailing_metadata. + grpc_linked_mdelem* send_trailing_metadata_storage_; + grpc_metadata_batch send_trailing_metadata_; + // For intercepting recv_initial_metadata. + grpc_metadata_batch recv_initial_metadata_; + grpc_closure recv_initial_metadata_ready_; + bool trailing_metadata_available_ = false; + // For intercepting recv_message. + grpc_closure recv_message_ready_; + OrphanablePtr<ByteStream> recv_message_; + // For intercepting recv_trailing_metadata. + grpc_metadata_batch recv_trailing_metadata_; + grpc_transport_stream_stats collect_stats_; + grpc_closure recv_trailing_metadata_ready_; + // These fields indicate which ops have been started and completed on + // this call attempt. + size_t started_send_message_count_ = 0; + size_t completed_send_message_count_ = 0; + size_t started_recv_message_count_ = 0; + size_t completed_recv_message_count_ = 0; + bool started_send_initial_metadata_ : 1; + bool completed_send_initial_metadata_ : 1; + bool started_send_trailing_metadata_ : 1; + bool completed_send_trailing_metadata_ : 1; + bool started_recv_initial_metadata_ : 1; + bool completed_recv_initial_metadata_ : 1; + bool started_recv_trailing_metadata_ : 1; + bool completed_recv_trailing_metadata_ : 1; + // State for callback processing. + BatchData* recv_initial_metadata_ready_deferred_batch_ = nullptr; + grpc_error_handle recv_initial_metadata_error_ = GRPC_ERROR_NONE; + BatchData* recv_message_ready_deferred_batch_ = nullptr; + grpc_error_handle recv_message_error_ = GRPC_ERROR_NONE; + BatchData* recv_trailing_metadata_internal_batch_ = nullptr; + // NOTE: Do not move this next to the metadata bitfields above. That would + // save space but will also result in a data race because compiler + // will generate a 2 byte store which overwrites the meta-data + // fields upon setting this field. + bool retry_dispatched_ : 1; + }; + + CallData(RetryFilter* chand, const grpc_call_element_args& args); + ~CallData(); + + void StartTransportStreamOpBatch(grpc_transport_stream_op_batch* batch); + + // Returns the index into pending_batches_ to be used for batch. + static size_t GetBatchIndex(grpc_transport_stream_op_batch* batch); + PendingBatch* PendingBatchesAdd(grpc_transport_stream_op_batch* batch); + void PendingBatchClear(PendingBatch* pending); + void MaybeClearPendingBatch(PendingBatch* pending); + static void FailPendingBatchInCallCombiner(void* arg, + grpc_error_handle error); + // Fails all pending batches. Does NOT yield call combiner. + void PendingBatchesFail(grpc_error_handle error); + // Returns a pointer to the first pending batch for which predicate(batch) + // returns true, or null if not found. + template <typename Predicate> + PendingBatch* PendingBatchFind(const char* log_message, Predicate predicate); + + // Caches data for send ops so that it can be retried later, if not + // already cached. + void MaybeCacheSendOpsForBatch(PendingBatch* pending); + void FreeCachedSendInitialMetadata(); + // Frees cached send_message at index idx. + void FreeCachedSendMessage(size_t idx); + void FreeCachedSendTrailingMetadata(); + void FreeAllCachedSendOpData(); + + // Commits the call so that no further retry attempts will be performed. + void RetryCommit(CallAttempt* call_attempt); + + // Starts a retry after appropriate back-off. + void DoRetry(grpc_millis server_pushback_ms); + static void OnRetryTimer(void* arg, grpc_error_handle error); + + RefCountedPtr<ClientChannel::LoadBalancedCall> CreateLoadBalancedCall(); + + void CreateCallAttempt(); + + // Adds a closure to closures that will execute batch in the call combiner. + void AddClosureForBatch(grpc_transport_stream_op_batch* batch, + CallCombinerClosureList* closures); + + RetryFilter* chand_; + grpc_polling_entity* pollent_; + RefCountedPtr<ServerRetryThrottleData> retry_throttle_data_; + const RetryMethodConfig* retry_policy_ = nullptr; + BackOff retry_backoff_; + + grpc_slice path_; // Request path. + gpr_cycle_counter call_start_time_; + grpc_millis deadline_; + Arena* arena_; + grpc_call_stack* owning_call_; + CallCombiner* call_combiner_; + grpc_call_context_element* call_context_; + + RefCountedPtr<CallStackDestructionBarrier> call_stack_destruction_barrier_; + + // TODO(roth): As part of implementing hedging, we will need to maintain a + // list of all pending attempts, so that we can cancel them all if the call + // gets cancelled. + RefCountedPtr<CallAttempt> call_attempt_; + + // LB call used when the call is commited before any CallAttempt is + // created. + // TODO(roth): Change CallAttempt logic such that once we've committed + // and all cached send ops have been replayed, we move the LB call + // from the CallAttempt here, thus creating a fast path for the + // remainder of the streaming call. + RefCountedPtr<ClientChannel::LoadBalancedCall> committed_call_; + + // When are are not yet fully committed to a particular call (i.e., + // either we might still retry or we have committed to the call but + // there are still some cached ops to be replayed on the call), + // batches received from above will be added to this list, and they + // will not be removed until we have invoked their completion callbacks. + size_t bytes_buffered_for_retry_ = 0; + PendingBatch pending_batches_[MAX_PENDING_BATCHES]; + bool pending_send_initial_metadata_ : 1; + bool pending_send_message_ : 1; + bool pending_send_trailing_metadata_ : 1; + + // Retry state. + bool retry_committed_ : 1; + bool last_attempt_got_server_pushback_ : 1; + int num_attempts_completed_ = 0; + Mutex timer_mu_; + Canceller* canceller_ ABSL_GUARDED_BY(timer_mu_); + grpc_timer retry_timer_ ABSL_GUARDED_BY(timer_mu_); + grpc_closure retry_closure_; + + // The number of batches containing send ops that are currently in-flight + // on any call attempt. + // We hold a ref to the call stack while this is non-zero, since replay + // batches may not complete until after all callbacks have been returned + // to the surface, and we need to make sure that the call is not destroyed + // until all of these batches have completed. + // Note that we actually only need to track replay batches, but it's + // easier to track all batches with send ops. + int num_in_flight_call_attempt_send_batches_ = 0; + + // Cached data for retrying send ops. + // send_initial_metadata + bool seen_send_initial_metadata_ = false; + grpc_linked_mdelem* send_initial_metadata_storage_ = nullptr; + grpc_metadata_batch send_initial_metadata_; + uint32_t send_initial_metadata_flags_; + // TODO(roth): As part of implementing hedging, we'll probably need to + // have the LB call set a value in CallAttempt and then propagate it + // from CallAttempt to the parent call when we commit. Otherwise, we + // may leave this with a value for a peer other than the one we + // actually commit to. + gpr_atm* peer_string_; + // send_message + // When we get a send_message op, we replace the original byte stream + // with a CachingByteStream that caches the slices to a local buffer for + // use in retries. + // Note: We inline the cache for the first 3 send_message ops and use + // dynamic allocation after that. This number was essentially picked + // at random; it could be changed in the future to tune performance. + absl::InlinedVector<ByteStreamCache*, 3> send_messages_; + // send_trailing_metadata + bool seen_send_trailing_metadata_ = false; + grpc_linked_mdelem* send_trailing_metadata_storage_ = nullptr; + grpc_metadata_batch send_trailing_metadata_; +}; + +// +// RetryFilter::CallData::CallStackDestructionBarrier +// + +// A class to track the existence of LoadBalancedCall call stacks that +// we've created. We wait until all such call stacks have been +// destroyed before we return the on_call_stack_destruction closure up +// to the surface. +// +// The parent RetryFilter::CallData object holds a ref to this object. +// When it is destroyed, it will store the on_call_stack_destruction +// closure from the surface in this object and then release its ref. +// We also take a ref to this object for each LB call we create, and +// those refs are not released until the LB call stack is destroyed. +// When this object is destroyed, it will invoke the +// on_call_stack_destruction closure from the surface. +class RetryFilter::CallData::CallStackDestructionBarrier + : public RefCounted<CallStackDestructionBarrier, PolymorphicRefCount, + kUnrefCallDtor> { + public: + CallStackDestructionBarrier() {} + + ~CallStackDestructionBarrier() override { + // TODO(yashkt) : This can potentially be a Closure::Run + ExecCtx::Run(DEBUG_LOCATION, on_call_stack_destruction_, GRPC_ERROR_NONE); + } + + // Set the closure from the surface. This closure will be invoked + // when this object is destroyed. + void set_on_call_stack_destruction(grpc_closure* on_call_stack_destruction) { + on_call_stack_destruction_ = on_call_stack_destruction; + } + + // Invoked to get an on_call_stack_destruction closure for a new LB call. + grpc_closure* MakeLbCallDestructionClosure(CallData* calld) { + Ref().release(); // Ref held by callback. + grpc_closure* on_lb_call_destruction_complete = + calld->arena_->New<grpc_closure>(); + GRPC_CLOSURE_INIT(on_lb_call_destruction_complete, + OnLbCallDestructionComplete, this, nullptr); + return on_lb_call_destruction_complete; + } + + private: + static void OnLbCallDestructionComplete(void* arg, + grpc_error_handle /*error*/) { + auto* self = static_cast<CallStackDestructionBarrier*>(arg); + self->Unref(); + } + + grpc_closure* on_call_stack_destruction_ = nullptr; +}; + +// +// RetryFilter::CallData::Canceller +// + +class RetryFilter::CallData::Canceller { + public: + explicit Canceller(CallData* calld) : calld_(calld) { + GRPC_CALL_STACK_REF(calld_->owning_call_, "RetryCanceller"); + GRPC_CLOSURE_INIT(&closure_, &Cancel, this, nullptr); + calld_->call_combiner_->SetNotifyOnCancel(&closure_); + } + + private: + static void Cancel(void* arg, grpc_error_handle error) { + auto* self = static_cast<Canceller*>(arg); + auto* calld = self->calld_; + { + MutexLock lock(&calld->timer_mu_); + if (GRPC_TRACE_FLAG_ENABLED(grpc_retry_trace)) { + gpr_log(GPR_INFO, + "calld=%p: cancelling retry timer: error=%s self=%p " + "calld->canceller_=%p", + calld, grpc_error_std_string(error).c_str(), self, + calld->canceller_); + } + if (calld->canceller_ == self && error != GRPC_ERROR_NONE) { + calld->canceller_ = nullptr; // Checked by OnRetryTimer(). + grpc_timer_cancel(&calld->retry_timer_); + calld->FreeAllCachedSendOpData(); + GRPC_CALL_COMBINER_STOP(calld->call_combiner_, "Canceller"); + } + } + GRPC_CALL_STACK_UNREF(calld->owning_call_, "RetryCanceller"); + delete self; + } + + CallData* calld_; + grpc_closure closure_; +}; + +// +// RetryFilter::CallData::CallAttempt +// + +RetryFilter::CallData::CallAttempt::CallAttempt(CallData* calld) + : calld_(calld), + batch_payload_(calld->call_context_), + started_send_initial_metadata_(false), + completed_send_initial_metadata_(false), + started_send_trailing_metadata_(false), + completed_send_trailing_metadata_(false), + started_recv_initial_metadata_(false), + completed_recv_initial_metadata_(false), + started_recv_trailing_metadata_(false), + completed_recv_trailing_metadata_(false), + retry_dispatched_(false) { + lb_call_ = calld->CreateLoadBalancedCall(); + if (GRPC_TRACE_FLAG_ENABLED(grpc_retry_trace)) { + gpr_log(GPR_INFO, "chand=%p calld=%p: attempt=%p: create lb_call=%p", + calld->chand_, calld, this, lb_call_.get()); + } +} + +void RetryFilter::CallData::CallAttempt::FreeCachedSendOpDataAfterCommit() { + // TODO(roth): When we implement hedging, this logic will need to get + // a bit more complex, because there may be other (now abandoned) call + // attempts still using this data. We may need to do some sort of + // ref-counting instead. + if (completed_send_initial_metadata_) { + calld_->FreeCachedSendInitialMetadata(); + } + for (size_t i = 0; i < completed_send_message_count_; ++i) { + calld_->FreeCachedSendMessage(i); + } + if (completed_send_trailing_metadata_) { + calld_->FreeCachedSendTrailingMetadata(); + } +} + +bool RetryFilter::CallData::CallAttempt::PendingBatchIsUnstarted( + PendingBatch* pending) { + // Only look at batches containing send ops, since batches containing + // only recv ops are always started immediately. + if (pending->batch == nullptr || pending->batch->on_complete == nullptr) { + return false; + } + if (pending->batch->send_initial_metadata && + !started_send_initial_metadata_) { + return true; + } + if (pending->batch->send_message && + started_send_message_count_ < calld_->send_messages_.size()) { + return true; + } + if (pending->batch->send_trailing_metadata && + !started_send_trailing_metadata_) { + return true; + } + return false; +} + +void RetryFilter::CallData::CallAttempt::StartInternalRecvTrailingMetadata() { + if (GRPC_TRACE_FLAG_ENABLED(grpc_retry_trace)) { + gpr_log(GPR_INFO, + "chand=%p calld=%p: call failed but recv_trailing_metadata not " + "started; starting it internally", + calld_->chand_, calld_); + } + // Create batch_data with 2 refs, since this batch will be unreffed twice: + // once for the recv_trailing_metadata_ready callback when the batch + // completes, and again when we actually get a recv_trailing_metadata + // op from the surface. + BatchData* batch_data = CreateBatch(2, false /* set_on_complete */); + batch_data->AddRetriableRecvTrailingMetadataOp(); + recv_trailing_metadata_internal_batch_ = batch_data; + // Note: This will release the call combiner. + lb_call_->StartTransportStreamOpBatch(batch_data->batch()); +} + +// If there are any cached send ops that need to be replayed on the +// current call attempt, creates and returns a new batch to replay those ops. +// Otherwise, returns nullptr. +RetryFilter::CallData::CallAttempt::BatchData* +RetryFilter::CallData::CallAttempt::MaybeCreateBatchForReplay() { + BatchData* replay_batch_data = nullptr; + // send_initial_metadata. + if (calld_->seen_send_initial_metadata_ && !started_send_initial_metadata_ && + !calld_->pending_send_initial_metadata_) { + if (GRPC_TRACE_FLAG_ENABLED(grpc_retry_trace)) { + gpr_log(GPR_INFO, + "chand=%p calld=%p: replaying previously completed " + "send_initial_metadata op", + calld_->chand_, calld_); + } + replay_batch_data = CreateBatch(1, true /* set_on_complete */); + replay_batch_data->AddRetriableSendInitialMetadataOp(); + } + // send_message. + // Note that we can only have one send_message op in flight at a time. + if (started_send_message_count_ < calld_->send_messages_.size() && + started_send_message_count_ == completed_send_message_count_ && + !calld_->pending_send_message_) { + if (GRPC_TRACE_FLAG_ENABLED(grpc_retry_trace)) { + gpr_log(GPR_INFO, + "chand=%p calld=%p: replaying previously completed " + "send_message op", + calld_->chand_, calld_); + } + if (replay_batch_data == nullptr) { + replay_batch_data = CreateBatch(1, true /* set_on_complete */); + } + replay_batch_data->AddRetriableSendMessageOp(); + } + // send_trailing_metadata. + // Note that we only add this op if we have no more send_message ops + // to start, since we can't send down any more send_message ops after + // send_trailing_metadata. + if (calld_->seen_send_trailing_metadata_ && + started_send_message_count_ == calld_->send_messages_.size() && + !started_send_trailing_metadata_ && + !calld_->pending_send_trailing_metadata_) { + if (GRPC_TRACE_FLAG_ENABLED(grpc_retry_trace)) { + gpr_log(GPR_INFO, + "chand=%p calld=%p: replaying previously completed " + "send_trailing_metadata op", + calld_->chand_, calld_); + } + if (replay_batch_data == nullptr) { + replay_batch_data = CreateBatch(1, true /* set_on_complete */); + } + replay_batch_data->AddRetriableSendTrailingMetadataOp(); + } + return replay_batch_data; +} + +void RetryFilter::CallData::CallAttempt::AddBatchesForPendingBatches( + CallCombinerClosureList* closures) { + for (size_t i = 0; i < GPR_ARRAY_SIZE(calld_->pending_batches_); ++i) { + PendingBatch* pending = &calld_->pending_batches_[i]; + grpc_transport_stream_op_batch* batch = pending->batch; + if (batch == nullptr) continue; + // Skip any batch that either (a) has already been started on this + // call attempt or (b) we can't start yet because we're still + // replaying send ops that need to be completed first. + // TODO(roth): Note that if any one op in the batch can't be sent + // yet due to ops that we're replaying, we don't start any of the ops + // in the batch. This is probably okay, but it could conceivably + // lead to increased latency in some cases -- e.g., we could delay + // starting a recv op due to it being in the same batch with a send + // op. If/when we revamp the callback protocol in + // transport_stream_op_batch, we may be able to fix this. + if (batch->send_initial_metadata && started_send_initial_metadata_) { + continue; + } + if (batch->send_message && + completed_send_message_count_ < started_send_message_count_) { + continue; + } + // Note that we only start send_trailing_metadata if we have no more + // send_message ops to start, since we can't send down any more + // send_message ops after send_trailing_metadata. + if (batch->send_trailing_metadata && + (started_send_message_count_ + batch->send_message < + calld_->send_messages_.size() || + started_send_trailing_metadata_)) { + continue; + } + if (batch->recv_initial_metadata && started_recv_initial_metadata_) { + continue; + } + if (batch->recv_message && + completed_recv_message_count_ < started_recv_message_count_) { + continue; + } + if (batch->recv_trailing_metadata && started_recv_trailing_metadata_) { + // If we previously completed a recv_trailing_metadata op + // initiated by StartInternalRecvTrailingMetadata(), use the + // result of that instead of trying to re-start this op. + if (GPR_UNLIKELY(recv_trailing_metadata_internal_batch_ != nullptr)) { + // If the batch completed, then trigger the completion callback + // directly, so that we return the previously returned results to + // the application. Otherwise, just unref the internally started + // batch, since we'll propagate the completion when it completes. + if (completed_recv_trailing_metadata_) { + // Batches containing recv_trailing_metadata always succeed. + closures->Add( + &recv_trailing_metadata_ready_, GRPC_ERROR_NONE, + "re-executing recv_trailing_metadata_ready to propagate " + "internally triggered result"); + } else { + recv_trailing_metadata_internal_batch_->Unref(); + } + recv_trailing_metadata_internal_batch_ = nullptr; + } + continue; + } + // If we're already committed, just send the batch as-is. + if (calld_->retry_committed_) { + calld_->AddClosureForBatch(batch, closures); + calld_->PendingBatchClear(pending); + continue; + } + // Create batch with the right number of callbacks. + const bool has_send_ops = batch->send_initial_metadata || + batch->send_message || + batch->send_trailing_metadata; + const int num_callbacks = has_send_ops + batch->recv_initial_metadata + + batch->recv_message + + batch->recv_trailing_metadata; + CallAttempt::BatchData* batch_data = + CreateBatch(num_callbacks, has_send_ops /* set_on_complete */); + // Cache send ops if needed. + calld_->MaybeCacheSendOpsForBatch(pending); + // send_initial_metadata. + if (batch->send_initial_metadata) { + batch_data->AddRetriableSendInitialMetadataOp(); + } + // send_message. + if (batch->send_message) { + batch_data->AddRetriableSendMessageOp(); + } + // send_trailing_metadata. + if (batch->send_trailing_metadata) { + batch_data->AddRetriableSendTrailingMetadataOp(); + } + // recv_initial_metadata. + if (batch->recv_initial_metadata) { + // recv_flags is only used on the server side. + GPR_ASSERT(batch->payload->recv_initial_metadata.recv_flags == nullptr); + batch_data->AddRetriableRecvInitialMetadataOp(); + } + // recv_message. + if (batch->recv_message) { + batch_data->AddRetriableRecvMessageOp(); + } + // recv_trailing_metadata. + if (batch->recv_trailing_metadata) { + batch_data->AddRetriableRecvTrailingMetadataOp(); + } + calld_->AddClosureForBatch(batch_data->batch(), closures); + // Track number of in-flight send batches. + // If this is the first one, take a ref to the call stack. + if (batch->send_initial_metadata || batch->send_message || + batch->send_trailing_metadata) { + if (calld_->num_in_flight_call_attempt_send_batches_ == 0) { + GRPC_CALL_STACK_REF(calld_->owning_call_, "retriable_send_batches"); + } + ++calld_->num_in_flight_call_attempt_send_batches_; + } + } +} + +void RetryFilter::CallData::CallAttempt::AddRetriableBatches( + CallCombinerClosureList* closures) { + // Replay previously-returned send_* ops if needed. + BatchData* replay_batch_data = MaybeCreateBatchForReplay(); + if (replay_batch_data != nullptr) { + calld_->AddClosureForBatch(replay_batch_data->batch(), closures); + // Track number of pending send batches. + // If this is the first one, take a ref to the call stack. + if (calld_->num_in_flight_call_attempt_send_batches_ == 0) { + GRPC_CALL_STACK_REF(calld_->owning_call_, "retriable_send_batches"); + } + ++calld_->num_in_flight_call_attempt_send_batches_; + } + // Now add pending batches. + AddBatchesForPendingBatches(closures); +} + +void RetryFilter::CallData::CallAttempt::StartRetriableBatches() { + if (GRPC_TRACE_FLAG_ENABLED(grpc_retry_trace)) { + gpr_log(GPR_INFO, "chand=%p calld=%p: constructing retriable batches", + calld_->chand_, calld_); + } + // Construct list of closures to execute, one for each pending batch. + CallCombinerClosureList closures; + AddRetriableBatches(&closures); + // Note: This will yield the call combiner. + // Start batches on LB call. + if (GRPC_TRACE_FLAG_ENABLED(grpc_retry_trace)) { + gpr_log(GPR_INFO, + "chand=%p calld=%p: starting %" PRIuPTR + " retriable batches on lb_call=%p", + calld_->chand_, calld_, closures.size(), lb_call()); + } + closures.RunClosures(calld_->call_combiner_); +} + +// +// RetryFilter::CallData::CallAttempt::BatchData +// + +RetryFilter::CallData::CallAttempt::BatchData::BatchData( + RefCountedPtr<CallAttempt> attempt, int refcount, bool set_on_complete) + : RefCounted(nullptr, refcount), call_attempt_(std::move(attempt)) { + // TODO(roth): Consider holding this ref on the call stack in + // CallAttempt instead of here in BatchData. This would eliminate the + // need for CallData::num_in_flight_call_attempt_send_batches_. + // But it would require having a way to unref CallAttempt when it is + // no longer needed (i.e., when the call is committed and all cached + // send ops have been replayed and the LB call is moved into + // CallData::committed_call_). + GRPC_CALL_STACK_REF(call_attempt_->calld_->owning_call_, "CallAttempt"); + batch_.payload = &call_attempt_->batch_payload_; + if (set_on_complete) { + GRPC_CLOSURE_INIT(&on_complete_, OnComplete, this, + grpc_schedule_on_exec_ctx); + batch_.on_complete = &on_complete_; + } +} + +RetryFilter::CallData::CallAttempt::BatchData::~BatchData() { + if (batch_.send_initial_metadata) { + grpc_metadata_batch_destroy(&call_attempt_->send_initial_metadata_); + } + if (batch_.send_trailing_metadata) { + grpc_metadata_batch_destroy(&call_attempt_->send_trailing_metadata_); + } + if (batch_.recv_initial_metadata) { + grpc_metadata_batch_destroy(&call_attempt_->recv_initial_metadata_); + } + if (batch_.recv_trailing_metadata) { + grpc_metadata_batch_destroy(&call_attempt_->recv_trailing_metadata_); + } + GRPC_CALL_STACK_UNREF(call_attempt_->calld_->owning_call_, "CallAttempt"); +} + +void RetryFilter::CallData::CallAttempt::BatchData:: + FreeCachedSendOpDataForCompletedBatch() { + auto* calld = call_attempt_->calld_; + // TODO(roth): When we implement hedging, this logic will need to get + // a bit more complex, because there may be other (now abandoned) call + // attempts still using this data. We may need to do some sort of + // ref-counting instead. + if (batch_.send_initial_metadata) { + calld->FreeCachedSendInitialMetadata(); + } + if (batch_.send_message) { + calld->FreeCachedSendMessage(call_attempt_->completed_send_message_count_ - + 1); + } + if (batch_.send_trailing_metadata) { + calld->FreeCachedSendTrailingMetadata(); + } +} + +bool RetryFilter::CallData::CallAttempt::BatchData::MaybeRetry( + grpc_status_code status, grpc_mdelem* server_pushback_md, bool is_lb_drop) { + auto* calld = call_attempt_->calld_; + // LB drops always inhibit retries. + if (is_lb_drop) return false; + // Get retry policy. + if (calld->retry_policy_ == nullptr) return false; + // If we've already dispatched a retry from this call, return true. + // This catches the case where the batch has multiple callbacks + // (i.e., it includes either recv_message or recv_initial_metadata). + if (call_attempt_->retry_dispatched_) { + if (GRPC_TRACE_FLAG_ENABLED(grpc_retry_trace)) { + gpr_log(GPR_INFO, "chand=%p calld=%p: retry already dispatched", + calld->chand_, calld); + } + return true; + } + // Check status. + if (GPR_LIKELY(status == GRPC_STATUS_OK)) { + if (calld->retry_throttle_data_ != nullptr) { + calld->retry_throttle_data_->RecordSuccess(); + } + if (GRPC_TRACE_FLAG_ENABLED(grpc_retry_trace)) { + gpr_log(GPR_INFO, "chand=%p calld=%p: call succeeded", calld->chand_, + calld); + } + return false; + } + // Status is not OK. Check whether the status is retryable. + if (!calld->retry_policy_->retryable_status_codes().Contains(status)) { + if (GRPC_TRACE_FLAG_ENABLED(grpc_retry_trace)) { + gpr_log(GPR_INFO, + "chand=%p calld=%p: status %s not configured as retryable", + calld->chand_, calld, grpc_status_code_to_string(status)); + } + return false; + } + // Record the failure and check whether retries are throttled. + // Note that it's important for this check to come after the status + // code check above, since we should only record failures whose statuses + // match the configured retryable status codes, so that we don't count + // things like failures due to malformed requests (INVALID_ARGUMENT). + // Conversely, it's important for this to come before the remaining + // checks, so that we don't fail to record failures due to other factors. + if (calld->retry_throttle_data_ != nullptr && + !calld->retry_throttle_data_->RecordFailure()) { + if (GRPC_TRACE_FLAG_ENABLED(grpc_retry_trace)) { + gpr_log(GPR_INFO, "chand=%p calld=%p: retries throttled", calld->chand_, + calld); + } + return false; + } + // Check whether the call is committed. + if (calld->retry_committed_) { + if (GRPC_TRACE_FLAG_ENABLED(grpc_retry_trace)) { + gpr_log(GPR_INFO, "chand=%p calld=%p: retries already committed", + calld->chand_, calld); + } + return false; + } + // Check whether we have retries remaining. + ++calld->num_attempts_completed_; + if (calld->num_attempts_completed_ >= calld->retry_policy_->max_attempts()) { + if (GRPC_TRACE_FLAG_ENABLED(grpc_retry_trace)) { + gpr_log(GPR_INFO, "chand=%p calld=%p: exceeded %d retry attempts", + calld->chand_, calld, calld->retry_policy_->max_attempts()); + } + return false; + } + // Check server push-back. + grpc_millis server_pushback_ms = -1; + if (server_pushback_md != nullptr) { + // If the value is "-1" or any other unparseable string, we do not retry. + uint32_t ms; + if (!grpc_parse_slice_to_uint32(GRPC_MDVALUE(*server_pushback_md), &ms)) { + if (GRPC_TRACE_FLAG_ENABLED(grpc_retry_trace)) { + gpr_log(GPR_INFO, + "chand=%p calld=%p: not retrying due to server push-back", + calld->chand_, calld); + } + return false; + } else { + if (GRPC_TRACE_FLAG_ENABLED(grpc_retry_trace)) { + gpr_log(GPR_INFO, "chand=%p calld=%p: server push-back: retry in %u ms", + calld->chand_, calld, ms); + } + server_pushback_ms = static_cast<grpc_millis>(ms); + } + } + // Do retry. + call_attempt_->retry_dispatched_ = true; + calld->DoRetry(server_pushback_ms); + return true; +} + +// +// recv_initial_metadata callback handling +// + +void RetryFilter::CallData::CallAttempt::BatchData:: + InvokeRecvInitialMetadataCallback(void* arg, grpc_error_handle error) { + auto* batch_data = static_cast<CallAttempt::BatchData*>(arg); + auto* call_attempt = batch_data->call_attempt_.get(); + // Find pending batch. + PendingBatch* pending = call_attempt->calld_->PendingBatchFind( + "invoking recv_initial_metadata_ready for", + [](grpc_transport_stream_op_batch* batch) { + return batch->recv_initial_metadata && + batch->payload->recv_initial_metadata + .recv_initial_metadata_ready != nullptr; + }); + GPR_ASSERT(pending != nullptr); + // Return metadata. + grpc_metadata_batch_move( + &call_attempt->recv_initial_metadata_, + pending->batch->payload->recv_initial_metadata.recv_initial_metadata); + // Update bookkeeping. + // Note: Need to do this before invoking the callback, since invoking + // the callback will result in yielding the call combiner. + grpc_closure* recv_initial_metadata_ready = + pending->batch->payload->recv_initial_metadata + .recv_initial_metadata_ready; + pending->batch->payload->recv_initial_metadata.recv_initial_metadata_ready = + nullptr; + call_attempt->calld_->MaybeClearPendingBatch(pending); + batch_data->Unref(); + // Invoke callback. + Closure::Run(DEBUG_LOCATION, recv_initial_metadata_ready, + GRPC_ERROR_REF(error)); +} + +void RetryFilter::CallData::CallAttempt::BatchData::RecvInitialMetadataReady( + void* arg, grpc_error_handle error) { + CallAttempt::BatchData* batch_data = + static_cast<CallAttempt::BatchData*>(arg); + CallAttempt* call_attempt = batch_data->call_attempt_.get(); + CallData* calld = call_attempt->calld_; + if (GRPC_TRACE_FLAG_ENABLED(grpc_retry_trace)) { + gpr_log(GPR_INFO, + "chand=%p calld=%p: got recv_initial_metadata_ready, error=%s", + calld->chand_, calld, grpc_error_std_string(error).c_str()); + } + call_attempt->completed_recv_initial_metadata_ = true; + // If a retry was already dispatched, then we're not going to use the + // result of this recv_initial_metadata op, so do nothing. + if (call_attempt->retry_dispatched_) { + GRPC_CALL_COMBINER_STOP( + calld->call_combiner_, + "recv_initial_metadata_ready after retry dispatched"); + return; + } + if (!calld->retry_committed_) { + // If we got an error or a Trailers-Only response and have not yet gotten + // the recv_trailing_metadata_ready callback, then defer propagating this + // callback back to the surface. We can evaluate whether to retry when + // recv_trailing_metadata comes back. + if (GPR_UNLIKELY((call_attempt->trailing_metadata_available_ || + error != GRPC_ERROR_NONE) && + !call_attempt->completed_recv_trailing_metadata_)) { + if (GRPC_TRACE_FLAG_ENABLED(grpc_retry_trace)) { + gpr_log(GPR_INFO, + "chand=%p calld=%p: deferring recv_initial_metadata_ready " + "(Trailers-Only)", + calld->chand_, calld); + } + call_attempt->recv_initial_metadata_ready_deferred_batch_ = batch_data; + call_attempt->recv_initial_metadata_error_ = GRPC_ERROR_REF(error); + if (!call_attempt->started_recv_trailing_metadata_) { + // recv_trailing_metadata not yet started by application; start it + // ourselves to get status. + call_attempt->StartInternalRecvTrailingMetadata(); + } else { + GRPC_CALL_COMBINER_STOP( + calld->call_combiner_, + "recv_initial_metadata_ready trailers-only or error"); + } + return; + } + // Received valid initial metadata, so commit the call. + calld->RetryCommit(call_attempt); + } + // Invoke the callback to return the result to the surface. + // Manually invoking a callback function; it does not take ownership of error. + InvokeRecvInitialMetadataCallback(batch_data, error); +} + +// +// recv_message callback handling +// + +void RetryFilter::CallData::CallAttempt::BatchData::InvokeRecvMessageCallback( + void* arg, grpc_error_handle error) { + CallAttempt::BatchData* batch_data = + static_cast<CallAttempt::BatchData*>(arg); + CallAttempt* call_attempt = batch_data->call_attempt_.get(); + CallData* calld = call_attempt->calld_; + // Find pending op. + PendingBatch* pending = calld->PendingBatchFind( + "invoking recv_message_ready for", + [](grpc_transport_stream_op_batch* batch) { + return batch->recv_message && + batch->payload->recv_message.recv_message_ready != nullptr; + }); + GPR_ASSERT(pending != nullptr); + // Return payload. + *pending->batch->payload->recv_message.recv_message = + std::move(call_attempt->recv_message_); + // Update bookkeeping. + // Note: Need to do this before invoking the callback, since invoking + // the callback will result in yielding the call combiner. + grpc_closure* recv_message_ready = + pending->batch->payload->recv_message.recv_message_ready; + pending->batch->payload->recv_message.recv_message_ready = nullptr; + calld->MaybeClearPendingBatch(pending); + batch_data->Unref(); + // Invoke callback. + Closure::Run(DEBUG_LOCATION, recv_message_ready, GRPC_ERROR_REF(error)); +} + +void RetryFilter::CallData::CallAttempt::BatchData::RecvMessageReady( + void* arg, grpc_error_handle error) { + CallAttempt::BatchData* batch_data = + static_cast<CallAttempt::BatchData*>(arg); + CallAttempt* call_attempt = batch_data->call_attempt_.get(); + CallData* calld = call_attempt->calld_; + if (GRPC_TRACE_FLAG_ENABLED(grpc_retry_trace)) { + gpr_log(GPR_INFO, "chand=%p calld=%p: got recv_message_ready, error=%s", + calld->chand_, calld, grpc_error_std_string(error).c_str()); + } + ++call_attempt->completed_recv_message_count_; + // If a retry was already dispatched, then we're not going to use the + // result of this recv_message op, so do nothing. + if (call_attempt->retry_dispatched_) { + GRPC_CALL_COMBINER_STOP(calld->call_combiner_, + "recv_message_ready after retry dispatched"); + return; + } + if (!calld->retry_committed_) { + // If we got an error or the payload was nullptr and we have not yet gotten + // the recv_trailing_metadata_ready callback, then defer propagating this + // callback back to the surface. We can evaluate whether to retry when + // recv_trailing_metadata comes back. + if (GPR_UNLIKELY((call_attempt->recv_message_ == nullptr || + error != GRPC_ERROR_NONE) && + !call_attempt->completed_recv_trailing_metadata_)) { + if (GRPC_TRACE_FLAG_ENABLED(grpc_retry_trace)) { + gpr_log(GPR_INFO, + "chand=%p calld=%p: deferring recv_message_ready (nullptr " + "message and recv_trailing_metadata pending)", + calld->chand_, calld); + } + call_attempt->recv_message_ready_deferred_batch_ = batch_data; + call_attempt->recv_message_error_ = GRPC_ERROR_REF(error); + if (!call_attempt->started_recv_trailing_metadata_) { + // recv_trailing_metadata not yet started by application; start it + // ourselves to get status. + call_attempt->StartInternalRecvTrailingMetadata(); + } else { + GRPC_CALL_COMBINER_STOP(calld->call_combiner_, + "recv_message_ready null"); + } + return; + } + // Received a valid message, so commit the call. + calld->RetryCommit(call_attempt); + } + // Invoke the callback to return the result to the surface. + // Manually invoking a callback function; it does not take ownership of error. + InvokeRecvMessageCallback(batch_data, error); +} + +// +// recv_trailing_metadata handling +// + +namespace { + +// Sets *status, *server_pushback_md, and *is_lb_drop based on md_batch +// and error. +void GetCallStatus(grpc_millis deadline, grpc_metadata_batch* md_batch, + grpc_error_handle error, grpc_status_code* status, + grpc_mdelem** server_pushback_md, bool* is_lb_drop) { + if (error != GRPC_ERROR_NONE) { + grpc_error_get_status(error, deadline, status, nullptr, nullptr, nullptr); + intptr_t value = 0; + if (grpc_error_get_int(error, GRPC_ERROR_INT_LB_POLICY_DROP, &value) && + value != 0) { + *is_lb_drop = true; + } + } else { + GPR_ASSERT(md_batch->idx.named.grpc_status != nullptr); + *status = + grpc_get_status_code_from_metadata(md_batch->idx.named.grpc_status->md); + if (md_batch->idx.named.grpc_retry_pushback_ms != nullptr) { + *server_pushback_md = &md_batch->idx.named.grpc_retry_pushback_ms->md; + } + } + GRPC_ERROR_UNREF(error); +} + +} // namespace + +void RetryFilter::CallData::CallAttempt::BatchData:: + AddClosureForRecvTrailingMetadataReady(grpc_error_handle error, + CallCombinerClosureList* closures) { + auto* calld = call_attempt_->calld_; + // Find pending batch. + PendingBatch* pending = calld->PendingBatchFind( + "invoking recv_trailing_metadata for", + [](grpc_transport_stream_op_batch* batch) { + return batch->recv_trailing_metadata && + batch->payload->recv_trailing_metadata + .recv_trailing_metadata_ready != nullptr; + }); + // If we generated the recv_trailing_metadata op internally via + // StartInternalRecvTrailingMetadata(), then there will be no pending batch. + if (pending == nullptr) { + GRPC_ERROR_UNREF(error); + return; + } + // Return metadata. + grpc_metadata_batch_move( + &call_attempt_->recv_trailing_metadata_, + pending->batch->payload->recv_trailing_metadata.recv_trailing_metadata); + // Add closure. + closures->Add(pending->batch->payload->recv_trailing_metadata + .recv_trailing_metadata_ready, + error, "recv_trailing_metadata_ready for pending batch"); + // Update bookkeeping. + pending->batch->payload->recv_trailing_metadata.recv_trailing_metadata_ready = + nullptr; + calld->MaybeClearPendingBatch(pending); +} + +void RetryFilter::CallData::CallAttempt::BatchData:: + AddClosuresForDeferredRecvCallbacks(CallCombinerClosureList* closures) { + if (batch_.recv_trailing_metadata) { + // Add closure for deferred recv_initial_metadata_ready. + if (GPR_UNLIKELY( + call_attempt_->recv_initial_metadata_ready_deferred_batch_ != + nullptr)) { + GRPC_CLOSURE_INIT( + &call_attempt_->recv_initial_metadata_ready_, + InvokeRecvInitialMetadataCallback, + call_attempt_->recv_initial_metadata_ready_deferred_batch_, + grpc_schedule_on_exec_ctx); + closures->Add(&call_attempt_->recv_initial_metadata_ready_, + call_attempt_->recv_initial_metadata_error_, + "resuming recv_initial_metadata_ready"); + call_attempt_->recv_initial_metadata_ready_deferred_batch_ = nullptr; + } + // Add closure for deferred recv_message_ready. + if (GPR_UNLIKELY(call_attempt_->recv_message_ready_deferred_batch_ != + nullptr)) { + GRPC_CLOSURE_INIT(&call_attempt_->recv_message_ready_, + InvokeRecvMessageCallback, + call_attempt_->recv_message_ready_deferred_batch_, + grpc_schedule_on_exec_ctx); + closures->Add(&call_attempt_->recv_message_ready_, + call_attempt_->recv_message_error_, + "resuming recv_message_ready"); + call_attempt_->recv_message_ready_deferred_batch_ = nullptr; + } + } +} + +void RetryFilter::CallData::CallAttempt::BatchData:: + AddClosuresToFailUnstartedPendingBatches( + grpc_error_handle error, CallCombinerClosureList* closures) { + auto* calld = call_attempt_->calld_; + for (size_t i = 0; i < GPR_ARRAY_SIZE(calld->pending_batches_); ++i) { + PendingBatch* pending = &calld->pending_batches_[i]; + if (call_attempt_->PendingBatchIsUnstarted(pending)) { + if (GRPC_TRACE_FLAG_ENABLED(grpc_retry_trace)) { + gpr_log(GPR_INFO, + "chand=%p calld=%p: failing unstarted pending batch at " + "index %" PRIuPTR, + calld->chand_, calld, i); + } + closures->Add(pending->batch->on_complete, GRPC_ERROR_REF(error), + "failing on_complete for pending batch"); + pending->batch->on_complete = nullptr; + calld->MaybeClearPendingBatch(pending); + } + } + GRPC_ERROR_UNREF(error); +} + +void RetryFilter::CallData::CallAttempt::BatchData::RunClosuresForCompletedCall( + grpc_error_handle error) { + // Construct list of closures to execute. + CallCombinerClosureList closures; + // First, add closure for recv_trailing_metadata_ready. + AddClosureForRecvTrailingMetadataReady(GRPC_ERROR_REF(error), &closures); + // If there are deferred recv_initial_metadata_ready or recv_message_ready + // callbacks, add them to closures. + AddClosuresForDeferredRecvCallbacks(&closures); + // Add closures to fail any pending batches that have not yet been started. + AddClosuresToFailUnstartedPendingBatches(GRPC_ERROR_REF(error), &closures); + // Schedule all of the closures identified above. + // Note: This will release the call combiner. + closures.RunClosures(call_attempt_->calld_->call_combiner_); + // Don't need batch_data anymore. + Unref(); + GRPC_ERROR_UNREF(error); +} + +void RetryFilter::CallData::CallAttempt::BatchData::RecvTrailingMetadataReady( + void* arg, grpc_error_handle error) { + CallAttempt::BatchData* batch_data = + static_cast<CallAttempt::BatchData*>(arg); + CallAttempt* call_attempt = batch_data->call_attempt_.get(); + CallData* calld = call_attempt->calld_; + if (GRPC_TRACE_FLAG_ENABLED(grpc_retry_trace)) { + gpr_log(GPR_INFO, + "chand=%p calld=%p: got recv_trailing_metadata_ready, error=%s", + calld->chand_, calld, grpc_error_std_string(error).c_str()); + } + call_attempt->completed_recv_trailing_metadata_ = true; + // Get the call's status and check for server pushback metadata. + grpc_status_code status = GRPC_STATUS_OK; + grpc_mdelem* server_pushback_md = nullptr; + grpc_metadata_batch* md_batch = + batch_data->batch_.payload->recv_trailing_metadata.recv_trailing_metadata; + bool is_lb_drop = false; + GetCallStatus(calld->deadline_, md_batch, GRPC_ERROR_REF(error), &status, + &server_pushback_md, &is_lb_drop); + if (GRPC_TRACE_FLAG_ENABLED(grpc_retry_trace)) { + gpr_log( + GPR_INFO, "chand=%p calld=%p: call finished, status=%s is_lb_drop=%d", + calld->chand_, calld, grpc_status_code_to_string(status), is_lb_drop); + } + // Check if we should retry. + if (batch_data->MaybeRetry(status, server_pushback_md, is_lb_drop)) { + // Unref batch_data for deferred recv_initial_metadata_ready or + // recv_message_ready callbacks, if any. + if (call_attempt->recv_initial_metadata_ready_deferred_batch_ != nullptr) { + GRPC_ERROR_UNREF(call_attempt->recv_initial_metadata_error_); + batch_data->Unref(); + } + if (call_attempt->recv_message_ready_deferred_batch_ != nullptr) { + GRPC_ERROR_UNREF(call_attempt->recv_message_error_); + batch_data->Unref(); + } + batch_data->Unref(); + return; + } + // Not retrying, so commit the call. + calld->RetryCommit(call_attempt); + // Run any necessary closures. + batch_data->RunClosuresForCompletedCall(GRPC_ERROR_REF(error)); +} + +// +// on_complete callback handling +// + +void RetryFilter::CallData::CallAttempt::BatchData:: + AddClosuresForCompletedPendingBatch(grpc_error_handle error, + CallCombinerClosureList* closures) { + auto* calld = call_attempt_->calld_; + PendingBatch* pending = calld->PendingBatchFind( + "completed", [this](grpc_transport_stream_op_batch* batch) { + // Match the pending batch with the same set of send ops as the + // batch we've just completed. + return batch->on_complete != nullptr && + batch_.send_initial_metadata == batch->send_initial_metadata && + batch_.send_message == batch->send_message && + batch_.send_trailing_metadata == batch->send_trailing_metadata; + }); + // If batch_data is a replay batch, then there will be no pending + // batch to complete. + if (pending == nullptr) { + GRPC_ERROR_UNREF(error); + return; + } + // Add closure. + closures->Add(pending->batch->on_complete, error, + "on_complete for pending batch"); + pending->batch->on_complete = nullptr; + calld->MaybeClearPendingBatch(pending); +} + +void RetryFilter::CallData::CallAttempt::BatchData:: + AddClosuresForReplayOrPendingSendOps(CallCombinerClosureList* closures) { + auto* calld = call_attempt_->calld_; + // We don't check send_initial_metadata here, because that op will always + // be started as soon as it is received from the surface, so it will + // never need to be started at this point. + bool have_pending_send_message_ops = + call_attempt_->started_send_message_count_ < calld->send_messages_.size(); + bool have_pending_send_trailing_metadata_op = + calld->seen_send_trailing_metadata_ && + !call_attempt_->started_send_trailing_metadata_; + if (!have_pending_send_message_ops && + !have_pending_send_trailing_metadata_op) { + for (size_t i = 0; i < GPR_ARRAY_SIZE(calld->pending_batches_); ++i) { + PendingBatch* pending = &calld->pending_batches_[i]; + grpc_transport_stream_op_batch* batch = pending->batch; + if (batch == nullptr || pending->send_ops_cached) continue; + if (batch->send_message) have_pending_send_message_ops = true; + if (batch->send_trailing_metadata) { + have_pending_send_trailing_metadata_op = true; + } + } + } + if (have_pending_send_message_ops || have_pending_send_trailing_metadata_op) { + if (GRPC_TRACE_FLAG_ENABLED(grpc_retry_trace)) { + gpr_log(GPR_INFO, + "chand=%p calld=%p: starting next batch for pending send op(s)", + calld->chand_, calld); + } + call_attempt_->AddRetriableBatches(closures); + } +} + +void RetryFilter::CallData::CallAttempt::BatchData::OnComplete( + void* arg, grpc_error_handle error) { + CallAttempt::BatchData* batch_data = + static_cast<CallAttempt::BatchData*>(arg); + CallAttempt* call_attempt = batch_data->call_attempt_.get(); + CallData* calld = call_attempt->calld_; + if (GRPC_TRACE_FLAG_ENABLED(grpc_retry_trace)) { + gpr_log(GPR_INFO, "chand=%p calld=%p: got on_complete, error=%s, batch=%s", + calld->chand_, calld, grpc_error_std_string(error).c_str(), + grpc_transport_stream_op_batch_string(&batch_data->batch_).c_str()); + } + // Update bookkeeping in call_attempt. + if (batch_data->batch_.send_initial_metadata) { + call_attempt->completed_send_initial_metadata_ = true; + } + if (batch_data->batch_.send_message) { + ++call_attempt->completed_send_message_count_; + } + if (batch_data->batch_.send_trailing_metadata) { + call_attempt->completed_send_trailing_metadata_ = true; + } + // If the call is committed, free cached data for send ops that we've just + // completed. + if (calld->retry_committed_) { + batch_data->FreeCachedSendOpDataForCompletedBatch(); + } + // Construct list of closures to execute. + CallCombinerClosureList closures; + // If a retry was already dispatched, that means we saw + // recv_trailing_metadata before this, so we do nothing here. + // Otherwise, invoke the callback to return the result to the surface. + if (!call_attempt->retry_dispatched_) { + // Add closure for the completed pending batch, if any. + batch_data->AddClosuresForCompletedPendingBatch(GRPC_ERROR_REF(error), + &closures); + // If needed, add a callback to start any replay or pending send ops on + // the LB call. + if (!call_attempt->completed_recv_trailing_metadata_) { + batch_data->AddClosuresForReplayOrPendingSendOps(&closures); + } + } + // Track number of in-flight send batches and determine if this was the + // last one. + --calld->num_in_flight_call_attempt_send_batches_; + const bool last_send_batch_complete = + calld->num_in_flight_call_attempt_send_batches_ == 0; + // Don't need batch_data anymore. + batch_data->Unref(); + // Schedule all of the closures identified above. + // Note: This yields the call combiner. + closures.RunClosures(calld->call_combiner_); + // If this was the last in-flight send batch, unref the call stack. + if (last_send_batch_complete) { + GRPC_CALL_STACK_UNREF(calld->owning_call_, "retriable_send_batches"); + } +} + +// +// retriable batch construction +// + +void RetryFilter::CallData::CallAttempt::BatchData:: + AddRetriableSendInitialMetadataOp() { + auto* calld = call_attempt_->calld_; + // Maps the number of retries to the corresponding metadata value slice. + const grpc_slice* retry_count_strings[] = {&GRPC_MDSTR_1, &GRPC_MDSTR_2, + &GRPC_MDSTR_3, &GRPC_MDSTR_4}; + // We need to make a copy of the metadata batch for each attempt, since + // the filters in the subchannel stack may modify this batch, and we don't + // want those modifications to be passed forward to subsequent attempts. + // + // If we've already completed one or more attempts, add the + // grpc-retry-attempts header. + call_attempt_->send_initial_metadata_storage_ = + static_cast<grpc_linked_mdelem*>( + calld->arena_->Alloc(sizeof(grpc_linked_mdelem) * + (calld->send_initial_metadata_.list.count + + (calld->num_attempts_completed_ > 0)))); + grpc_metadata_batch_copy(&calld->send_initial_metadata_, + &call_attempt_->send_initial_metadata_, + call_attempt_->send_initial_metadata_storage_); + if (GPR_UNLIKELY(call_attempt_->send_initial_metadata_.idx.named + .grpc_previous_rpc_attempts != nullptr)) { + grpc_metadata_batch_remove(&call_attempt_->send_initial_metadata_, + GRPC_BATCH_GRPC_PREVIOUS_RPC_ATTEMPTS); + } + if (GPR_UNLIKELY(calld->num_attempts_completed_ > 0)) { + grpc_mdelem retry_md = grpc_mdelem_create( + GRPC_MDSTR_GRPC_PREVIOUS_RPC_ATTEMPTS, + *retry_count_strings[calld->num_attempts_completed_ - 1], nullptr); + grpc_error_handle error = grpc_metadata_batch_add_tail( + &call_attempt_->send_initial_metadata_, + &call_attempt_->send_initial_metadata_storage_ + [calld->send_initial_metadata_.list.count], + retry_md, GRPC_BATCH_GRPC_PREVIOUS_RPC_ATTEMPTS); + if (GPR_UNLIKELY(error != GRPC_ERROR_NONE)) { + gpr_log(GPR_ERROR, "error adding retry metadata: %s", + grpc_error_std_string(error).c_str()); + GPR_ASSERT(false); + } + } + call_attempt_->started_send_initial_metadata_ = true; + batch_.send_initial_metadata = true; + batch_.payload->send_initial_metadata.send_initial_metadata = + &call_attempt_->send_initial_metadata_; + batch_.payload->send_initial_metadata.send_initial_metadata_flags = + calld->send_initial_metadata_flags_; + batch_.payload->send_initial_metadata.peer_string = calld->peer_string_; +} + +void RetryFilter::CallData::CallAttempt::BatchData:: + AddRetriableSendMessageOp() { + auto* calld = call_attempt_->calld_; + if (GRPC_TRACE_FLAG_ENABLED(grpc_retry_trace)) { + gpr_log(GPR_INFO, + "chand=%p calld=%p: starting calld->send_messages[%" PRIuPTR "]", + calld->chand_, calld, call_attempt_->started_send_message_count_); + } + ByteStreamCache* cache = + calld->send_messages_[call_attempt_->started_send_message_count_]; + ++call_attempt_->started_send_message_count_; + call_attempt_->send_message_.Init(cache); + batch_.send_message = true; + batch_.payload->send_message.send_message.reset( + call_attempt_->send_message_.get()); +} + +void RetryFilter::CallData::CallAttempt::BatchData:: + AddRetriableSendTrailingMetadataOp() { + auto* calld = call_attempt_->calld_; + // We need to make a copy of the metadata batch for each attempt, since + // the filters in the subchannel stack may modify this batch, and we don't + // want those modifications to be passed forward to subsequent attempts. + call_attempt_->send_trailing_metadata_storage_ = + static_cast<grpc_linked_mdelem*>( + calld->arena_->Alloc(sizeof(grpc_linked_mdelem) * + calld->send_trailing_metadata_.list.count)); + grpc_metadata_batch_copy(&calld->send_trailing_metadata_, + &call_attempt_->send_trailing_metadata_, + call_attempt_->send_trailing_metadata_storage_); + call_attempt_->started_send_trailing_metadata_ = true; + batch_.send_trailing_metadata = true; + batch_.payload->send_trailing_metadata.send_trailing_metadata = + &call_attempt_->send_trailing_metadata_; +} + +void RetryFilter::CallData::CallAttempt::BatchData:: + AddRetriableRecvInitialMetadataOp() { + call_attempt_->started_recv_initial_metadata_ = true; + batch_.recv_initial_metadata = true; + grpc_metadata_batch_init(&call_attempt_->recv_initial_metadata_); + batch_.payload->recv_initial_metadata.recv_initial_metadata = + &call_attempt_->recv_initial_metadata_; + batch_.payload->recv_initial_metadata.trailing_metadata_available = + &call_attempt_->trailing_metadata_available_; + GRPC_CLOSURE_INIT(&call_attempt_->recv_initial_metadata_ready_, + RecvInitialMetadataReady, this, grpc_schedule_on_exec_ctx); + batch_.payload->recv_initial_metadata.recv_initial_metadata_ready = + &call_attempt_->recv_initial_metadata_ready_; +} + +void RetryFilter::CallData::CallAttempt::BatchData:: + AddRetriableRecvMessageOp() { + ++call_attempt_->started_recv_message_count_; + batch_.recv_message = true; + batch_.payload->recv_message.recv_message = &call_attempt_->recv_message_; + GRPC_CLOSURE_INIT(&call_attempt_->recv_message_ready_, RecvMessageReady, this, + grpc_schedule_on_exec_ctx); + batch_.payload->recv_message.recv_message_ready = + &call_attempt_->recv_message_ready_; +} + +void RetryFilter::CallData::CallAttempt::BatchData:: + AddRetriableRecvTrailingMetadataOp() { + call_attempt_->started_recv_trailing_metadata_ = true; + batch_.recv_trailing_metadata = true; + grpc_metadata_batch_init(&call_attempt_->recv_trailing_metadata_); + batch_.payload->recv_trailing_metadata.recv_trailing_metadata = + &call_attempt_->recv_trailing_metadata_; + batch_.payload->recv_trailing_metadata.collect_stats = + &call_attempt_->collect_stats_; + GRPC_CLOSURE_INIT(&call_attempt_->recv_trailing_metadata_ready_, + RecvTrailingMetadataReady, this, grpc_schedule_on_exec_ctx); + batch_.payload->recv_trailing_metadata.recv_trailing_metadata_ready = + &call_attempt_->recv_trailing_metadata_ready_; +} + +// +// CallData vtable functions +// + +grpc_error_handle RetryFilter::CallData::Init( + grpc_call_element* elem, const grpc_call_element_args* args) { + auto* chand = static_cast<RetryFilter*>(elem->channel_data); + new (elem->call_data) CallData(chand, *args); + if (GRPC_TRACE_FLAG_ENABLED(grpc_retry_trace)) { + gpr_log(GPR_INFO, "chand=%p: created call=%p", chand, elem->call_data); + } + return GRPC_ERROR_NONE; +} + +void RetryFilter::CallData::Destroy(grpc_call_element* elem, + const grpc_call_final_info* /*final_info*/, + grpc_closure* then_schedule_closure) { + auto* calld = static_cast<CallData*>(elem->call_data); + // Save our ref to the CallStackDestructionBarrier until after our + // dtor is invoked. + RefCountedPtr<CallStackDestructionBarrier> call_stack_destruction_barrier = + std::move(calld->call_stack_destruction_barrier_); + calld->~CallData(); + // Now set the callback in the CallStackDestructionBarrier object, + // right before we release our ref to it (implicitly upon returning). + // The callback will be invoked when the CallStackDestructionBarrier + // is destroyed. + call_stack_destruction_barrier->set_on_call_stack_destruction( + then_schedule_closure); +} + +void RetryFilter::CallData::StartTransportStreamOpBatch( + grpc_call_element* elem, grpc_transport_stream_op_batch* batch) { + auto* calld = static_cast<CallData*>(elem->call_data); + calld->StartTransportStreamOpBatch(batch); +} + +void RetryFilter::CallData::SetPollent(grpc_call_element* elem, + grpc_polling_entity* pollent) { + auto* calld = static_cast<CallData*>(elem->call_data); + calld->pollent_ = pollent; +} + +// +// CallData implementation +// + +const RetryMethodConfig* GetRetryPolicy( + const grpc_call_context_element* context) { + if (context == nullptr) return nullptr; + auto* svc_cfg_call_data = static_cast<ServiceConfigCallData*>( + context[GRPC_CONTEXT_SERVICE_CONFIG_CALL_DATA].value); + if (svc_cfg_call_data == nullptr) return nullptr; + return static_cast<const RetryMethodConfig*>( + svc_cfg_call_data->GetMethodParsedConfig( + RetryServiceConfigParser::ParserIndex())); +} + +RetryFilter::CallData::CallData(RetryFilter* chand, + const grpc_call_element_args& args) + : chand_(chand), + retry_throttle_data_(chand->retry_throttle_data_), + retry_policy_(GetRetryPolicy(args.context)), + retry_backoff_( + BackOff::Options() + .set_initial_backoff(retry_policy_ == nullptr + ? 0 + : retry_policy_->initial_backoff()) + .set_multiplier(retry_policy_ == nullptr + ? 0 + : retry_policy_->backoff_multiplier()) + .set_jitter(RETRY_BACKOFF_JITTER) + .set_max_backoff( + retry_policy_ == nullptr ? 0 : retry_policy_->max_backoff())), + path_(grpc_slice_ref_internal(args.path)), + call_start_time_(args.start_time), + deadline_(args.deadline), + arena_(args.arena), + owning_call_(args.call_stack), + call_combiner_(args.call_combiner), + call_context_(args.context), + call_stack_destruction_barrier_( + arena_->New<CallStackDestructionBarrier>()), + pending_send_initial_metadata_(false), + pending_send_message_(false), + pending_send_trailing_metadata_(false), + retry_committed_(false), + last_attempt_got_server_pushback_(false) {} + +RetryFilter::CallData::~CallData() { + grpc_slice_unref_internal(path_); + // Make sure there are no remaining pending batches. + for (size_t i = 0; i < GPR_ARRAY_SIZE(pending_batches_); ++i) { + GPR_ASSERT(pending_batches_[i].batch == nullptr); + } +} + +void RetryFilter::CallData::StartTransportStreamOpBatch( + grpc_transport_stream_op_batch* batch) { + // If we have an LB call, delegate to the LB call. + if (committed_call_ != nullptr) { + // Note: This will release the call combiner. + committed_call_->StartTransportStreamOpBatch(batch); + return; + } + // Handle cancellation. + if (GPR_UNLIKELY(batch->cancel_stream)) { + grpc_error_handle cancel_error = batch->payload->cancel_stream.cancel_error; + if (GRPC_TRACE_FLAG_ENABLED(grpc_retry_trace)) { + gpr_log(GPR_INFO, "chand=%p calld=%p: cancelled from surface: %s", chand_, + this, grpc_error_std_string(cancel_error).c_str()); + } + // If we have a current call attempt, commit the call, then send + // the cancellation down to that attempt. When the call fails, it + // will not be retried, because we have committed it here. + if (call_attempt_ != nullptr) { + RetryCommit(call_attempt_.get()); + // Note: This will release the call combiner. + call_attempt_->lb_call()->StartTransportStreamOpBatch(batch); + return; + } + // Fail pending batches. + PendingBatchesFail(GRPC_ERROR_REF(cancel_error)); + // Note: This will release the call combiner. + grpc_transport_stream_op_batch_finish_with_failure( + batch, GRPC_ERROR_REF(cancel_error), call_combiner_); + return; + } + // Add the batch to the pending list. + PendingBatch* pending = PendingBatchesAdd(batch); + if (call_attempt_ == nullptr) { + // If this is the first batch and retries are already committed + // (e.g., if this batch put the call above the buffer size limit), then + // immediately create an LB call and delegate the batch to it. This + // avoids the overhead of unnecessarily allocating a CallAttempt + // object or caching any of the send op data. + if (num_attempts_completed_ == 0 && retry_committed_) { + if (GRPC_TRACE_FLAG_ENABLED(grpc_retry_trace)) { + gpr_log(GPR_INFO, + "chand=%p calld=%p: retry committed before first attempt; " + "creating LB call", + chand_, this); + } + PendingBatchClear(pending); + committed_call_ = CreateLoadBalancedCall(); + committed_call_->StartTransportStreamOpBatch(batch); + return; + } + // We do not yet have a call attempt, so create one. + if (GRPC_TRACE_FLAG_ENABLED(grpc_retry_trace)) { + gpr_log(GPR_INFO, "chand=%p calld=%p: creating call attempt", chand_, + this); + } + CreateCallAttempt(); + return; + } + // Send batches to call attempt. + if (GRPC_TRACE_FLAG_ENABLED(grpc_retry_trace)) { + gpr_log(GPR_INFO, + "chand=%p calld=%p: starting batch on attempt=%p lb_call=%p", + chand_, this, call_attempt_.get(), call_attempt_->lb_call()); + } + call_attempt_->StartRetriableBatches(); +} + +RefCountedPtr<ClientChannel::LoadBalancedCall> +RetryFilter::CallData::CreateLoadBalancedCall() { + grpc_call_element_args args = {owning_call_, nullptr, call_context_, + path_, call_start_time_, deadline_, + arena_, call_combiner_}; + return chand_->client_channel_->CreateLoadBalancedCall( + args, pollent_, + // This callback holds a ref to the CallStackDestructionBarrier + // object until the LB call is destroyed. + call_stack_destruction_barrier_->MakeLbCallDestructionClosure(this)); +} + +void RetryFilter::CallData::CreateCallAttempt() { + call_attempt_.reset(arena_->New<CallAttempt>(this)); + call_attempt_->StartRetriableBatches(); + // TODO(roth): When implementing hedging, change this to start a timer + // for the next hedging attempt. +} + +namespace { + +void StartBatchInCallCombiner(void* arg, grpc_error_handle /*ignored*/) { + grpc_transport_stream_op_batch* batch = + static_cast<grpc_transport_stream_op_batch*>(arg); + auto* lb_call = static_cast<ClientChannel::LoadBalancedCall*>( + batch->handler_private.extra_arg); + // Note: This will release the call combiner. + lb_call->StartTransportStreamOpBatch(batch); +} + +} // namespace + +void RetryFilter::CallData::AddClosureForBatch( + grpc_transport_stream_op_batch* batch, CallCombinerClosureList* closures) { + batch->handler_private.extra_arg = call_attempt_->lb_call(); + GRPC_CLOSURE_INIT(&batch->handler_private.closure, StartBatchInCallCombiner, + batch, grpc_schedule_on_exec_ctx); + if (GRPC_TRACE_FLAG_ENABLED(grpc_retry_trace)) { + gpr_log(GPR_INFO, "chand=%p calld=%p: starting batch on LB call: %s", + chand_, this, grpc_transport_stream_op_batch_string(batch).c_str()); + } + closures->Add(&batch->handler_private.closure, GRPC_ERROR_NONE, + "start_batch_on_lb_call"); +} + +// +// send op data caching +// + +void RetryFilter::CallData::MaybeCacheSendOpsForBatch(PendingBatch* pending) { + if (pending->send_ops_cached) return; + pending->send_ops_cached = true; + grpc_transport_stream_op_batch* batch = pending->batch; + // Save a copy of metadata for send_initial_metadata ops. + if (batch->send_initial_metadata) { + seen_send_initial_metadata_ = true; + GPR_ASSERT(send_initial_metadata_storage_ == nullptr); + grpc_metadata_batch* send_initial_metadata = + batch->payload->send_initial_metadata.send_initial_metadata; + send_initial_metadata_storage_ = + static_cast<grpc_linked_mdelem*>(arena_->Alloc( + sizeof(grpc_linked_mdelem) * send_initial_metadata->list.count)); + grpc_metadata_batch_copy(send_initial_metadata, &send_initial_metadata_, + send_initial_metadata_storage_); + send_initial_metadata_flags_ = + batch->payload->send_initial_metadata.send_initial_metadata_flags; + peer_string_ = batch->payload->send_initial_metadata.peer_string; + } + // Set up cache for send_message ops. + if (batch->send_message) { + ByteStreamCache* cache = arena_->New<ByteStreamCache>( + std::move(batch->payload->send_message.send_message)); + send_messages_.push_back(cache); + } + // Save metadata batch for send_trailing_metadata ops. + if (batch->send_trailing_metadata) { + seen_send_trailing_metadata_ = true; + GPR_ASSERT(send_trailing_metadata_storage_ == nullptr); + grpc_metadata_batch* send_trailing_metadata = + batch->payload->send_trailing_metadata.send_trailing_metadata; + send_trailing_metadata_storage_ = + static_cast<grpc_linked_mdelem*>(arena_->Alloc( + sizeof(grpc_linked_mdelem) * send_trailing_metadata->list.count)); + grpc_metadata_batch_copy(send_trailing_metadata, &send_trailing_metadata_, + send_trailing_metadata_storage_); + } +} + +void RetryFilter::CallData::FreeCachedSendInitialMetadata() { + if (GRPC_TRACE_FLAG_ENABLED(grpc_retry_trace)) { + gpr_log(GPR_INFO, "chand=%p calld=%p: destroying send_initial_metadata", + chand_, this); + } + grpc_metadata_batch_destroy(&send_initial_metadata_); +} + +void RetryFilter::CallData::FreeCachedSendMessage(size_t idx) { + if (GRPC_TRACE_FLAG_ENABLED(grpc_retry_trace)) { + gpr_log(GPR_INFO, + "chand=%p calld=%p: destroying send_messages[%" PRIuPTR "]", chand_, + this, idx); + } + send_messages_[idx]->Destroy(); +} + +void RetryFilter::CallData::FreeCachedSendTrailingMetadata() { + if (GRPC_TRACE_FLAG_ENABLED(grpc_retry_trace)) { + gpr_log(GPR_INFO, "chand_=%p calld=%p: destroying send_trailing_metadata", + chand_, this); + } + grpc_metadata_batch_destroy(&send_trailing_metadata_); +} + +void RetryFilter::CallData::FreeAllCachedSendOpData() { + if (seen_send_initial_metadata_) { + FreeCachedSendInitialMetadata(); + } + for (size_t i = 0; i < send_messages_.size(); ++i) { + FreeCachedSendMessage(i); + } + if (seen_send_trailing_metadata_) { + FreeCachedSendTrailingMetadata(); + } +} + +// +// pending_batches management +// + +size_t RetryFilter::CallData::GetBatchIndex( + grpc_transport_stream_op_batch* batch) { + if (batch->send_initial_metadata) return 0; + if (batch->send_message) return 1; + if (batch->send_trailing_metadata) return 2; + if (batch->recv_initial_metadata) return 3; + if (batch->recv_message) return 4; + if (batch->recv_trailing_metadata) return 5; + GPR_UNREACHABLE_CODE(return (size_t)-1); +} + +// This is called via the call combiner, so access to calld is synchronized. +RetryFilter::CallData::PendingBatch* RetryFilter::CallData::PendingBatchesAdd( + grpc_transport_stream_op_batch* batch) { + const size_t idx = GetBatchIndex(batch); + if (GRPC_TRACE_FLAG_ENABLED(grpc_retry_trace)) { + gpr_log(GPR_INFO, + "chand_=%p calld=%p: adding pending batch at index %" PRIuPTR, + chand_, this, idx); + } + PendingBatch* pending = &pending_batches_[idx]; + GPR_ASSERT(pending->batch == nullptr); + pending->batch = batch; + pending->send_ops_cached = false; + // Update state in calld about pending batches. + // Also check if the batch takes us over the retry buffer limit. + // Note: We don't check the size of trailing metadata here, because + // gRPC clients do not send trailing metadata. + if (batch->send_initial_metadata) { + pending_send_initial_metadata_ = true; + bytes_buffered_for_retry_ += grpc_metadata_batch_size( + batch->payload->send_initial_metadata.send_initial_metadata); + } + if (batch->send_message) { + pending_send_message_ = true; + bytes_buffered_for_retry_ += + batch->payload->send_message.send_message->length(); + } + if (batch->send_trailing_metadata) { + pending_send_trailing_metadata_ = true; + } + if (GPR_UNLIKELY(bytes_buffered_for_retry_ > + chand_->per_rpc_retry_buffer_size_)) { + if (GRPC_TRACE_FLAG_ENABLED(grpc_retry_trace)) { + gpr_log(GPR_INFO, + "chand=%p calld=%p: exceeded retry buffer size, committing", + chand_, this); + } + RetryCommit(call_attempt_.get()); + } + return pending; +} + +void RetryFilter::CallData::PendingBatchClear(PendingBatch* pending) { + if (pending->batch->send_initial_metadata) { + pending_send_initial_metadata_ = false; + } + if (pending->batch->send_message) { + pending_send_message_ = false; + } + if (pending->batch->send_trailing_metadata) { + pending_send_trailing_metadata_ = false; + } + pending->batch = nullptr; +} + +void RetryFilter::CallData::MaybeClearPendingBatch(PendingBatch* pending) { + grpc_transport_stream_op_batch* batch = pending->batch; + // We clear the pending batch if all of its callbacks have been + // scheduled and reset to nullptr. + if (batch->on_complete == nullptr && + (!batch->recv_initial_metadata || + batch->payload->recv_initial_metadata.recv_initial_metadata_ready == + nullptr) && + (!batch->recv_message || + batch->payload->recv_message.recv_message_ready == nullptr) && + (!batch->recv_trailing_metadata || + batch->payload->recv_trailing_metadata.recv_trailing_metadata_ready == + nullptr)) { + if (GRPC_TRACE_FLAG_ENABLED(grpc_retry_trace)) { + gpr_log(GPR_INFO, "chand=%p calld=%p: clearing pending batch", chand_, + this); + } + PendingBatchClear(pending); + } +} + +// This is called via the call combiner, so access to calld is synchronized. +void RetryFilter::CallData::FailPendingBatchInCallCombiner( + void* arg, grpc_error_handle error) { + grpc_transport_stream_op_batch* batch = + static_cast<grpc_transport_stream_op_batch*>(arg); + CallData* call = static_cast<CallData*>(batch->handler_private.extra_arg); + // Note: This will release the call combiner. + grpc_transport_stream_op_batch_finish_with_failure( + batch, GRPC_ERROR_REF(error), call->call_combiner_); +} + +// This is called via the call combiner, so access to calld is synchronized. +void RetryFilter::CallData::PendingBatchesFail(grpc_error_handle error) { + GPR_ASSERT(error != GRPC_ERROR_NONE); + if (GRPC_TRACE_FLAG_ENABLED(grpc_retry_trace)) { + size_t num_batches = 0; + for (size_t i = 0; i < GPR_ARRAY_SIZE(pending_batches_); ++i) { + if (pending_batches_[i].batch != nullptr) ++num_batches; + } + gpr_log(GPR_INFO, + "chand=%p calld=%p: failing %" PRIuPTR " pending batches: %s", + chand_, this, num_batches, grpc_error_std_string(error).c_str()); + } + CallCombinerClosureList closures; + for (size_t i = 0; i < GPR_ARRAY_SIZE(pending_batches_); ++i) { + PendingBatch* pending = &pending_batches_[i]; + grpc_transport_stream_op_batch* batch = pending->batch; + if (batch != nullptr) { + batch->handler_private.extra_arg = this; + GRPC_CLOSURE_INIT(&batch->handler_private.closure, + FailPendingBatchInCallCombiner, batch, + grpc_schedule_on_exec_ctx); + closures.Add(&batch->handler_private.closure, GRPC_ERROR_REF(error), + "PendingBatchesFail"); + PendingBatchClear(pending); + } + } + closures.RunClosuresWithoutYielding(call_combiner_); + GRPC_ERROR_UNREF(error); +} + +template <typename Predicate> +RetryFilter::CallData::PendingBatch* RetryFilter::CallData::PendingBatchFind( + const char* log_message, Predicate predicate) { + for (size_t i = 0; i < GPR_ARRAY_SIZE(pending_batches_); ++i) { + PendingBatch* pending = &pending_batches_[i]; + grpc_transport_stream_op_batch* batch = pending->batch; + if (batch != nullptr && predicate(batch)) { + if (GRPC_TRACE_FLAG_ENABLED(grpc_retry_trace)) { + gpr_log(GPR_INFO, + "chand=%p calld=%p: %s pending batch at index %" PRIuPTR, + chand_, this, log_message, i); + } + return pending; + } + } + return nullptr; +} + +// +// retry code +// + +void RetryFilter::CallData::RetryCommit(CallAttempt* call_attempt) { + if (retry_committed_) return; + retry_committed_ = true; + if (GRPC_TRACE_FLAG_ENABLED(grpc_retry_trace)) { + gpr_log(GPR_INFO, "chand=%p calld=%p: committing retries", chand_, this); + } + if (call_attempt != nullptr) { + call_attempt->FreeCachedSendOpDataAfterCommit(); + } +} + +void RetryFilter::CallData::DoRetry(grpc_millis server_pushback_ms) { + // Reset call attempt. + call_attempt_.reset(); + // Compute backoff delay. + grpc_millis next_attempt_time; + if (server_pushback_ms >= 0) { + next_attempt_time = ExecCtx::Get()->Now() + server_pushback_ms; + last_attempt_got_server_pushback_ = true; + } else { + if (num_attempts_completed_ == 1 || last_attempt_got_server_pushback_) { + last_attempt_got_server_pushback_ = false; + } + next_attempt_time = retry_backoff_.NextAttemptTime(); + } + if (GRPC_TRACE_FLAG_ENABLED(grpc_retry_trace)) { + gpr_log(GPR_INFO, + "chand=%p calld=%p: retrying failed call in %" PRId64 " ms", chand_, + this, next_attempt_time - ExecCtx::Get()->Now()); + } + // Schedule retry after computed delay. + GRPC_CLOSURE_INIT(&retry_closure_, OnRetryTimer, this, nullptr); + GRPC_CALL_STACK_REF(owning_call_, "OnRetryTimer"); + MutexLock lock(&timer_mu_); + canceller_ = new Canceller(this); + grpc_timer_init(&retry_timer_, next_attempt_time, &retry_closure_); +} + +void RetryFilter::CallData::OnRetryTimer(void* arg, grpc_error_handle error) { + auto* calld = static_cast<CallData*>(arg); + if (error == GRPC_ERROR_NONE) { + bool start_attempt = false; + { + MutexLock lock(&calld->timer_mu_); + if (calld->canceller_ != nullptr) { + calld->canceller_ = nullptr; + start_attempt = true; + } + } + if (start_attempt) calld->CreateCallAttempt(); + } + GRPC_CALL_STACK_UNREF(calld->owning_call_, "OnRetryTimer"); +} + +} // namespace + +const grpc_channel_filter kRetryFilterVtable = { + RetryFilter::CallData::StartTransportStreamOpBatch, + RetryFilter::StartTransportOp, + sizeof(RetryFilter::CallData), + RetryFilter::CallData::Init, + RetryFilter::CallData::SetPollent, + RetryFilter::CallData::Destroy, + sizeof(RetryFilter), + RetryFilter::Init, + RetryFilter::Destroy, + RetryFilter::GetChannelInfo, + "retry_filter", +}; + +} // namespace grpc_core diff --git a/grpc/src/core/ext/filters/client_channel/retry_filter.h b/grpc/src/core/ext/filters/client_channel/retry_filter.h new file mode 100644 index 00000000..a96df8af --- /dev/null +++ b/grpc/src/core/ext/filters/client_channel/retry_filter.h @@ -0,0 +1,30 @@ +// +// Copyright 2021 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_FILTERS_CLIENT_CHANNEL_RETRY_FILTER_H +#define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RETRY_FILTER_H + +#include <grpc/support/port_platform.h> + +#include "src/core/lib/channel/channel_stack.h" + +namespace grpc_core { + +extern const grpc_channel_filter kRetryFilterVtable; + +} // namespace grpc_core + +#endif // GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RETRY_FILTER_H diff --git a/grpc/src/core/ext/filters/client_channel/retry_service_config.cc b/grpc/src/core/ext/filters/client_channel/retry_service_config.cc new file mode 100644 index 00000000..fc066e63 --- /dev/null +++ b/grpc/src/core/ext/filters/client_channel/retry_service_config.cc @@ -0,0 +1,287 @@ +// +// 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/filters/client_channel/retry_service_config.h" + +#include <ctype.h> +#include <stdio.h> +#include <string.h> + +#include "absl/strings/str_cat.h" +#include "absl/types/optional.h" + +#include <grpc/support/alloc.h> +#include <grpc/support/log.h> +#include <grpc/support/string_util.h> + +#include "src/core/ext/filters/client_channel/client_channel.h" +#include "src/core/ext/filters/client_channel/lb_policy_registry.h" +#include "src/core/ext/filters/client_channel/server_address.h" +#include "src/core/lib/channel/channel_args.h" +#include "src/core/lib/channel/status_util.h" +#include "src/core/lib/gpr/string.h" +#include "src/core/lib/gprpp/memory.h" +#include "src/core/lib/json/json_util.h" +#include "src/core/lib/uri/uri_parser.h" + +// As per the retry design, we do not allow more than 5 retry attempts. +#define MAX_MAX_RETRY_ATTEMPTS 5 + +namespace grpc_core { +namespace internal { + +namespace { +size_t g_retry_service_config_parser_index; +} + +size_t RetryServiceConfigParser::ParserIndex() { + return g_retry_service_config_parser_index; +} + +void RetryServiceConfigParser::Register() { + g_retry_service_config_parser_index = ServiceConfigParser::RegisterParser( + absl::make_unique<RetryServiceConfigParser>()); +} + +namespace { + +grpc_error_handle ParseRetryThrottling(const Json& json, + intptr_t* max_milli_tokens, + intptr_t* milli_token_ratio) { + if (json.type() != Json::Type::OBJECT) { + return GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "field:retryThrottling error:Type should be object"); + } + std::vector<grpc_error_handle> error_list; + // Parse maxTokens. + auto it = json.object_value().find("maxTokens"); + if (it == json.object_value().end()) { + error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "field:retryThrottling field:maxTokens error:Not found")); + } else if (it->second.type() != Json::Type::NUMBER) { + error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "field:retryThrottling field:maxTokens error:Type should be " + "number")); + } else { + *max_milli_tokens = + gpr_parse_nonnegative_int(it->second.string_value().c_str()) * 1000; + if (*max_milli_tokens <= 0) { + error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "field:retryThrottling field:maxTokens error:should be " + "greater than zero")); + } + } + // Parse tokenRatio. + it = json.object_value().find("tokenRatio"); + if (it == json.object_value().end()) { + error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "field:retryThrottling field:tokenRatio error:Not found")); + } else if (it->second.type() != Json::Type::NUMBER) { + error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "field:retryThrottling field:tokenRatio error:type should be " + "number")); + } else { + // We support up to 3 decimal digits. + size_t whole_len = it->second.string_value().size(); + const char* value = it->second.string_value().c_str(); + uint32_t multiplier = 1; + uint32_t decimal_value = 0; + const char* decimal_point = strchr(value, '.'); + if (decimal_point != nullptr) { + whole_len = static_cast<size_t>(decimal_point - value); + multiplier = 1000; + size_t decimal_len = strlen(decimal_point + 1); + if (decimal_len > 3) decimal_len = 3; + if (!gpr_parse_bytes_to_uint32(decimal_point + 1, decimal_len, + &decimal_value)) { + error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "field:retryThrottling field:tokenRatio error:Failed " + "parsing")); + return GRPC_ERROR_CREATE_FROM_VECTOR("retryThrottling", &error_list); + } + uint32_t decimal_multiplier = 1; + for (size_t i = 0; i < (3 - decimal_len); ++i) { + decimal_multiplier *= 10; + } + decimal_value *= decimal_multiplier; + } + uint32_t whole_value; + if (!gpr_parse_bytes_to_uint32(value, whole_len, &whole_value)) { + error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "field:retryThrottling field:tokenRatio error:Failed " + "parsing")); + return GRPC_ERROR_CREATE_FROM_VECTOR("retryThrottling", &error_list); + } + *milli_token_ratio = + static_cast<int>((whole_value * multiplier) + decimal_value); + if (*milli_token_ratio <= 0) { + error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "field:retryThrottling field:tokenRatio error:value should " + "be greater than 0")); + } + } + return GRPC_ERROR_CREATE_FROM_VECTOR("retryThrottling", &error_list); +} + +} // namespace + +std::unique_ptr<ServiceConfigParser::ParsedConfig> +RetryServiceConfigParser::ParseGlobalParams(const grpc_channel_args* /*args*/, + const Json& json, + grpc_error_handle* error) { + GPR_DEBUG_ASSERT(error != nullptr && *error == GRPC_ERROR_NONE); + auto it = json.object_value().find("retryThrottling"); + if (it == json.object_value().end()) return nullptr; + intptr_t max_milli_tokens = 0; + intptr_t milli_token_ratio = 0; + *error = + ParseRetryThrottling(it->second, &max_milli_tokens, &milli_token_ratio); + if (*error != GRPC_ERROR_NONE) return nullptr; + return absl::make_unique<RetryGlobalConfig>(max_milli_tokens, + milli_token_ratio); +} + +namespace { + +grpc_error_handle ParseRetryPolicy(const Json& json, int* max_attempts, + grpc_millis* initial_backoff, + grpc_millis* max_backoff, + float* backoff_multiplier, + StatusCodeSet* retryable_status_codes) { + if (json.type() != Json::Type::OBJECT) { + return GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "field:retryPolicy error:should be of type object"); + } + std::vector<grpc_error_handle> error_list; + // Parse maxAttempts. + auto it = json.object_value().find("maxAttempts"); + if (it != json.object_value().end()) { + if (it->second.type() != Json::Type::NUMBER) { + error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "field:maxAttempts error:should be of type number")); + } else { + *max_attempts = + gpr_parse_nonnegative_int(it->second.string_value().c_str()); + if (*max_attempts <= 1) { + error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "field:maxAttempts error:should be at least 2")); + } else if (*max_attempts > MAX_MAX_RETRY_ATTEMPTS) { + gpr_log(GPR_ERROR, + "service config: clamped retryPolicy.maxAttempts at %d", + MAX_MAX_RETRY_ATTEMPTS); + *max_attempts = MAX_MAX_RETRY_ATTEMPTS; + } + } + } + // Parse initialBackoff. + if (ParseJsonObjectFieldAsDuration(json.object_value(), "initialBackoff", + initial_backoff, &error_list) && + *initial_backoff == 0) { + error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "field:initialBackoff error:must be greater than 0")); + } + // Parse maxBackoff. + if (ParseJsonObjectFieldAsDuration(json.object_value(), "maxBackoff", + max_backoff, &error_list) && + *max_backoff == 0) { + error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "field:maxBackoff error:should be greater than 0")); + } + // Parse backoffMultiplier. + it = json.object_value().find("backoffMultiplier"); + if (it != json.object_value().end()) { + if (it->second.type() != Json::Type::NUMBER) { + error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "field:backoffMultiplier error:should be of type number")); + } else { + if (sscanf(it->second.string_value().c_str(), "%f", backoff_multiplier) != + 1) { + error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "field:backoffMultiplier error:failed to parse")); + } else if (*backoff_multiplier <= 0) { + error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "field:backoffMultiplier error:should be greater than 0")); + } + } + } + // Parse retryableStatusCodes. + it = json.object_value().find("retryableStatusCodes"); + if (it != json.object_value().end()) { + if (it->second.type() != Json::Type::ARRAY) { + error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "field:retryableStatusCodes error:should be of type array")); + } else { + for (const Json& element : it->second.array_value()) { + if (element.type() != Json::Type::STRING) { + error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "field:retryableStatusCodes error:status codes should be of type " + "string")); + continue; + } + grpc_status_code status; + if (!grpc_status_code_from_string(element.string_value().c_str(), + &status)) { + error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "field:retryableStatusCodes error:failed to parse status code")); + continue; + } + retryable_status_codes->Add(status); + } + if (retryable_status_codes->Empty()) { + error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "field:retryableStatusCodes error:should be non-empty")); + }; + } + } + // Make sure required fields are set. + if (error_list.empty()) { + if (*max_attempts == 0 || *initial_backoff == 0 || *max_backoff == 0 || + *backoff_multiplier == 0 || retryable_status_codes->Empty()) { + return GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "field:retryPolicy error:Missing required field(s)"); + } + } + return GRPC_ERROR_CREATE_FROM_VECTOR("retryPolicy", &error_list); +} + +} // namespace + +std::unique_ptr<ServiceConfigParser::ParsedConfig> +RetryServiceConfigParser::ParsePerMethodParams( + const grpc_channel_args* /*args*/, const Json& json, + grpc_error_handle* error) { + GPR_DEBUG_ASSERT(error != nullptr && *error == GRPC_ERROR_NONE); + // Parse retry policy. + auto it = json.object_value().find("retryPolicy"); + if (it == json.object_value().end()) return nullptr; + int max_attempts = 0; + grpc_millis initial_backoff = 0; + grpc_millis max_backoff = 0; + float backoff_multiplier = 0; + StatusCodeSet retryable_status_codes; + *error = ParseRetryPolicy(it->second, &max_attempts, &initial_backoff, + &max_backoff, &backoff_multiplier, + &retryable_status_codes); + if (*error != GRPC_ERROR_NONE) return nullptr; + return absl::make_unique<RetryMethodConfig>(max_attempts, initial_backoff, + max_backoff, backoff_multiplier, + retryable_status_codes); +} + +} // namespace internal +} // namespace grpc_core diff --git a/grpc/src/core/ext/filters/client_channel/retry_service_config.h b/grpc/src/core/ext/filters/client_channel/retry_service_config.h new file mode 100644 index 00000000..256183f2 --- /dev/null +++ b/grpc/src/core/ext/filters/client_channel/retry_service_config.h @@ -0,0 +1,90 @@ +// +// 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_FILTERS_CLIENT_CHANNEL_RETRY_SERVICE_CONFIG_H +#define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RETRY_SERVICE_CONFIG_H + +#include <grpc/support/port_platform.h> + +#include <memory> + +#include "src/core/ext/filters/client_channel/retry_throttle.h" +#include "src/core/ext/filters/client_channel/service_config_parser.h" +#include "src/core/lib/channel/status_util.h" +#include "src/core/lib/iomgr/exec_ctx.h" // for grpc_millis + +namespace grpc_core { +namespace internal { + +class RetryGlobalConfig : public ServiceConfigParser::ParsedConfig { + public: + RetryGlobalConfig(intptr_t max_milli_tokens, intptr_t milli_token_ratio) + : max_milli_tokens_(max_milli_tokens), + milli_token_ratio_(milli_token_ratio) {} + + intptr_t max_milli_tokens() const { return max_milli_tokens_; } + intptr_t milli_token_ratio() const { return milli_token_ratio_; } + + private: + intptr_t max_milli_tokens_ = 0; + intptr_t milli_token_ratio_ = 0; +}; + +class RetryMethodConfig : public ServiceConfigParser::ParsedConfig { + public: + RetryMethodConfig(int max_attempts, grpc_millis initial_backoff, + grpc_millis max_backoff, float backoff_multiplier, + StatusCodeSet retryable_status_codes) + : max_attempts_(max_attempts), + initial_backoff_(initial_backoff), + max_backoff_(max_backoff), + backoff_multiplier_(backoff_multiplier), + retryable_status_codes_(retryable_status_codes) {} + + int max_attempts() const { return max_attempts_; } + grpc_millis initial_backoff() const { return initial_backoff_; } + grpc_millis max_backoff() const { return max_backoff_; } + float backoff_multiplier() const { return backoff_multiplier_; } + StatusCodeSet retryable_status_codes() const { + return retryable_status_codes_; + } + + private: + int max_attempts_ = 0; + grpc_millis initial_backoff_ = 0; + grpc_millis max_backoff_ = 0; + float backoff_multiplier_ = 0; + StatusCodeSet retryable_status_codes_; +}; + +class RetryServiceConfigParser : public ServiceConfigParser::Parser { + public: + std::unique_ptr<ServiceConfigParser::ParsedConfig> ParseGlobalParams( + const grpc_channel_args* /*args*/, const Json& json, + grpc_error_handle* error) override; + + std::unique_ptr<ServiceConfigParser::ParsedConfig> ParsePerMethodParams( + const grpc_channel_args* /*args*/, const Json& json, + grpc_error_handle* error) override; + + static size_t ParserIndex(); + static void Register(); +}; + +} // namespace internal +} // namespace grpc_core + +#endif // GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_RETRY_SERVICE_CONFIG_H diff --git a/grpc/src/core/ext/filters/client_channel/server_address.cc b/grpc/src/core/ext/filters/client_channel/server_address.cc index c8870cae..e082256b 100644 --- a/grpc/src/core/ext/filters/client_channel/server_address.cc +++ b/grpc/src/core/ext/filters/client_channel/server_address.cc @@ -27,11 +27,17 @@ #include "absl/strings/str_cat.h" #include "absl/strings/str_join.h" -#include "src/core/lib/iomgr/sockaddr_utils.h" +#include "src/core/lib/address_utils/sockaddr_utils.h" namespace grpc_core { // +// ServerAddressWeightAttribute +// +const char* ServerAddressWeightAttribute::kServerAddressWeightAttributeKey = + "server_address_weight"; + +// // ServerAddress // @@ -55,6 +61,9 @@ ServerAddress::ServerAddress(const ServerAddress& other) } } ServerAddress& ServerAddress::operator=(const ServerAddress& other) { + if (&other == this) { + return *this; + } address_ = other.address_; grpc_channel_args_destroy(args_); args_ = grpc_channel_args_copy(other.args_); diff --git a/grpc/src/core/ext/filters/client_channel/server_address.h b/grpc/src/core/ext/filters/client_channel/server_address.h index 7a188a0c..1e0eaa11 100644 --- a/grpc/src/core/ext/filters/client_channel/server_address.h +++ b/grpc/src/core/ext/filters/client_channel/server_address.h @@ -25,8 +25,10 @@ #include <memory> #include "absl/container/inlined_vector.h" +#include "absl/strings/str_format.h" #include "src/core/lib/channel/channel_args.h" +#include "src/core/lib/gpr/useful.h" #include "src/core/lib/iomgr/resolve_address.h" namespace grpc_core { @@ -108,6 +110,35 @@ class ServerAddress { typedef absl::InlinedVector<ServerAddress, 1> ServerAddressList; +// +// ServerAddressWeightAttribute +// +class ServerAddressWeightAttribute : public ServerAddress::AttributeInterface { + public: + static const char* kServerAddressWeightAttributeKey; + + explicit ServerAddressWeightAttribute(uint32_t weight) : weight_(weight) {} + + uint32_t weight() const { return weight_; } + + std::unique_ptr<AttributeInterface> Copy() const override { + return absl::make_unique<ServerAddressWeightAttribute>(weight_); + } + + int Cmp(const AttributeInterface* other) const override { + const auto* other_locality_attr = + static_cast<const ServerAddressWeightAttribute*>(other); + return GPR_ICMP(weight_, other_locality_attr->weight_); + } + + std::string ToString() const override { + return absl::StrFormat("%d", weight_); + } + + private: + uint32_t weight_; +}; + } // namespace grpc_core #endif /* GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_SERVER_ADDRESS_H */ diff --git a/grpc/src/core/ext/filters/client_channel/service_config.cc b/grpc/src/core/ext/filters/client_channel/service_config.cc index a2794f19..b87226c6 100644 --- a/grpc/src/core/ext/filters/client_channel/service_config.cc +++ b/grpc/src/core/ext/filters/client_channel/service_config.cc @@ -32,7 +32,7 @@ namespace grpc_core { RefCountedPtr<ServiceConfig> ServiceConfig::Create( const grpc_channel_args* args, absl::string_view json_string, - grpc_error** error) { + grpc_error_handle* error) { GPR_DEBUG_ASSERT(error != nullptr); Json json = Json::Parse(json_string, error); if (*error != GRPC_ERROR_NONE) return nullptr; @@ -42,7 +42,7 @@ RefCountedPtr<ServiceConfig> ServiceConfig::Create( ServiceConfig::ServiceConfig(const grpc_channel_args* args, std::string json_string, Json json, - grpc_error** error) + grpc_error_handle* error) : json_string_(std::move(json_string)), json_(std::move(json)) { GPR_DEBUG_ASSERT(error != nullptr); if (json_.type() != Json::Type::OBJECT) { @@ -50,12 +50,12 @@ ServiceConfig::ServiceConfig(const grpc_channel_args* args, GRPC_ERROR_CREATE_FROM_STATIC_STRING("JSON value is not an object"); return; } - std::vector<grpc_error*> error_list; - grpc_error* global_error = GRPC_ERROR_NONE; + std::vector<grpc_error_handle> error_list; + grpc_error_handle global_error = GRPC_ERROR_NONE; parsed_global_configs_ = ServiceConfigParser::ParseGlobalParameters(args, json_, &global_error); if (global_error != GRPC_ERROR_NONE) error_list.push_back(global_error); - grpc_error* local_error = ParsePerMethodParams(args); + grpc_error_handle local_error = ParsePerMethodParams(args); if (local_error != GRPC_ERROR_NONE) error_list.push_back(local_error); if (!error_list.empty()) { *error = GRPC_ERROR_CREATE_FROM_VECTOR("Service config parsing error", @@ -69,13 +69,13 @@ ServiceConfig::~ServiceConfig() { } } -grpc_error* ServiceConfig::ParseJsonMethodConfig(const grpc_channel_args* args, - const Json& json) { - std::vector<grpc_error*> error_list; +grpc_error_handle ServiceConfig::ParseJsonMethodConfig( + const grpc_channel_args* args, const Json& json) { + std::vector<grpc_error_handle> error_list; // Parse method config with each registered parser. auto parsed_configs = absl::make_unique<ServiceConfigParser::ParsedConfigVector>(); - grpc_error* parser_error = GRPC_ERROR_NONE; + grpc_error_handle parser_error = GRPC_ERROR_NONE; *parsed_configs = ServiceConfigParser::ParsePerMethodParameters(args, json, &parser_error); if (parser_error != GRPC_ERROR_NONE) { @@ -94,7 +94,7 @@ grpc_error* ServiceConfig::ParseJsonMethodConfig(const grpc_channel_args* args, } const Json::Array& name_array = it->second.array_value(); for (const Json& name : name_array) { - grpc_error* parse_error = GRPC_ERROR_NONE; + grpc_error_handle parse_error = GRPC_ERROR_NONE; std::string path = ParseJsonMethodName(name, &parse_error); if (parse_error != GRPC_ERROR_NONE) { error_list.push_back(parse_error); @@ -130,8 +130,9 @@ grpc_error* ServiceConfig::ParseJsonMethodConfig(const grpc_channel_args* args, return GRPC_ERROR_CREATE_FROM_VECTOR("methodConfig", &error_list); } -grpc_error* ServiceConfig::ParsePerMethodParams(const grpc_channel_args* args) { - std::vector<grpc_error*> error_list; +grpc_error_handle ServiceConfig::ParsePerMethodParams( + const grpc_channel_args* args) { + std::vector<grpc_error_handle> error_list; auto it = json_.object_value().find("methodConfig"); if (it != json_.object_value().end()) { if (it->second.type() != Json::Type::ARRAY) { @@ -144,7 +145,7 @@ grpc_error* ServiceConfig::ParsePerMethodParams(const grpc_channel_args* args) { "field:methodConfig error:not of type Object")); continue; } - grpc_error* error = ParseJsonMethodConfig(args, method_config); + grpc_error_handle error = ParseJsonMethodConfig(args, method_config); if (error != GRPC_ERROR_NONE) { error_list.push_back(error); } @@ -154,7 +155,7 @@ grpc_error* ServiceConfig::ParsePerMethodParams(const grpc_channel_args* args) { } std::string ServiceConfig::ParseJsonMethodName(const Json& json, - grpc_error** error) { + grpc_error_handle* error) { if (json.type() != Json::Type::OBJECT) { *error = GRPC_ERROR_CREATE_FROM_STATIC_STRING( "field:name error:type is not object"); diff --git a/grpc/src/core/ext/filters/client_channel/service_config.h b/grpc/src/core/ext/filters/client_channel/service_config.h index 2dfd45d8..a06ae162 100644 --- a/grpc/src/core/ext/filters/client_channel/service_config.h +++ b/grpc/src/core/ext/filters/client_channel/service_config.h @@ -67,10 +67,10 @@ class ServiceConfig : public RefCounted<ServiceConfig> { /// Returns null on parse error. static RefCountedPtr<ServiceConfig> Create(const grpc_channel_args* args, absl::string_view json_string, - grpc_error** error); + grpc_error_handle* error); ServiceConfig(const grpc_channel_args* args, std::string json_string, - Json json, grpc_error** error); + Json json, grpc_error_handle* error); ~ServiceConfig() override; const std::string& json_string() const { return json_string_; } @@ -91,13 +91,14 @@ class ServiceConfig : public RefCounted<ServiceConfig> { private: // Helper functions for parsing the method configs. - grpc_error* ParsePerMethodParams(const grpc_channel_args* args); - grpc_error* ParseJsonMethodConfig(const grpc_channel_args* args, - const Json& json); + grpc_error_handle ParsePerMethodParams(const grpc_channel_args* args); + grpc_error_handle ParseJsonMethodConfig(const grpc_channel_args* args, + const Json& json); // Returns a path string for the JSON name object specified by json. // Sets *error on error. - static std::string ParseJsonMethodName(const Json& json, grpc_error** error); + static std::string ParseJsonMethodName(const Json& json, + grpc_error_handle* error); std::string json_string_; Json json_; diff --git a/grpc/src/core/ext/filters/client_channel/service_config_channel_arg_filter.cc b/grpc/src/core/ext/filters/client_channel/service_config_channel_arg_filter.cc index 679c0f57..5763e17d 100644 --- a/grpc/src/core/ext/filters/client_channel/service_config_channel_arg_filter.cc +++ b/grpc/src/core/ext/filters/client_channel/service_config_channel_arg_filter.cc @@ -36,13 +36,14 @@ class ServiceConfigChannelArgChannelData { const char* service_config_str = grpc_channel_args_find_string( args->channel_args, GRPC_ARG_SERVICE_CONFIG); if (service_config_str != nullptr) { - grpc_error* service_config_error = GRPC_ERROR_NONE; + grpc_error_handle service_config_error = GRPC_ERROR_NONE; auto service_config = ServiceConfig::Create( args->channel_args, service_config_str, &service_config_error); if (service_config_error == GRPC_ERROR_NONE) { service_config_ = std::move(service_config); } else { - gpr_log(GPR_ERROR, "%s", grpc_error_string(service_config_error)); + gpr_log(GPR_ERROR, "%s", + grpc_error_std_string(service_config_error).c_str()); } GRPC_ERROR_UNREF(service_config_error); } @@ -73,7 +74,7 @@ class ServiceConfigChannelArgCallData { } }; -grpc_error* ServiceConfigChannelArgInitCallElem( +grpc_error_handle ServiceConfigChannelArgInitCallElem( grpc_call_element* elem, const grpc_call_element_args* args) { ServiceConfigChannelArgCallData* calld = static_cast<ServiceConfigChannelArgCallData*>(elem->call_data); @@ -89,7 +90,7 @@ void ServiceConfigChannelArgDestroyCallElem( calld->~ServiceConfigChannelArgCallData(); } -grpc_error* ServiceConfigChannelArgInitChannelElem( +grpc_error_handle ServiceConfigChannelArgInitChannelElem( grpc_channel_element* elem, grpc_channel_element_args* args) { ServiceConfigChannelArgChannelData* chand = static_cast<ServiceConfigChannelArgChannelData*>(elem->channel_data); diff --git a/grpc/src/core/ext/filters/client_channel/service_config_parser.cc b/grpc/src/core/ext/filters/client_channel/service_config_parser.cc index d116f311..fa8fbea6 100644 --- a/grpc/src/core/ext/filters/client_channel/service_config_parser.cc +++ b/grpc/src/core/ext/filters/client_channel/service_config_parser.cc @@ -47,11 +47,11 @@ size_t ServiceConfigParser::RegisterParser(std::unique_ptr<Parser> parser) { ServiceConfigParser::ParsedConfigVector ServiceConfigParser::ParseGlobalParameters(const grpc_channel_args* args, const Json& json, - grpc_error** error) { + grpc_error_handle* error) { ParsedConfigVector parsed_global_configs; - std::vector<grpc_error*> error_list; + std::vector<grpc_error_handle> error_list; for (size_t i = 0; i < g_registered_parsers->size(); i++) { - grpc_error* parser_error = GRPC_ERROR_NONE; + grpc_error_handle parser_error = GRPC_ERROR_NONE; auto parsed_config = (*g_registered_parsers)[i]->ParseGlobalParams( args, json, &parser_error); if (parser_error != GRPC_ERROR_NONE) { @@ -68,11 +68,11 @@ ServiceConfigParser::ParseGlobalParameters(const grpc_channel_args* args, ServiceConfigParser::ParsedConfigVector ServiceConfigParser::ParsePerMethodParameters(const grpc_channel_args* args, const Json& json, - grpc_error** error) { + grpc_error_handle* error) { ParsedConfigVector parsed_method_configs; - std::vector<grpc_error*> error_list; + std::vector<grpc_error_handle> error_list; for (size_t i = 0; i < g_registered_parsers->size(); i++) { - grpc_error* parser_error = GRPC_ERROR_NONE; + grpc_error_handle parser_error = GRPC_ERROR_NONE; auto parsed_config = (*g_registered_parsers)[i]->ParsePerMethodParams( args, json, &parser_error); if (parser_error != GRPC_ERROR_NONE) { diff --git a/grpc/src/core/ext/filters/client_channel/service_config_parser.h b/grpc/src/core/ext/filters/client_channel/service_config_parser.h index 692a920e..ebd31660 100644 --- a/grpc/src/core/ext/filters/client_channel/service_config_parser.h +++ b/grpc/src/core/ext/filters/client_channel/service_config_parser.h @@ -47,7 +47,8 @@ class ServiceConfigParser { virtual ~Parser() = default; virtual std::unique_ptr<ParsedConfig> ParseGlobalParams( - const grpc_channel_args*, const Json& /* json */, grpc_error** error) { + const grpc_channel_args*, const Json& /* json */, + grpc_error_handle* error) { // Avoid unused parameter warning on debug-only parameter (void)error; GPR_DEBUG_ASSERT(error != nullptr); @@ -55,7 +56,8 @@ class ServiceConfigParser { } virtual std::unique_ptr<ParsedConfig> ParsePerMethodParams( - const grpc_channel_args*, const Json& /* json */, grpc_error** error) { + const grpc_channel_args*, const Json& /* json */, + grpc_error_handle* error) { // Avoid unused parameter warning on debug-only parameter (void)error; GPR_DEBUG_ASSERT(error != nullptr); @@ -81,10 +83,11 @@ class ServiceConfigParser { static ParsedConfigVector ParseGlobalParameters(const grpc_channel_args* args, const Json& json, - grpc_error** error); + grpc_error_handle* error); static ParsedConfigVector ParsePerMethodParameters( - const grpc_channel_args* args, const Json& json, grpc_error** error); + const grpc_channel_args* args, const Json& json, + grpc_error_handle* error); }; } // namespace grpc_core diff --git a/grpc/src/core/ext/filters/client_channel/subchannel.cc b/grpc/src/core/ext/filters/client_channel/subchannel.cc index dbac59af..a3db6096 100644 --- a/grpc/src/core/ext/filters/client_channel/subchannel.cc +++ b/grpc/src/core/ext/filters/client_channel/subchannel.cc @@ -36,6 +36,8 @@ #include "src/core/ext/filters/client_channel/proxy_mapper_registry.h" #include "src/core/ext/filters/client_channel/service_config.h" #include "src/core/ext/filters/client_channel/subchannel_pool_interface.h" +#include "src/core/lib/address_utils/parse_address.h" +#include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/backoff/backoff.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/connected_channel.h" @@ -45,8 +47,6 @@ #include "src/core/lib/gprpp/manual_constructor.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/iomgr/parse_address.h" -#include "src/core/lib/iomgr/sockaddr_utils.h" #include "src/core/lib/profiling/timers.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/surface/channel.h" @@ -131,7 +131,7 @@ size_t ConnectedSubchannel::GetInitialCallSizeEstimate() const { // RefCountedPtr<SubchannelCall> SubchannelCall::Create(Args args, - grpc_error** error) { + grpc_error_handle* error) { const size_t allocation_size = args.connected_subchannel->GetInitialCallSizeEstimate(); Arena* arena = args.arena; @@ -139,7 +139,7 @@ RefCountedPtr<SubchannelCall> SubchannelCall::Create(Args args, arena->Alloc(allocation_size)) SubchannelCall(std::move(args), error)); } -SubchannelCall::SubchannelCall(Args args, grpc_error** error) +SubchannelCall::SubchannelCall(Args args, grpc_error_handle* error) : connected_subchannel_(std::move(args.connected_subchannel)), deadline_(args.deadline) { grpc_call_stack* callstk = SUBCHANNEL_CALL_TO_CALL_STACK(this); @@ -156,8 +156,7 @@ SubchannelCall::SubchannelCall(Args args, grpc_error** error) *error = grpc_call_stack_init(connected_subchannel_->channel_stack(), 1, SubchannelCall::Destroy, this, &call_args); if (GPR_UNLIKELY(*error != GRPC_ERROR_NONE)) { - const char* error_string = grpc_error_string(*error); - gpr_log(GPR_ERROR, "error: %s", error_string); + gpr_log(GPR_ERROR, "error: %s", grpc_error_std_string(*error).c_str()); return; } grpc_call_stack_set_pollset_or_pollset_set(callstk, args.pollent); @@ -207,7 +206,7 @@ void SubchannelCall::Unref(const DebugLocation& /*location*/, GRPC_CALL_STACK_UNREF(SUBCHANNEL_CALL_TO_CALL_STACK(this), reason); } -void SubchannelCall::Destroy(void* arg, grpc_error* /*error*/) { +void SubchannelCall::Destroy(void* arg, grpc_error_handle /*error*/) { GPR_TIMER_SCOPE("subchannel_call_destroy", 0); SubchannelCall* self = static_cast<SubchannelCall*>(arg); // Keep some members before destroying the subchannel call. @@ -252,7 +251,7 @@ namespace { // Sets *status based on the rest of the parameters. void GetCallStatus(grpc_status_code* status, grpc_millis deadline, - grpc_metadata_batch* md_batch, grpc_error* error) { + grpc_metadata_batch* md_batch, grpc_error_handle error) { if (error != GRPC_ERROR_NONE) { grpc_error_get_status(error, deadline, status, nullptr, nullptr, nullptr); } else { @@ -268,7 +267,8 @@ void GetCallStatus(grpc_status_code* status, grpc_millis deadline, } // namespace -void SubchannelCall::RecvTrailingMetadataReady(void* arg, grpc_error* error) { +void SubchannelCall::RecvTrailingMetadataReady(void* arg, + grpc_error_handle error) { SubchannelCall* call = static_cast<SubchannelCall*>(arg); GPR_ASSERT(call->recv_trailing_metadata_ != nullptr); grpc_status_code status = GRPC_STATUS_OK; @@ -303,20 +303,17 @@ class Subchannel::ConnectedSubchannelStateWatcher : public AsyncConnectivityStateWatcherInterface { public: // Must be instantiated while holding c->mu. - explicit ConnectedSubchannelStateWatcher(Subchannel* c) : subchannel_(c) { - // Steal subchannel ref for connecting. - GRPC_SUBCHANNEL_WEAK_REF(subchannel_, "state_watcher"); - GRPC_SUBCHANNEL_WEAK_UNREF(subchannel_, "connecting"); - } + explicit ConnectedSubchannelStateWatcher(WeakRefCountedPtr<Subchannel> c) + : subchannel_(std::move(c)) {} ~ConnectedSubchannelStateWatcher() override { - GRPC_SUBCHANNEL_WEAK_UNREF(subchannel_, "state_watcher"); + subchannel_.reset(DEBUG_LOCATION, "state_watcher"); } private: void OnConnectivityStateChange(grpc_connectivity_state new_state, const absl::Status& status) override { - Subchannel* c = subchannel_; + Subchannel* c = subchannel_.get(); MutexLock lock(&c->mu_); switch (new_state) { case GRPC_CHANNEL_TRANSIENT_FAILURE: @@ -357,7 +354,7 @@ class Subchannel::ConnectedSubchannelStateWatcher } } - Subchannel* subchannel_; + WeakRefCountedPtr<Subchannel> subchannel_; }; // Asynchronously notifies the \a watcher of a change in the connectvity state @@ -378,7 +375,7 @@ class Subchannel::AsyncWatcherNotifierLocked { ExecCtx::Run(DEBUG_LOCATION, GRPC_CLOSURE_INIT( &closure_, - [](void* arg, grpc_error* /*error*/) { + [](void* arg, grpc_error_handle /*error*/) { auto* self = static_cast<AsyncWatcherNotifierLocked*>(arg); self->watcher_->OnConnectivityStateChange(); @@ -424,19 +421,19 @@ void Subchannel::ConnectivityStateWatcherList::NotifyLocked( class Subchannel::HealthWatcherMap::HealthWatcher : public AsyncConnectivityStateWatcherInterface { public: - HealthWatcher(Subchannel* c, std::string health_check_service_name, - grpc_connectivity_state subchannel_state) - : subchannel_(c), + HealthWatcher(WeakRefCountedPtr<Subchannel> c, + std::string health_check_service_name) + : subchannel_(std::move(c)), health_check_service_name_(std::move(health_check_service_name)), - state_(subchannel_state == GRPC_CHANNEL_READY ? GRPC_CHANNEL_CONNECTING - : subchannel_state) { - GRPC_SUBCHANNEL_WEAK_REF(subchannel_, "health_watcher"); + state_(subchannel_->state_ == GRPC_CHANNEL_READY + ? GRPC_CHANNEL_CONNECTING + : subchannel_->state_) { // If the subchannel is already connected, start health checking. - if (subchannel_state == GRPC_CHANNEL_READY) StartHealthCheckingLocked(); + if (subchannel_->state_ == GRPC_CHANNEL_READY) StartHealthCheckingLocked(); } ~HealthWatcher() override { - GRPC_SUBCHANNEL_WEAK_UNREF(subchannel_, "health_watcher"); + subchannel_.reset(DEBUG_LOCATION, "health_watcher"); } const std::string& health_check_service_name() const { @@ -449,7 +446,8 @@ class Subchannel::HealthWatcherMap::HealthWatcher grpc_connectivity_state initial_state, RefCountedPtr<Subchannel::ConnectivityStateWatcherInterface> watcher) { if (state_ != initial_state) { - new AsyncWatcherNotifierLocked(watcher, subchannel_, state_, status_); + new AsyncWatcherNotifierLocked(watcher, subchannel_.get(), state_, + status_); } watcher_list_.AddWatcherLocked(std::move(watcher)); } @@ -461,7 +459,8 @@ class Subchannel::HealthWatcherMap::HealthWatcher bool HasWatchers() const { return !watcher_list_.empty(); } - void NotifyLocked(grpc_connectivity_state state, const absl::Status& status) { + void NotifyLocked(grpc_connectivity_state state, const absl::Status& status) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(subchannel_->mu_) { if (state == GRPC_CHANNEL_READY) { // If we had not already notified for CONNECTING state, do so now. // (We may have missed this earlier, because if the transition @@ -470,14 +469,14 @@ class Subchannel::HealthWatcherMap::HealthWatcher if (state_ != GRPC_CHANNEL_CONNECTING) { state_ = GRPC_CHANNEL_CONNECTING; status_ = status; - watcher_list_.NotifyLocked(subchannel_, state_, status); + watcher_list_.NotifyLocked(subchannel_.get(), state_, status); } // If we've become connected, start health checking. StartHealthCheckingLocked(); } else { state_ = state; status_ = status; - watcher_list_.NotifyLocked(subchannel_, state_, status); + watcher_list_.NotifyLocked(subchannel_.get(), state_, status); // We're not connected, so stop health checking. health_check_client_.reset(); } @@ -496,18 +495,19 @@ class Subchannel::HealthWatcherMap::HealthWatcher if (new_state != GRPC_CHANNEL_SHUTDOWN && health_check_client_ != nullptr) { state_ = new_state; status_ = status; - watcher_list_.NotifyLocked(subchannel_, new_state, status); + watcher_list_.NotifyLocked(subchannel_.get(), new_state, status); } } - void StartHealthCheckingLocked() { + void StartHealthCheckingLocked() + ABSL_EXCLUSIVE_LOCKS_REQUIRED(subchannel_->mu_) { GPR_ASSERT(health_check_client_ == nullptr); health_check_client_ = MakeOrphanable<HealthCheckClient>( health_check_service_name_, subchannel_->connected_subchannel_, subchannel_->pollset_set_, subchannel_->channelz_node_, Ref()); } - Subchannel* subchannel_; + WeakRefCountedPtr<Subchannel> subchannel_; std::string health_check_service_name_; OrphanablePtr<HealthCheckClient> health_check_client_; grpc_connectivity_state state_; @@ -520,7 +520,8 @@ class Subchannel::HealthWatcherMap::HealthWatcher // void Subchannel::HealthWatcherMap::AddWatcherLocked( - Subchannel* subchannel, grpc_connectivity_state initial_state, + WeakRefCountedPtr<Subchannel> subchannel, + grpc_connectivity_state initial_state, const std::string& health_check_service_name, RefCountedPtr<ConnectivityStateWatcherInterface> watcher) { // If the health check service name is not already present in the map, @@ -528,8 +529,8 @@ void Subchannel::HealthWatcherMap::AddWatcherLocked( auto it = map_.find(health_check_service_name); HealthWatcher* health_watcher; if (it == map_.end()) { - auto w = MakeOrphanable<HealthWatcher>( - subchannel, health_check_service_name, subchannel->state_); + auto w = MakeOrphanable<HealthWatcher>(std::move(subchannel), + health_check_service_name); health_watcher = w.get(); map_.emplace(health_check_service_name, std::move(w)); } else { @@ -647,14 +648,16 @@ Subchannel::ConnectivityStateWatcherInterface::PopConnectivityStateChange() { return state_change; } -Subchannel::Subchannel(SubchannelKey* key, +Subchannel::Subchannel(SubchannelKey key, OrphanablePtr<SubchannelConnector> connector, const grpc_channel_args* args) - : key_(key), + : DualRefCounted<Subchannel>( + GRPC_TRACE_FLAG_ENABLED(grpc_trace_subchannel_refcount) ? "Subchannel" + : nullptr), + key_(std::move(key)), connector_(std::move(connector)), backoff_(ParseArgsForBackoffValues(args, &min_connect_timeout_ms_)) { GRPC_STATS_INC_CLIENT_SUBCHANNELS_CREATED(); - gpr_atm_no_barrier_store(&ref_pair_, 1 << INTERNAL_REF_BITS); pollset_set_ = grpc_pollset_set_create(); grpc_resolved_address* addr = static_cast<grpc_resolved_address*>(gpr_malloc(sizeof(*addr))); @@ -704,26 +707,26 @@ Subchannel::~Subchannel() { grpc_channel_args_destroy(args_); connector_.reset(); grpc_pollset_set_destroy(pollset_set_); - delete key_; } -Subchannel* Subchannel::Create(OrphanablePtr<SubchannelConnector> connector, - const grpc_channel_args* args) { - SubchannelKey* key = new SubchannelKey(args); +RefCountedPtr<Subchannel> Subchannel::Create( + OrphanablePtr<SubchannelConnector> connector, + const grpc_channel_args* args) { + SubchannelKey key(args); SubchannelPoolInterface* subchannel_pool = SubchannelPoolInterface::GetSubchannelPoolFromChannelArgs(args); GPR_ASSERT(subchannel_pool != nullptr); - Subchannel* c = subchannel_pool->FindSubchannel(key); + RefCountedPtr<Subchannel> c = subchannel_pool->FindSubchannel(key); if (c != nullptr) { - delete key; return c; } - c = new Subchannel(key, std::move(connector), args); + c = MakeRefCounted<Subchannel>(std::move(key), std::move(connector), args); // Try to register the subchannel before setting the subchannel pool. // Otherwise, in case of a registration race, unreffing c in // RegisterSubchannel() will cause c to be tried to be unregistered, while // its key maps to a different subchannel. - Subchannel* registered = subchannel_pool->RegisterSubchannel(key, c); + RefCountedPtr<Subchannel> registered = + subchannel_pool->RegisterSubchannel(c->key_, c); if (registered == c) c->subchannel_pool_ = subchannel_pool->Ref(); return registered; } @@ -747,68 +750,6 @@ void Subchannel::ThrottleKeepaliveTime(int new_keepalive_time) { } } -Subchannel* Subchannel::Ref(GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { - gpr_atm old_refs; - old_refs = RefMutate((1 << INTERNAL_REF_BITS), - 0 GRPC_SUBCHANNEL_REF_MUTATE_PURPOSE("STRONG_REF")); - GPR_ASSERT((old_refs & STRONG_REF_MASK) != 0); - return this; -} - -void Subchannel::Unref(GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { - gpr_atm old_refs; - // add a weak ref and subtract a strong ref (atomically) - old_refs = RefMutate( - static_cast<gpr_atm>(1) - static_cast<gpr_atm>(1 << INTERNAL_REF_BITS), - 1 GRPC_SUBCHANNEL_REF_MUTATE_PURPOSE("STRONG_UNREF")); - if ((old_refs & STRONG_REF_MASK) == (1 << INTERNAL_REF_BITS)) { - Disconnect(); - } - GRPC_SUBCHANNEL_WEAK_UNREF(this, "strong-unref"); -} - -Subchannel* Subchannel::WeakRef(GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { - gpr_atm old_refs; - old_refs = RefMutate(1, 0 GRPC_SUBCHANNEL_REF_MUTATE_PURPOSE("WEAK_REF")); - GPR_ASSERT(old_refs != 0); - return this; -} - -namespace { - -void subchannel_destroy(void* arg, grpc_error* /*error*/) { - Subchannel* self = static_cast<Subchannel*>(arg); - delete self; -} - -} // namespace - -void Subchannel::WeakUnref(GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { - gpr_atm old_refs; - old_refs = RefMutate(-static_cast<gpr_atm>(1), - 1 GRPC_SUBCHANNEL_REF_MUTATE_PURPOSE("WEAK_UNREF")); - if (old_refs == 1) { - ExecCtx::Run(DEBUG_LOCATION, - GRPC_CLOSURE_CREATE(subchannel_destroy, this, - grpc_schedule_on_exec_ctx), - GRPC_ERROR_NONE); - } -} - -Subchannel* Subchannel::RefFromWeakRef() { - for (;;) { - gpr_atm old_refs = gpr_atm_acq_load(&ref_pair_); - if (old_refs >= (1 << INTERNAL_REF_BITS)) { - gpr_atm new_refs = old_refs + (1 << INTERNAL_REF_BITS); - if (gpr_atm_rel_cas(&ref_pair_, old_refs, new_refs)) { - return this; - } - } else { - return nullptr; - } - } -} - const char* Subchannel::GetTargetAddress() { const grpc_arg* addr_arg = grpc_channel_args_find(args_, GRPC_ARG_SUBCHANNEL_ADDRESS); @@ -854,7 +795,8 @@ void Subchannel::WatchConnectivityState( watcher_list_.AddWatcherLocked(std::move(watcher)); } else { health_watcher_map_.AddWatcherLocked( - this, initial_state, *health_check_service_name, std::move(watcher)); + WeakRef(DEBUG_LOCATION, "health_watcher"), initial_state, + *health_check_service_name, std::move(watcher)); } } @@ -891,6 +833,21 @@ void Subchannel::ResetBackoff() { } } +void Subchannel::Orphan() { + // The subchannel_pool is only used once here in this subchannel, so the + // access can be outside of the lock. + if (subchannel_pool_ != nullptr) { + subchannel_pool_->UnregisterSubchannel(key_, this); + subchannel_pool_.reset(); + } + MutexLock lock(&mu_); + GPR_ASSERT(!disconnected_); + disconnected_ = true; + connector_.reset(); + connected_subchannel_.reset(); + health_watcher_map_.ShutdownLocked(); +} + grpc_arg Subchannel::CreateSubchannelAddressArg( const grpc_resolved_address* addr) { return grpc_channel_arg_string_create( @@ -984,7 +941,8 @@ void Subchannel::MaybeStartConnectingLocked() { return; } connecting_ = true; - GRPC_SUBCHANNEL_WEAK_REF(this, "connecting"); + WeakRef(DEBUG_LOCATION, "connecting") + .release(); // ref held by pending connect if (!backoff_begun_) { backoff_begun_ = true; ContinueConnectingLocked(); @@ -1005,11 +963,9 @@ void Subchannel::MaybeStartConnectingLocked() { } } -void Subchannel::OnRetryAlarm(void* arg, grpc_error* error) { - Subchannel* c = static_cast<Subchannel*>(arg); - // TODO(soheilhy): Once subchannel refcounting is simplified, we can get use - // MutexLock instead of ReleasableMutexLock, here. - ReleasableMutexLock lock(&c->mu_); +void Subchannel::OnRetryAlarm(void* arg, grpc_error_handle error) { + WeakRefCountedPtr<Subchannel> c(static_cast<Subchannel*>(arg)); + MutexLock lock(&c->mu_); c->have_retry_alarm_ = false; if (c->disconnected_) { error = GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING("Disconnected", @@ -1023,10 +979,9 @@ void Subchannel::OnRetryAlarm(void* arg, grpc_error* error) { if (error == GRPC_ERROR_NONE) { gpr_log(GPR_INFO, "Failed to connect to channel, retrying"); c->ContinueConnectingLocked(); - lock.Unlock(); - } else { - lock.Unlock(); - GRPC_SUBCHANNEL_WEAK_UNREF(c, "connecting"); + // Still connecting, keep ref around. Note that this stolen ref won't + // be dropped without first acquiring c->mu_. + c.release(); } GRPC_ERROR_UNREF(error); } @@ -1043,33 +998,30 @@ void Subchannel::ContinueConnectingLocked() { connector_->Connect(args, &connecting_result_, &on_connecting_finished_); } -void Subchannel::OnConnectingFinished(void* arg, grpc_error* error) { - auto* c = static_cast<Subchannel*>(arg); +void Subchannel::OnConnectingFinished(void* arg, grpc_error_handle error) { + WeakRefCountedPtr<Subchannel> c(static_cast<Subchannel*>(arg)); const grpc_channel_args* delete_channel_args = c->connecting_result_.channel_args; - GRPC_SUBCHANNEL_WEAK_REF(c, "on_connecting_finished"); { MutexLock lock(&c->mu_); c->connecting_ = false; if (c->connecting_result_.transport != nullptr && c->PublishTransportLocked()) { // Do nothing, transport was published. - } else if (c->disconnected_) { - GRPC_SUBCHANNEL_WEAK_UNREF(c, "connecting"); - } else { - gpr_log(GPR_INFO, "Connect failed: %s", grpc_error_string(error)); + } else if (!c->disconnected_) { + gpr_log(GPR_INFO, "Connect failed: %s", + grpc_error_std_string(error).c_str()); c->SetConnectivityStateLocked(GRPC_CHANNEL_TRANSIENT_FAILURE, grpc_error_to_absl_status(error)); - GRPC_SUBCHANNEL_WEAK_UNREF(c, "connecting"); } } - GRPC_SUBCHANNEL_WEAK_UNREF(c, "on_connecting_finished"); grpc_channel_args_destroy(delete_channel_args); + c.reset(DEBUG_LOCATION, "connecting"); } namespace { -void ConnectionDestroy(void* arg, grpc_error* /*error*/) { +void ConnectionDestroy(void* arg, grpc_error_handle /*error*/) { grpc_channel_stack* stk = static_cast<grpc_channel_stack*>(arg); grpc_channel_stack_destroy(stk); gpr_free(stk); @@ -1089,13 +1041,13 @@ bool Subchannel::PublishTransportLocked() { return false; } grpc_channel_stack* stk; - grpc_error* error = grpc_channel_stack_builder_finish( + grpc_error_handle error = grpc_channel_stack_builder_finish( builder, 0, 1, ConnectionDestroy, nullptr, reinterpret_cast<void**>(&stk)); if (error != GRPC_ERROR_NONE) { grpc_transport_destroy(connecting_result_.transport); gpr_log(GPR_ERROR, "error initializing subchannel stack: %s", - grpc_error_string(error)); + grpc_error_std_string(error).c_str()); GRPC_ERROR_UNREF(error); return false; } @@ -1117,39 +1069,11 @@ bool Subchannel::PublishTransportLocked() { } // Start watching connected subchannel. connected_subchannel_->StartWatch( - pollset_set_, MakeOrphanable<ConnectedSubchannelStateWatcher>(this)); + pollset_set_, MakeOrphanable<ConnectedSubchannelStateWatcher>( + WeakRef(DEBUG_LOCATION, "state_watcher"))); // Report initial state. SetConnectivityStateLocked(GRPC_CHANNEL_READY, absl::Status()); return true; } -void Subchannel::Disconnect() { - // The subchannel_pool is only used once here in this subchannel, so the - // access can be outside of the lock. - if (subchannel_pool_ != nullptr) { - subchannel_pool_->UnregisterSubchannel(key_); - subchannel_pool_.reset(); - } - MutexLock lock(&mu_); - GPR_ASSERT(!disconnected_); - disconnected_ = true; - connector_.reset(); - connected_subchannel_.reset(); - health_watcher_map_.ShutdownLocked(); -} - -gpr_atm Subchannel::RefMutate( - gpr_atm delta, int barrier GRPC_SUBCHANNEL_REF_MUTATE_EXTRA_ARGS) { - gpr_atm old_val = barrier ? gpr_atm_full_fetch_add(&ref_pair_, delta) - : gpr_atm_no_barrier_fetch_add(&ref_pair_, delta); -#ifndef NDEBUG - if (grpc_trace_subchannel_refcount.enabled()) { - gpr_log(file, line, GPR_LOG_SEVERITY_DEBUG, - "SUBCHANNEL: %p %12s 0x%" PRIxPTR " -> 0x%" PRIxPTR " [%s]", this, - purpose, old_val, old_val + delta, reason); - } -#endif - return old_val; -} - } // namespace grpc_core diff --git a/grpc/src/core/ext/filters/client_channel/subchannel.h b/grpc/src/core/ext/filters/client_channel/subchannel.h index 952a02a5..9667fe7f 100644 --- a/grpc/src/core/ext/filters/client_channel/subchannel.h +++ b/grpc/src/core/ext/filters/client_channel/subchannel.h @@ -30,6 +30,7 @@ #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/gpr/time_precise.h" #include "src/core/lib/gprpp/arena.h" +#include "src/core/lib/gprpp/dual_ref_counted.h" #include "src/core/lib/gprpp/ref_counted.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/sync.h" @@ -41,31 +42,6 @@ // Channel arg containing a URI indicating the address to connect to. #define GRPC_ARG_SUBCHANNEL_ADDRESS "grpc.subchannel_address" -// For debugging refcounting. -#ifndef NDEBUG -#define GRPC_SUBCHANNEL_REF(p, r) (p)->Ref(__FILE__, __LINE__, (r)) -#define GRPC_SUBCHANNEL_REF_FROM_WEAK_REF(p, r) (p)->RefFromWeakRef() -#define GRPC_SUBCHANNEL_UNREF(p, r) (p)->Unref(__FILE__, __LINE__, (r)) -#define GRPC_SUBCHANNEL_WEAK_REF(p, r) (p)->WeakRef(__FILE__, __LINE__, (r)) -#define GRPC_SUBCHANNEL_WEAK_UNREF(p, r) (p)->WeakUnref(__FILE__, __LINE__, (r)) -#define GRPC_SUBCHANNEL_REF_EXTRA_ARGS \ - const char *file, int line, const char *reason -#define GRPC_SUBCHANNEL_REF_REASON reason -#define GRPC_SUBCHANNEL_REF_MUTATE_EXTRA_ARGS \ - , GRPC_SUBCHANNEL_REF_EXTRA_ARGS, const char* purpose -#define GRPC_SUBCHANNEL_REF_MUTATE_PURPOSE(x) , file, line, reason, x -#else -#define GRPC_SUBCHANNEL_REF(p, r) (p)->Ref() -#define GRPC_SUBCHANNEL_REF_FROM_WEAK_REF(p, r) (p)->RefFromWeakRef() -#define GRPC_SUBCHANNEL_UNREF(p, r) (p)->Unref() -#define GRPC_SUBCHANNEL_WEAK_REF(p, r) (p)->WeakRef() -#define GRPC_SUBCHANNEL_WEAK_UNREF(p, r) (p)->WeakUnref() -#define GRPC_SUBCHANNEL_REF_EXTRA_ARGS -#define GRPC_SUBCHANNEL_REF_REASON "" -#define GRPC_SUBCHANNEL_REF_MUTATE_EXTRA_ARGS -#define GRPC_SUBCHANNEL_REF_MUTATE_PURPOSE(x) -#endif - namespace grpc_core { class SubchannelCall; @@ -111,7 +87,8 @@ class SubchannelCall { grpc_call_context_element* context; CallCombiner* call_combiner; }; - static RefCountedPtr<SubchannelCall> Create(Args args, grpc_error** error); + static RefCountedPtr<SubchannelCall> Create(Args args, + grpc_error_handle* error); // Continues processing a transport stream op batch. void StartTransportStreamOpBatch(grpc_transport_stream_op_batch* batch); @@ -137,20 +114,20 @@ class SubchannelCall { template <typename T> friend class RefCountedPtr; - SubchannelCall(Args args, grpc_error** error); + SubchannelCall(Args args, grpc_error_handle* error); // If channelz is enabled, intercepts recv_trailing so that we may check the // status and associate it to a subchannel. void MaybeInterceptRecvTrailingMetadata( grpc_transport_stream_op_batch* batch); - static void RecvTrailingMetadataReady(void* arg, grpc_error* error); + static void RecvTrailingMetadataReady(void* arg, grpc_error_handle error); // Interface of RefCounted<>. void IncrementRefCount(); void IncrementRefCount(const DebugLocation& location, const char* reason); - static void Destroy(void* arg, grpc_error* error); + static void Destroy(void* arg, grpc_error_handle error); RefCountedPtr<ConnectedSubchannel> connected_subchannel_; grpc_closure* after_call_stack_destroy_ = nullptr; @@ -168,7 +145,7 @@ class SubchannelCall { // different from the SubchannelInterface that is exposed to LB policy // implementations. The client channel provides an adaptor class // (SubchannelWrapper) that "converts" between the two. -class Subchannel { +class Subchannel : public DualRefCounted<Subchannel> { public: class ConnectivityStateWatcherInterface : public RefCounted<ConnectivityStateWatcherInterface> { @@ -204,37 +181,29 @@ class Subchannel { ConnectivityStateChange PopConnectivityStateChange(); private: + Mutex mu_; // protects the queue // Keeps track of the updates that the watcher instance must be notified of. // TODO(yashkt): This is currently needed to send the state updates in the // right order when asynchronously notifying. This will no longer be // necessary when we have access to EventManager. - std::deque<ConnectivityStateChange> connectivity_state_queue_; - Mutex mu_; // protects the queue + std::deque<ConnectivityStateChange> connectivity_state_queue_ + ABSL_GUARDED_BY(&mu_); }; + // Creates a subchannel given \a connector and \a args. + static RefCountedPtr<Subchannel> Create( + OrphanablePtr<SubchannelConnector> connector, + const grpc_channel_args* args); + // The ctor and dtor are not intended to use directly. - Subchannel(SubchannelKey* key, OrphanablePtr<SubchannelConnector> connector, + Subchannel(SubchannelKey key, OrphanablePtr<SubchannelConnector> connector, const grpc_channel_args* args); - ~Subchannel(); - - // Creates a subchannel given \a connector and \a args. - static Subchannel* Create(OrphanablePtr<SubchannelConnector> connector, - const grpc_channel_args* args); + ~Subchannel() override; // Throttles keepalive time to \a new_keepalive_time iff \a new_keepalive_time // is larger than the subchannel's current keepalive time. The updated value // will have an affect when the subchannel creates a new ConnectedSubchannel. - void ThrottleKeepaliveTime(int new_keepalive_time); - - // Strong and weak refcounting. - Subchannel* Ref(GRPC_SUBCHANNEL_REF_EXTRA_ARGS); - void Unref(GRPC_SUBCHANNEL_REF_EXTRA_ARGS); - Subchannel* WeakRef(GRPC_SUBCHANNEL_REF_EXTRA_ARGS); - void WeakUnref(GRPC_SUBCHANNEL_REF_EXTRA_ARGS); - // Attempts to return a strong ref when only the weak refcount is guaranteed - // non-zero. If the strong refcount is zero, does not alter the refcount and - // returns null. - Subchannel* RefFromWeakRef(); + void ThrottleKeepaliveTime(int new_keepalive_time) ABSL_LOCKS_EXCLUDED(mu_); // Gets the string representing the subchannel address. // Caller doesn't take ownership. @@ -251,7 +220,8 @@ class Subchannel { // If the return value is GRPC_CHANNEL_READY, also sets *connected_subchannel. grpc_connectivity_state CheckConnectivityState( const absl::optional<std::string>& health_check_service_name, - RefCountedPtr<ConnectedSubchannel>* connected_subchannel); + RefCountedPtr<ConnectedSubchannel>* connected_subchannel) + ABSL_LOCKS_EXCLUDED(mu_); // Starts watching the subchannel's connectivity state. // The first callback to the watcher will be delivered when the @@ -264,23 +234,27 @@ class Subchannel { void WatchConnectivityState( grpc_connectivity_state initial_state, const absl::optional<std::string>& health_check_service_name, - RefCountedPtr<ConnectivityStateWatcherInterface> watcher); + RefCountedPtr<ConnectivityStateWatcherInterface> watcher) + ABSL_LOCKS_EXCLUDED(mu_); // Cancels a connectivity state watch. // If the watcher has already been destroyed, this is a no-op. void CancelConnectivityStateWatch( const absl::optional<std::string>& health_check_service_name, - ConnectivityStateWatcherInterface* watcher); + ConnectivityStateWatcherInterface* watcher) ABSL_LOCKS_EXCLUDED(mu_); // Attempt to connect to the backend. Has no effect if already connected. - void AttemptToConnect(); + void AttemptToConnect() ABSL_LOCKS_EXCLUDED(mu_); // Resets the connection backoff of the subchannel. // TODO(roth): Move connection backoff out of subchannels and up into LB // policy code (probably by adding a SubchannelGroup between // SubchannelList and SubchannelData), at which point this method can // go away. - void ResetBackoff(); + void ResetBackoff() ABSL_LOCKS_EXCLUDED(mu_); + + // Tears down any existing connection, and arranges for destruction + void Orphan() override ABSL_LOCKS_EXCLUDED(mu_); // Returns a new channel arg encoding the subchannel address as a URI // string. Caller is responsible for freeing the string. @@ -333,18 +307,20 @@ class Subchannel { class HealthWatcherMap { public: void AddWatcherLocked( - Subchannel* subchannel, grpc_connectivity_state initial_state, + WeakRefCountedPtr<Subchannel> subchannel, + grpc_connectivity_state initial_state, const std::string& health_check_service_name, RefCountedPtr<ConnectivityStateWatcherInterface> watcher); void RemoveWatcherLocked(const std::string& health_check_service_name, ConnectivityStateWatcherInterface* watcher); // Notifies the watcher when the subchannel's state changes. - void NotifyLocked(grpc_connectivity_state state, - const absl::Status& status); + void NotifyLocked(grpc_connectivity_state state, const absl::Status& status) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(&Subchannel::mu_); grpc_connectivity_state CheckConnectivityStateLocked( - Subchannel* subchannel, const std::string& health_check_service_name); + Subchannel* subchannel, const std::string& health_check_service_name) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(&Subchannel::mu_); void ShutdownLocked(); @@ -360,72 +336,65 @@ class Subchannel { // Sets the subchannel's connectivity state to \a state. void SetConnectivityStateLocked(grpc_connectivity_state state, - const absl::Status& status); + const absl::Status& status) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_); // Methods for connection. - void MaybeStartConnectingLocked(); - static void OnRetryAlarm(void* arg, grpc_error* error); - void ContinueConnectingLocked(); - static void OnConnectingFinished(void* arg, grpc_error* error); - bool PublishTransportLocked(); - void Disconnect(); - - gpr_atm RefMutate(gpr_atm delta, - int barrier GRPC_SUBCHANNEL_REF_MUTATE_EXTRA_ARGS); + void MaybeStartConnectingLocked() ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_); + static void OnRetryAlarm(void* arg, grpc_error_handle error) + ABSL_LOCKS_EXCLUDED(mu_); + void ContinueConnectingLocked() ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_); + static void OnConnectingFinished(void* arg, grpc_error_handle error) + ABSL_LOCKS_EXCLUDED(mu_); + bool PublishTransportLocked() ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_); // The subchannel pool this subchannel is in. RefCountedPtr<SubchannelPoolInterface> subchannel_pool_; // TODO(juanlishen): Consider using args_ as key_ directly. // Subchannel key that identifies this subchannel in the subchannel pool. - SubchannelKey* key_; + const SubchannelKey key_; // Channel args. grpc_channel_args* args_; // pollset_set tracking who's interested in a connection being setup. grpc_pollset_set* pollset_set_; - // Protects the other members. - Mutex mu_; - // Refcount - // - lower INTERNAL_REF_BITS bits are for internal references: - // these do not keep the subchannel open. - // - upper remaining bits are for public references: these do - // keep the subchannel open - gpr_atm ref_pair_; - - // Connection states. + // Channelz tracking. + RefCountedPtr<channelz::SubchannelNode> channelz_node_; + + // Connection state. OrphanablePtr<SubchannelConnector> connector_; - // Set during connection. SubchannelConnector::Result connecting_result_; grpc_closure on_connecting_finished_; + + // Protects the other members. + Mutex mu_; + // Active connection, or null. - RefCountedPtr<ConnectedSubchannel> connected_subchannel_; - bool connecting_ = false; - bool disconnected_ = false; + RefCountedPtr<ConnectedSubchannel> connected_subchannel_ ABSL_GUARDED_BY(mu_); + bool connecting_ ABSL_GUARDED_BY(mu_) = false; + bool disconnected_ ABSL_GUARDED_BY(mu_) = false; // Connectivity state tracking. - grpc_connectivity_state state_ = GRPC_CHANNEL_IDLE; - absl::Status status_; + grpc_connectivity_state state_ ABSL_GUARDED_BY(mu_) = GRPC_CHANNEL_IDLE; + absl::Status status_ ABSL_GUARDED_BY(mu_); // The list of watchers without a health check service name. - ConnectivityStateWatcherList watcher_list_; + ConnectivityStateWatcherList watcher_list_ ABSL_GUARDED_BY(mu_); // The map of watchers with health check service names. - HealthWatcherMap health_watcher_map_; + HealthWatcherMap health_watcher_map_ ABSL_GUARDED_BY(mu_); // Backoff state. - BackOff backoff_; - grpc_millis next_attempt_deadline_; - grpc_millis min_connect_timeout_ms_; - bool backoff_begun_ = false; + BackOff backoff_ ABSL_GUARDED_BY(mu_); + grpc_millis next_attempt_deadline_ ABSL_GUARDED_BY(mu_); + grpc_millis min_connect_timeout_ms_ ABSL_GUARDED_BY(mu_); + bool backoff_begun_ ABSL_GUARDED_BY(mu_) = false; // Retry alarm. - grpc_timer retry_alarm_; - grpc_closure on_retry_alarm_; - bool have_retry_alarm_ = false; + grpc_timer retry_alarm_ ABSL_GUARDED_BY(mu_); + grpc_closure on_retry_alarm_ ABSL_GUARDED_BY(mu_); + bool have_retry_alarm_ ABSL_GUARDED_BY(mu_) = false; // reset_backoff() was called while alarm was pending. - bool retry_immediately_ = false; + bool retry_immediately_ ABSL_GUARDED_BY(mu_) = false; // Keepalive time period (-1 for unset) - int keepalive_time_ = -1; - - // Channelz tracking. - RefCountedPtr<channelz::SubchannelNode> channelz_node_; + int keepalive_time_ ABSL_GUARDED_BY(mu_) = -1; }; } // namespace grpc_core diff --git a/grpc/src/core/ext/filters/client_channel/subchannel_pool_interface.cc b/grpc/src/core/ext/filters/client_channel/subchannel_pool_interface.cc index bb35f228..308541c5 100644 --- a/grpc/src/core/ext/filters/client_channel/subchannel_pool_interface.cc +++ b/grpc/src/core/ext/filters/client_channel/subchannel_pool_interface.cc @@ -44,13 +44,27 @@ SubchannelKey::SubchannelKey(const SubchannelKey& other) { } SubchannelKey& SubchannelKey::operator=(const SubchannelKey& other) { + if (&other == this) { + return *this; + } grpc_channel_args_destroy(const_cast<grpc_channel_args*>(args_)); Init(other.args_, grpc_channel_args_copy); return *this; } -int SubchannelKey::Cmp(const SubchannelKey& other) const { - return grpc_channel_args_compare(args_, other.args_); +SubchannelKey::SubchannelKey(SubchannelKey&& other) noexcept { + args_ = other.args_; + other.args_ = nullptr; +} + +SubchannelKey& SubchannelKey::operator=(SubchannelKey&& other) noexcept { + args_ = other.args_; + other.args_ = nullptr; + return *this; +} + +bool SubchannelKey::operator<(const SubchannelKey& other) const { + return grpc_channel_args_compare(args_, other.args_) < 0; } void SubchannelKey::Init( diff --git a/grpc/src/core/ext/filters/client_channel/subchannel_pool_interface.h b/grpc/src/core/ext/filters/client_channel/subchannel_pool_interface.h index f320ab69..8a8a0cb6 100644 --- a/grpc/src/core/ext/filters/client_channel/subchannel_pool_interface.h +++ b/grpc/src/core/ext/filters/client_channel/subchannel_pool_interface.h @@ -41,11 +41,11 @@ class SubchannelKey { // Copyable. SubchannelKey(const SubchannelKey& other); SubchannelKey& operator=(const SubchannelKey& other); - // Not movable. - SubchannelKey(SubchannelKey&&) = delete; - SubchannelKey& operator=(SubchannelKey&&) = delete; + // Movable + SubchannelKey(SubchannelKey&&) noexcept; + SubchannelKey& operator=(SubchannelKey&&) noexcept; - int Cmp(const SubchannelKey& other) const; + bool operator<(const SubchannelKey& other) const; private: // Initializes the subchannel key with the given \a args and the function to @@ -72,15 +72,17 @@ class SubchannelPoolInterface : public RefCounted<SubchannelPoolInterface> { // Registers a subchannel against a key. Returns the subchannel registered // with \a key, which may be different from \a constructed because we reuse // (instead of update) any existing subchannel already registered with \a key. - virtual Subchannel* RegisterSubchannel(SubchannelKey* key, - Subchannel* constructed) = 0; + virtual RefCountedPtr<Subchannel> RegisterSubchannel( + const SubchannelKey& key, RefCountedPtr<Subchannel> constructed) = 0; // Removes the registered subchannel found by \a key. - virtual void UnregisterSubchannel(SubchannelKey* key) = 0; + virtual void UnregisterSubchannel(const SubchannelKey& key, + Subchannel* subchannel) = 0; // Finds the subchannel registered for the given subchannel key. Returns NULL // if no such channel exists. Thread-safe. - virtual Subchannel* FindSubchannel(SubchannelKey* key) = 0; + virtual RefCountedPtr<Subchannel> FindSubchannel( + const SubchannelKey& key) = 0; // Creates a channel arg from \a subchannel pool. static grpc_arg CreateChannelArg(SubchannelPoolInterface* subchannel_pool); diff --git a/grpc/src/core/ext/filters/client_idle/client_idle_filter.cc b/grpc/src/core/ext/filters/client_idle/client_idle_filter.cc index 2ea3eade..01abaab7 100644 --- a/grpc/src/core/ext/filters/client_idle/client_idle_filter.cc +++ b/grpc/src/core/ext/filters/client_idle/client_idle_filter.cc @@ -126,8 +126,8 @@ grpc_millis GetClientIdleTimeout(const grpc_channel_args* args) { class ChannelData { public: - static grpc_error* Init(grpc_channel_element* elem, - grpc_channel_element_args* args); + static grpc_error_handle Init(grpc_channel_element* elem, + grpc_channel_element_args* args); static void Destroy(grpc_channel_element* elem); static void StartTransportOp(grpc_channel_element* elem, @@ -139,11 +139,12 @@ class ChannelData { private: ChannelData(grpc_channel_element* elem, grpc_channel_element_args* args, - grpc_error** error); + grpc_error_handle* error); ~ChannelData() = default; - static void IdleTimerCallback(void* arg, grpc_error* error); - static void IdleTransportOpCompleteCallback(void* arg, grpc_error* error); + static void IdleTimerCallback(void* arg, grpc_error_handle error); + static void IdleTransportOpCompleteCallback(void* arg, + grpc_error_handle error); void StartIdleTimer(); @@ -170,9 +171,9 @@ class ChannelData { grpc_closure idle_transport_op_complete_callback_; }; -grpc_error* ChannelData::Init(grpc_channel_element* elem, - grpc_channel_element_args* args) { - grpc_error* error = GRPC_ERROR_NONE; +grpc_error_handle ChannelData::Init(grpc_channel_element* elem, + grpc_channel_element_args* args) { + grpc_error_handle error = GRPC_ERROR_NONE; new (elem->channel_data) ChannelData(elem, args, &error); return error; } @@ -187,7 +188,7 @@ void ChannelData::StartTransportOp(grpc_channel_element* elem, ChannelData* chand = static_cast<ChannelData*>(elem->channel_data); // Catch the disconnect_with_error transport op. if (op->disconnect_with_error != nullptr) { - // IncreaseCallCount() introduces a dummy call and prevent the timer from + // IncreaseCallCount() introduces a phony call and prevent the timer from // being reset by other threads. chand->IncreaseCallCount(); // If the timer has been set, cancel the timer. @@ -283,7 +284,7 @@ void ChannelData::DecreaseCallCount() { ChannelData::ChannelData(grpc_channel_element* elem, grpc_channel_element_args* args, - grpc_error** /*error*/) + grpc_error_handle* /*error*/) : elem_(elem), channel_stack_(args->channel_stack), client_idle_timeout_(GetClientIdleTimeout(args->channel_args)) { @@ -303,7 +304,7 @@ ChannelData::ChannelData(grpc_channel_element* elem, grpc_schedule_on_exec_ctx); } -void ChannelData::IdleTimerCallback(void* arg, grpc_error* error) { +void ChannelData::IdleTimerCallback(void* arg, grpc_error_handle error) { GRPC_IDLE_FILTER_LOG("timer alarms"); ChannelData* chand = static_cast<ChannelData*>(arg); if (error != GRPC_ERROR_NONE) { @@ -352,7 +353,7 @@ void ChannelData::IdleTimerCallback(void* arg, grpc_error* error) { } void ChannelData::IdleTransportOpCompleteCallback(void* arg, - grpc_error* /*error*/) { + grpc_error_handle /*error*/) { ChannelData* chand = static_cast<ChannelData*>(arg); GRPC_CHANNEL_STACK_UNREF(chand->channel_stack_, "idle transport op"); } @@ -381,15 +382,15 @@ void ChannelData::EnterIdle() { class CallData { public: - static grpc_error* Init(grpc_call_element* elem, - const grpc_call_element_args* args); + static grpc_error_handle Init(grpc_call_element* elem, + const grpc_call_element_args* args); static void Destroy(grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* then_schedule_closure); }; -grpc_error* CallData::Init(grpc_call_element* elem, - const grpc_call_element_args* /*args*/) { +grpc_error_handle CallData::Init(grpc_call_element* elem, + const grpc_call_element_args* /*args*/) { ChannelData* chand = static_cast<ChannelData*>(elem->channel_data); chand->IncreaseCallCount(); return GRPC_ERROR_NONE; diff --git a/grpc/src/core/ext/filters/deadline/deadline_filter.cc b/grpc/src/core/ext/filters/deadline/deadline_filter.cc index 837e337b..8944f5d9 100644 --- a/grpc/src/core/ext/filters/deadline/deadline_filter.cc +++ b/grpc/src/core/ext/filters/deadline/deadline_filter.cc @@ -51,7 +51,7 @@ class TimerState { private: // The on_complete callback used when sending a cancel_error batch down the // filter stack. Yields the call combiner when the batch returns. - static void YieldCallCombiner(void* arg, grpc_error* /*ignored*/) { + static void YieldCallCombiner(void* arg, grpc_error_handle /*ignored*/) { TimerState* self = static_cast<TimerState*>(arg); grpc_deadline_state* deadline_state = static_cast<grpc_deadline_state*>(self->elem_->call_data); @@ -62,7 +62,7 @@ class TimerState { // This is called via the call combiner, so access to deadline_state is // synchronized. - static void SendCancelOpInCallCombiner(void* arg, grpc_error* error) { + static void SendCancelOpInCallCombiner(void* arg, grpc_error_handle error) { TimerState* self = static_cast<TimerState*>(arg); grpc_transport_stream_op_batch* batch = grpc_make_transport_stream_op( GRPC_CLOSURE_INIT(&self->closure_, YieldCallCombiner, self, nullptr)); @@ -72,7 +72,7 @@ class TimerState { } // Timer callback. - static void TimerCallback(void* arg, grpc_error* error) { + static void TimerCallback(void* arg, grpc_error_handle error) { TimerState* self = static_cast<TimerState*>(arg); grpc_deadline_state* deadline_state = static_cast<grpc_deadline_state*>(self->elem_->call_data); @@ -135,7 +135,7 @@ static void cancel_timer_if_needed(grpc_deadline_state* deadline_state) { } // Callback run when we receive trailing metadata. -static void recv_trailing_metadata_ready(void* arg, grpc_error* error) { +static void recv_trailing_metadata_ready(void* arg, grpc_error_handle error) { grpc_deadline_state* deadline_state = static_cast<grpc_deadline_state*>(arg); cancel_timer_if_needed(deadline_state); // Invoke the original callback. @@ -168,7 +168,7 @@ struct start_timer_after_init_state { grpc_millis deadline; grpc_closure closure; }; -static void start_timer_after_init(void* arg, grpc_error* error) { +static void start_timer_after_init(void* arg, grpc_error_handle error) { struct start_timer_after_init_state* state = static_cast<struct start_timer_after_init_state*>(arg); grpc_deadline_state* deadline_state = @@ -241,8 +241,8 @@ void grpc_deadline_state_client_start_transport_stream_op_batch( // // Constructor for channel_data. Used for both client and server filters. -static grpc_error* deadline_init_channel_elem(grpc_channel_element* /*elem*/, - grpc_channel_element_args* args) { +static grpc_error_handle deadline_init_channel_elem( + grpc_channel_element* /*elem*/, grpc_channel_element_args* args) { GPR_ASSERT(!args->is_last); return GRPC_ERROR_NONE; } @@ -268,8 +268,8 @@ typedef struct server_call_data { } server_call_data; // Constructor for call_data. Used for both client and server filters. -static grpc_error* deadline_init_call_elem(grpc_call_element* elem, - const grpc_call_element_args* args) { +static grpc_error_handle deadline_init_call_elem( + grpc_call_element* elem, const grpc_call_element_args* args) { new (elem->call_data) grpc_deadline_state(elem, *args, args->deadline); return GRPC_ERROR_NONE; } @@ -292,7 +292,7 @@ static void deadline_client_start_transport_stream_op_batch( } // Callback for receiving initial metadata on the server. -static void recv_initial_metadata_ready(void* arg, grpc_error* error) { +static void recv_initial_metadata_ready(void* arg, grpc_error_handle error) { grpc_call_element* elem = static_cast<grpc_call_element*>(arg); server_call_data* calld = static_cast<server_call_data*>(elem->call_data); start_timer_if_needed(elem, calld->recv_initial_metadata->deadline); diff --git a/grpc/src/core/ext/filters/fault_injection/fault_injection_filter.cc b/grpc/src/core/ext/filters/fault_injection/fault_injection_filter.cc new file mode 100644 index 00000000..5f8d7794 --- /dev/null +++ b/grpc/src/core/ext/filters/fault_injection/fault_injection_filter.cc @@ -0,0 +1,501 @@ +// +// Copyright 2021 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/filters/fault_injection/fault_injection_filter.h" + +#include "absl/strings/numbers.h" + +#include <grpc/support/alloc.h> +#include <grpc/support/log.h> + +#include "src/core/ext/filters/client_channel/service_config.h" +#include "src/core/ext/filters/client_channel/service_config_call_data.h" +#include "src/core/ext/filters/fault_injection/service_config_parser.h" +#include "src/core/lib/channel/channel_stack.h" +#include "src/core/lib/channel/status_util.h" +#include "src/core/lib/gprpp/atomic.h" +#include "src/core/lib/gprpp/sync.h" +#include "src/core/lib/iomgr/closure.h" +#include "src/core/lib/iomgr/timer.h" +#include "src/core/lib/transport/status_conversion.h" + +namespace grpc_core { + +TraceFlag grpc_fault_injection_filter_trace(false, "fault_injection_filter"); + +namespace { + +Atomic<uint32_t> g_active_faults{0}; +static_assert( + std::is_trivially_destructible<Atomic<uint32_t>>::value, + "the active fault counter needs to have a trivially destructible type"); + +inline int GetLinkedMetadatumValueInt(grpc_linked_mdelem* md) { + int res; + if (absl::SimpleAtoi(StringViewFromSlice(GRPC_MDVALUE(md->md)), &res)) { + return res; + } else { + return -1; + } +} + +inline uint32_t GetLinkedMetadatumValueUnsignedInt(grpc_linked_mdelem* md) { + uint32_t res; + if (absl::SimpleAtoi(StringViewFromSlice(GRPC_MDVALUE(md->md)), &res)) { + return res; + } else { + return -1; + } +} + +inline int64_t GetLinkedMetadatumValueInt64(grpc_linked_mdelem* md) { + int64_t res; + if (absl::SimpleAtoi(StringViewFromSlice(GRPC_MDVALUE(md->md)), &res)) { + return res; + } else { + return -1; + } +} + +inline bool UnderFraction(const uint32_t numerator, + const uint32_t denominator) { + if (numerator <= 0) return false; + if (numerator >= denominator) return true; + // Generate a random number in [0, denominator). + const uint32_t random_number = rand() % denominator; + return random_number < numerator; +} + +class ChannelData { + public: + static grpc_error_handle Init(grpc_channel_element* elem, + grpc_channel_element_args* args); + static void Destroy(grpc_channel_element* elem); + + int index() const { return index_; } + + private: + ChannelData(grpc_channel_element* elem, grpc_channel_element_args* args); + ~ChannelData() = default; + + // The relative index of instances of the same filter. + int index_; +}; + +class CallData { + public: + static grpc_error_handle Init(grpc_call_element* elem, + const grpc_call_element_args* args); + + static void Destroy(grpc_call_element* elem, + const grpc_call_final_info* /*final_info*/, + grpc_closure* /*then_schedule_closure*/); + + static void StartTransportStreamOpBatch( + grpc_call_element* elem, grpc_transport_stream_op_batch* batch); + + private: + class ResumeBatchCanceller; + + CallData(grpc_call_element* elem, const grpc_call_element_args* args); + ~CallData(); + + void DecideWhetherToInjectFaults(grpc_metadata_batch* initial_metadata); + + // Checks if current active faults exceed the allowed max faults. + bool HaveActiveFaultsQuota(bool increment); + + // Returns true if this RPC needs to be delayed. If so, this call will be + // counted as an active fault. + bool MaybeDelay(); + + // Returns the aborted RPC status if this RPC needs to be aborted. If so, + // this call will be counted as an active fault. Otherwise, it returns + // GRPC_ERROR_NONE. + // If this call is already been delay injected, skip the active faults + // quota check. + grpc_error_handle MaybeAbort(); + + // Delays the stream operations batch. + void DelayBatch(grpc_call_element* elem, + grpc_transport_stream_op_batch* batch); + + // Cancels the delay timer. + void CancelDelayTimer() { grpc_timer_cancel(&delay_timer_); } + + // Finishes the fault injection, should only be called once. + void FaultInjectionFinished() { + g_active_faults.FetchSub(1, MemoryOrder::RELAXED); + } + + // This is a callback that will be invoked after the delay timer is up. + static void ResumeBatch(void* arg, grpc_error_handle error); + + // This is a callback invoked upon completion of recv_trailing_metadata. + // Injects the abort_error_ to the recv_trailing_metadata batch if needed. + static void HijackedRecvTrailingMetadataReady(void* arg, grpc_error_handle); + + // Used to track the policy structs that needs to be destroyed in dtor. + bool fi_policy_owned_ = false; + const FaultInjectionMethodParsedConfig::FaultInjectionPolicy* fi_policy_; + grpc_call_stack* owning_call_; + Arena* arena_; + CallCombiner* call_combiner_; + + // Indicates whether we are doing a delay and/or an abort for this call. + bool delay_request_ = false; + bool abort_request_ = false; + + // Delay states + grpc_timer delay_timer_ ABSL_GUARDED_BY(delay_mu_); + ResumeBatchCanceller* resume_batch_canceller_ ABSL_GUARDED_BY(delay_mu_); + grpc_transport_stream_op_batch* delayed_batch_ ABSL_GUARDED_BY(delay_mu_); + // Abort states + grpc_error_handle abort_error_ = GRPC_ERROR_NONE; + grpc_closure recv_trailing_metadata_ready_; + grpc_closure* original_recv_trailing_metadata_ready_; + // Protects the asynchronous delay, resume, and cancellation. + Mutex delay_mu_; +}; + +// ChannelData + +grpc_error_handle ChannelData::Init(grpc_channel_element* elem, + grpc_channel_element_args* args) { + GPR_ASSERT(elem->filter == &FaultInjectionFilterVtable); + new (elem->channel_data) ChannelData(elem, args); + return GRPC_ERROR_NONE; +} + +void ChannelData::Destroy(grpc_channel_element* elem) { + auto* chand = static_cast<ChannelData*>(elem->channel_data); + chand->~ChannelData(); +} + +ChannelData::ChannelData(grpc_channel_element* elem, + grpc_channel_element_args* args) + : index_(grpc_channel_stack_filter_instance_number(args->channel_stack, + elem)) {} + +// CallData::ResumeBatchCanceller + +class CallData::ResumeBatchCanceller { + public: + explicit ResumeBatchCanceller(grpc_call_element* elem) : elem_(elem) { + auto* calld = static_cast<CallData*>(elem->call_data); + GRPC_CALL_STACK_REF(calld->owning_call_, "ResumeBatchCanceller"); + GRPC_CLOSURE_INIT(&closure_, &Cancel, this, grpc_schedule_on_exec_ctx); + calld->call_combiner_->SetNotifyOnCancel(&closure_); + } + + private: + static void Cancel(void* arg, grpc_error_handle error) { + auto* self = static_cast<ResumeBatchCanceller*>(arg); + auto* chand = static_cast<ChannelData*>(self->elem_->channel_data); + auto* calld = static_cast<CallData*>(self->elem_->call_data); + { + MutexLock lock(&calld->delay_mu_); + if (GRPC_TRACE_FLAG_ENABLED(grpc_fault_injection_filter_trace)) { + gpr_log(GPR_INFO, + "chand=%p calld=%p: cancelling schdueled pick: " + "error=%s self=%p calld->resume_batch_canceller_=%p", + chand, calld, grpc_error_std_string(error).c_str(), self, + calld->resume_batch_canceller_); + } + if (error != GRPC_ERROR_NONE && calld->resume_batch_canceller_ == self) { + // Cancel the delayed pick. + calld->CancelDelayTimer(); + calld->FaultInjectionFinished(); + // Fail pending batches on the call. + grpc_transport_stream_op_batch_finish_with_failure( + calld->delayed_batch_, GRPC_ERROR_REF(error), + calld->call_combiner_); + } + } + GRPC_CALL_STACK_UNREF(calld->owning_call_, "ResumeBatchCanceller"); + delete self; + } + + grpc_call_element* elem_; + grpc_closure closure_; +}; + +// CallData + +grpc_error_handle CallData::Init(grpc_call_element* elem, + const grpc_call_element_args* args) { + auto* calld = new (elem->call_data) CallData(elem, args); + if (calld->fi_policy_ == nullptr) { + return GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "failed to find fault injection policy"); + } + return GRPC_ERROR_NONE; +} + +void CallData::Destroy(grpc_call_element* elem, + const grpc_call_final_info* /*final_info*/, + grpc_closure* /*then_schedule_closure*/) { + auto* calld = static_cast<CallData*>(elem->call_data); + calld->~CallData(); +} + +void CallData::StartTransportStreamOpBatch( + grpc_call_element* elem, grpc_transport_stream_op_batch* batch) { + auto* calld = static_cast<CallData*>(elem->call_data); + // There should only be one send_initial_metdata op, and fault injection also + // only need to be enforced once. + if (batch->send_initial_metadata) { + calld->DecideWhetherToInjectFaults( + batch->payload->send_initial_metadata.send_initial_metadata); + if (GRPC_TRACE_FLAG_ENABLED(grpc_fault_injection_filter_trace)) { + gpr_log(GPR_INFO, + "chand=%p calld=%p: Fault injection triggered delay=%d abort=%d", + elem->channel_data, calld, calld->delay_request_, + calld->abort_request_); + } + if (calld->MaybeDelay()) { + // Delay the batch, and pass down the batch in the scheduled closure. + calld->DelayBatch(elem, batch); + return; + } + grpc_error_handle abort_error = calld->MaybeAbort(); + if (abort_error != GRPC_ERROR_NONE) { + calld->abort_error_ = abort_error; + grpc_transport_stream_op_batch_finish_with_failure( + batch, GRPC_ERROR_REF(calld->abort_error_), calld->call_combiner_); + return; + } + } else { + if (batch->recv_trailing_metadata) { + // Intercept recv_trailing_metadata callback so that we can inject the + // failure when aborting streaming calls, because their + // recv_trailing_metatdata op may not be on the same batch as the + // send_initial_metadata op. + calld->original_recv_trailing_metadata_ready_ = + batch->payload->recv_trailing_metadata.recv_trailing_metadata_ready; + batch->payload->recv_trailing_metadata.recv_trailing_metadata_ready = + &calld->recv_trailing_metadata_ready_; + } + if (calld->abort_error_ != GRPC_ERROR_NONE) { + // If we already decided to abort, then immediately fail this batch. + grpc_transport_stream_op_batch_finish_with_failure( + batch, GRPC_ERROR_REF(calld->abort_error_), calld->call_combiner_); + return; + } + } + // Chain to the next filter. + grpc_call_next_op(elem, batch); +} + +CallData::CallData(grpc_call_element* elem, const grpc_call_element_args* args) + : owning_call_(args->call_stack), + arena_(args->arena), + call_combiner_(args->call_combiner) { + auto* chand = static_cast<ChannelData*>(elem->channel_data); + // Fetch the fault injection policy from the service config, based on the + // relative index for which policy should this CallData use. + auto* service_config_call_data = static_cast<ServiceConfigCallData*>( + args->context[GRPC_CONTEXT_SERVICE_CONFIG_CALL_DATA].value); + auto* method_params = static_cast<FaultInjectionMethodParsedConfig*>( + service_config_call_data->GetMethodParsedConfig( + FaultInjectionServiceConfigParser::ParserIndex())); + if (method_params != nullptr) { + fi_policy_ = method_params->fault_injection_policy(chand->index()); + } + GRPC_CLOSURE_INIT(&recv_trailing_metadata_ready_, + HijackedRecvTrailingMetadataReady, elem, + grpc_schedule_on_exec_ctx); +} + +CallData::~CallData() { + if (fi_policy_owned_) { + fi_policy_->~FaultInjectionPolicy(); + } + GRPC_ERROR_UNREF(abort_error_); +} + +void CallData::DecideWhetherToInjectFaults( + grpc_metadata_batch* initial_metadata) { + FaultInjectionMethodParsedConfig::FaultInjectionPolicy* copied_policy = + nullptr; + // Update the policy with values in initial metadata. + if (!fi_policy_->abort_code_header.empty() || + !fi_policy_->abort_percentage_header.empty() || + !fi_policy_->delay_header.empty() || + !fi_policy_->delay_percentage_header.empty()) { + // Defer the actual copy until the first matched header. + auto maybe_copy_policy_func = [this, &copied_policy]() { + if (copied_policy == nullptr) { + copied_policy = + arena_->New<FaultInjectionMethodParsedConfig::FaultInjectionPolicy>( + *fi_policy_); + } + }; + for (grpc_linked_mdelem* md = initial_metadata->list.head; md != nullptr; + md = md->next) { + absl::string_view key = StringViewFromSlice(GRPC_MDKEY(md->md)); + // Only perform string comparison if: + // 1. Needs to check this header; + // 2. The value is not been filled before. + if (!fi_policy_->abort_code_header.empty() && + (copied_policy == nullptr || + copied_policy->abort_code == GRPC_STATUS_OK) && + key == fi_policy_->abort_code_header) { + maybe_copy_policy_func(); + grpc_status_code_from_int(GetLinkedMetadatumValueInt(md), + &copied_policy->abort_code); + } + if (!fi_policy_->abort_percentage_header.empty() && + key == fi_policy_->abort_percentage_header) { + maybe_copy_policy_func(); + copied_policy->abort_percentage_numerator = + GPR_MIN(GetLinkedMetadatumValueUnsignedInt(md), + fi_policy_->abort_percentage_numerator); + } + if (!fi_policy_->delay_header.empty() && + (copied_policy == nullptr || copied_policy->delay == 0) && + key == fi_policy_->delay_header) { + maybe_copy_policy_func(); + copied_policy->delay = static_cast<grpc_millis>( + GPR_MAX(GetLinkedMetadatumValueInt64(md), 0)); + } + if (!fi_policy_->delay_percentage_header.empty() && + key == fi_policy_->delay_percentage_header) { + maybe_copy_policy_func(); + copied_policy->delay_percentage_numerator = + GPR_MIN(GetLinkedMetadatumValueUnsignedInt(md), + fi_policy_->delay_percentage_numerator); + } + } + if (copied_policy != nullptr) fi_policy_ = copied_policy; + } + // Roll the dice + delay_request_ = fi_policy_->delay != 0 && + UnderFraction(fi_policy_->delay_percentage_numerator, + fi_policy_->delay_percentage_denominator); + abort_request_ = fi_policy_->abort_code != GRPC_STATUS_OK && + UnderFraction(fi_policy_->abort_percentage_numerator, + fi_policy_->abort_percentage_denominator); + if (!delay_request_ && !abort_request_) { + if (copied_policy != nullptr) copied_policy->~FaultInjectionPolicy(); + // No fault injection for this call + } else { + fi_policy_owned_ = copied_policy != nullptr; + } +} + +bool CallData::HaveActiveFaultsQuota(bool increment) { + if (g_active_faults.Load(MemoryOrder::ACQUIRE) >= fi_policy_->max_faults) { + return false; + } + if (increment) g_active_faults.FetchAdd(1, MemoryOrder::RELAXED); + return true; +} + +bool CallData::MaybeDelay() { + if (delay_request_) { + return HaveActiveFaultsQuota(true); + } + return false; +} + +grpc_error_handle CallData::MaybeAbort() { + if (abort_request_ && (delay_request_ || HaveActiveFaultsQuota(false))) { + return grpc_error_set_int( + GRPC_ERROR_CREATE_FROM_COPIED_STRING(fi_policy_->abort_message.c_str()), + GRPC_ERROR_INT_GRPC_STATUS, fi_policy_->abort_code); + } + return GRPC_ERROR_NONE; +} + +void CallData::DelayBatch(grpc_call_element* elem, + grpc_transport_stream_op_batch* batch) { + MutexLock lock(&delay_mu_); + delayed_batch_ = batch; + resume_batch_canceller_ = new ResumeBatchCanceller(elem); + grpc_millis resume_time = ExecCtx::Get()->Now() + fi_policy_->delay; + GRPC_CLOSURE_INIT(&batch->handler_private.closure, ResumeBatch, elem, + grpc_schedule_on_exec_ctx); + grpc_timer_init(&delay_timer_, resume_time, &batch->handler_private.closure); +} + +void CallData::ResumeBatch(void* arg, grpc_error_handle error) { + grpc_call_element* elem = static_cast<grpc_call_element*>(arg); + auto* calld = static_cast<CallData*>(elem->call_data); + MutexLock lock(&calld->delay_mu_); + // Cancelled or canceller has already run + if (error == GRPC_ERROR_CANCELLED || + calld->resume_batch_canceller_ == nullptr) { + return; + } + if (GRPC_TRACE_FLAG_ENABLED(grpc_fault_injection_filter_trace)) { + gpr_log(GPR_INFO, "chand=%p calld=%p: Resuming delayed stream op batch %p", + elem->channel_data, calld, calld->delayed_batch_); + } + // Lame the canceller + calld->resume_batch_canceller_ = nullptr; + // Finish fault injection. + calld->FaultInjectionFinished(); + // Abort if needed. + error = calld->MaybeAbort(); + if (error != GRPC_ERROR_NONE) { + grpc_transport_stream_op_batch_finish_with_failure( + calld->delayed_batch_, error, calld->call_combiner_); + return; + } + // Chain to the next filter. + grpc_call_next_op(elem, calld->delayed_batch_); +} + +void CallData::HijackedRecvTrailingMetadataReady(void* arg, + grpc_error_handle error) { + grpc_call_element* elem = static_cast<grpc_call_element*>(arg); + auto* calld = static_cast<CallData*>(elem->call_data); + if (calld->abort_error_ != GRPC_ERROR_NONE) { + error = grpc_error_add_child(GRPC_ERROR_REF(error), + GRPC_ERROR_REF(calld->abort_error_)); + } else { + error = GRPC_ERROR_REF(error); + } + Closure::Run(DEBUG_LOCATION, calld->original_recv_trailing_metadata_ready_, + error); +} + +} // namespace + +extern const grpc_channel_filter FaultInjectionFilterVtable = { + CallData::StartTransportStreamOpBatch, + grpc_channel_next_op, + sizeof(CallData), + CallData::Init, + grpc_call_stack_ignore_set_pollset_or_pollset_set, + CallData::Destroy, + sizeof(ChannelData), + ChannelData::Init, + ChannelData::Destroy, + grpc_channel_next_get_info, + "fault_injection_filter", +}; + +void FaultInjectionFilterInit(void) { + grpc_core::FaultInjectionServiceConfigParser::Register(); +} + +void FaultInjectionFilterShutdown(void) {} + +} // namespace grpc_core diff --git a/grpc/src/core/ext/filters/fault_injection/fault_injection_filter.h b/grpc/src/core/ext/filters/fault_injection/fault_injection_filter.h new file mode 100644 index 00000000..fbc1eb0c --- /dev/null +++ b/grpc/src/core/ext/filters/fault_injection/fault_injection_filter.h @@ -0,0 +1,39 @@ +// +// Copyright 2021 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_FILTERS_FAULT_INJECTION_FAULT_INJECTION_FILTER_H +#define GRPC_CORE_EXT_FILTERS_FAULT_INJECTION_FAULT_INJECTION_FILTER_H + +#include <grpc/support/port_platform.h> + +#include "src/core/ext/filters/fault_injection/service_config_parser.h" +#include "src/core/lib/channel/channel_stack.h" + +// Channel arg key for enabling parsing fault injection via method config. +#define GRPC_ARG_PARSE_FAULT_INJECTION_METHOD_CONFIG \ + "grpc.parse_fault_injection_method_config" + +namespace grpc_core { + +// This channel filter is intended to be used by the dynamic filters, instead +// of the ordinary channel stack. The fault injection filter fetches fault +// injection policy from the method config of service config returned by the +// resolver, and enforces the fault injection policy. +extern const grpc_channel_filter FaultInjectionFilterVtable; + +} // namespace grpc_core + +#endif // GRPC_CORE_EXT_FILTERS_FAULT_INJECTION_FAULT_INJECTION_FILTER_H diff --git a/grpc/src/core/ext/filters/fault_injection/service_config_parser.cc b/grpc/src/core/ext/filters/fault_injection/service_config_parser.cc new file mode 100644 index 00000000..e8c23e19 --- /dev/null +++ b/grpc/src/core/ext/filters/fault_injection/service_config_parser.cc @@ -0,0 +1,189 @@ +// +// Copyright 2021 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/filters/fault_injection/service_config_parser.h" + +#include <vector> + +#include "absl/strings/str_cat.h" +#include "absl/strings/string_view.h" +#include "src/core/ext/filters/client_channel/service_config.h" +#include "src/core/ext/filters/fault_injection/fault_injection_filter.h" +#include "src/core/lib/channel/channel_args.h" +#include "src/core/lib/channel/status_util.h" +#include "src/core/lib/gpr/string.h" +#include "src/core/lib/json/json_util.h" + +namespace grpc_core { + +namespace { + +size_t g_fault_injection_parser_index; + +std::vector<FaultInjectionMethodParsedConfig::FaultInjectionPolicy> +ParseFaultInjectionPolicy(const Json::Array& policies_json_array, + std::vector<grpc_error_handle>* error_list) { + std::vector<FaultInjectionMethodParsedConfig::FaultInjectionPolicy> policies; + for (size_t i = 0; i < policies_json_array.size(); i++) { + FaultInjectionMethodParsedConfig::FaultInjectionPolicy + fault_injection_policy; + std::vector<grpc_error_handle> sub_error_list; + if (policies_json_array[i].type() != Json::Type::OBJECT) { + error_list->push_back(GRPC_ERROR_CREATE_FROM_COPIED_STRING( + absl::StrCat("faultInjectionPolicy index ", i, + " is not a JSON object") + .c_str())); + continue; + } + const Json::Object& json_object = policies_json_array[i].object_value(); + // Parse abort_code + std::string abort_code_string; + if (ParseJsonObjectField(json_object, "abortCode", &abort_code_string, + &sub_error_list, false)) { + if (!grpc_status_code_from_string(abort_code_string.c_str(), + &(fault_injection_policy.abort_code))) { + sub_error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "field:abortCode error:failed to parse status code")); + } + } + // Parse abort_message + if (!ParseJsonObjectField(json_object, "abortMessage", + &fault_injection_policy.abort_message, + &sub_error_list, false)) { + fault_injection_policy.abort_message = "Fault injected"; + } + // Parse abort_code_header + ParseJsonObjectField(json_object, "abortCodeHeader", + &fault_injection_policy.abort_code_header, + &sub_error_list, false); + // Parse abort_percentage_header + ParseJsonObjectField(json_object, "abortPercentageHeader", + &fault_injection_policy.abort_percentage_header, + &sub_error_list, false); + // Parse abort_percentage_numerator + ParseJsonObjectField(json_object, "abortPercentageNumerator", + &fault_injection_policy.abort_percentage_numerator, + &sub_error_list, false); + // Parse abort_percentage_denominator + if (ParseJsonObjectField( + json_object, "abortPercentageDenominator", + &fault_injection_policy.abort_percentage_denominator, + &sub_error_list, false)) { + if (fault_injection_policy.abort_percentage_denominator != 100 && + fault_injection_policy.abort_percentage_denominator != 10000 && + fault_injection_policy.abort_percentage_denominator != 1000000) { + sub_error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "field:abortPercentageDenominator error:Denominator can only be " + "one of " + "100, 10000, 1000000")); + } + } + // Parse delay + ParseJsonObjectFieldAsDuration(json_object, "delay", + &fault_injection_policy.delay, + &sub_error_list, false); + // Parse delay_header + ParseJsonObjectField(json_object, "delayHeader", + &fault_injection_policy.delay_header, &sub_error_list, + false); + // Parse delay_percentage_header + ParseJsonObjectField(json_object, "delayPercentageHeader", + &fault_injection_policy.delay_percentage_header, + &sub_error_list, false); + // Parse delay_percentage_numerator + ParseJsonObjectField(json_object, "delayPercentageNumerator", + &fault_injection_policy.delay_percentage_numerator, + &sub_error_list, false); + // Parse delay_percentage_denominator + if (ParseJsonObjectField( + json_object, "delayPercentageDenominator", + &fault_injection_policy.delay_percentage_denominator, + &sub_error_list, false)) { + if (fault_injection_policy.delay_percentage_denominator != 100 && + fault_injection_policy.delay_percentage_denominator != 10000 && + fault_injection_policy.delay_percentage_denominator != 1000000) { + sub_error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "field:delayPercentageDenominator error:Denominator can only be " + "one of " + "100, 10000, 1000000")); + } + } + // Parse max_faults + if (ParseJsonObjectField(json_object, "maxFaults", + &fault_injection_policy.max_faults, + &sub_error_list, false)) { + if (fault_injection_policy.max_faults < 0) { + sub_error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "field:maxFaults error:should be zero or positive")); + } + } + if (!sub_error_list.empty()) { + // Can't use GRPC_ERROR_CREATE_FROM_VECTOR() here, because the error + // string is not static in this case. + grpc_error_handle error = GRPC_ERROR_CREATE_FROM_COPIED_STRING( + absl::StrCat("failed to parse faultInjectionPolicy index ", i) + .c_str()); + for (size_t i = 0; i < sub_error_list.size(); ++i) { + error = grpc_error_add_child(error, sub_error_list[i]); + } + error_list->push_back(error); + } + policies.push_back(std::move(fault_injection_policy)); + } + return policies; +} + +} // namespace + +std::unique_ptr<ServiceConfigParser::ParsedConfig> +FaultInjectionServiceConfigParser::ParsePerMethodParams( + const grpc_channel_args* args, const Json& json, grpc_error_handle* error) { + GPR_DEBUG_ASSERT(error != nullptr && *error == GRPC_ERROR_NONE); + // Only parse fault injection policy if the following channel arg is present. + if (!grpc_channel_args_find_bool( + args, GRPC_ARG_PARSE_FAULT_INJECTION_METHOD_CONFIG, false)) { + return nullptr; + } + // Parse fault injection policy from given Json + std::vector<FaultInjectionMethodParsedConfig::FaultInjectionPolicy> + fault_injection_policies; + std::vector<grpc_error_handle> error_list; + const Json::Array* policies_json_array; + if (ParseJsonObjectField(json.object_value(), "faultInjectionPolicy", + &policies_json_array, &error_list)) { + fault_injection_policies = + ParseFaultInjectionPolicy(*policies_json_array, &error_list); + } + *error = GRPC_ERROR_CREATE_FROM_VECTOR("Fault injection parser", &error_list); + if (*error != GRPC_ERROR_NONE || fault_injection_policies.empty()) { + return nullptr; + } + return absl::make_unique<FaultInjectionMethodParsedConfig>( + std::move(fault_injection_policies)); +} + +void FaultInjectionServiceConfigParser::Register() { + g_fault_injection_parser_index = ServiceConfigParser::RegisterParser( + absl::make_unique<FaultInjectionServiceConfigParser>()); +} + +size_t FaultInjectionServiceConfigParser::ParserIndex() { + return g_fault_injection_parser_index; +} + +} // namespace grpc_core diff --git a/grpc/src/core/ext/filters/fault_injection/service_config_parser.h b/grpc/src/core/ext/filters/fault_injection/service_config_parser.h new file mode 100644 index 00000000..a885539c --- /dev/null +++ b/grpc/src/core/ext/filters/fault_injection/service_config_parser.h @@ -0,0 +1,85 @@ +// +// Copyright 2021 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_FILTERS_FAULT_INJECTION_SERVICE_CONFIG_PARSER_H +#define GRPC_CORE_EXT_FILTERS_FAULT_INJECTION_SERVICE_CONFIG_PARSER_H + +#include <grpc/support/port_platform.h> + +#include <vector> + +#include "src/core/ext/filters/client_channel/service_config.h" +#include "src/core/lib/iomgr/exec_ctx.h" + +namespace grpc_core { + +class FaultInjectionMethodParsedConfig + : public ServiceConfigParser::ParsedConfig { + public: + struct FaultInjectionPolicy { + grpc_status_code abort_code = GRPC_STATUS_OK; + std::string abort_message; + std::string abort_code_header; + std::string abort_percentage_header; + uint32_t abort_percentage_numerator = 0; + uint32_t abort_percentage_denominator = 100; + + grpc_millis delay = 0; + std::string delay_header; + std::string delay_percentage_header; + uint32_t delay_percentage_numerator = 0; + uint32_t delay_percentage_denominator = 100; + + // By default, the max allowed active faults are unlimited. + uint32_t max_faults = std::numeric_limits<uint32_t>::max(); + }; + + explicit FaultInjectionMethodParsedConfig( + std::vector<FaultInjectionPolicy> fault_injection_policies) + : fault_injection_policies_(std::move(fault_injection_policies)) {} + + // Returns the fault injection policy at certain index. + // There might be multiple fault injection policies functioning at the same + // time. The order between the policies are stable, and an index is used to + // keep track of their relative positions. The FaultInjectionFilter uses this + // method to access the parsed fault injection policy in service config, + // whether it came from xDS resolver or directly from service config + const FaultInjectionPolicy* fault_injection_policy(int index) const { + if (static_cast<size_t>(index) >= fault_injection_policies_.size()) { + return nullptr; + } + return &fault_injection_policies_[index]; + } + + private: + std::vector<FaultInjectionPolicy> fault_injection_policies_; +}; + +class FaultInjectionServiceConfigParser : public ServiceConfigParser::Parser { + public: + // Parses the per-method service config for fault injection filter. + std::unique_ptr<ServiceConfigParser::ParsedConfig> ParsePerMethodParams( + const grpc_channel_args* args, const Json& json, + grpc_error_handle* error) override; + // Returns the parser index for FaultInjectionServiceConfigParser. + static size_t ParserIndex(); + // Registers FaultInjectionServiceConfigParser to ServiceConfigParser. + static void Register(); +}; + +} // namespace grpc_core + +#endif // GRPC_CORE_EXT_FILTERS_FAULT_INJECTION_SERVICE_CONFIG_PARSER_H diff --git a/grpc/src/core/ext/filters/http/client/http_client_filter.cc b/grpc/src/core/ext/filters/http/client/http_client_filter.cc index 3a4825f8..ef737f0e 100644 --- a/grpc/src/core/ext/filters/http/client/http_client_filter.cc +++ b/grpc/src/core/ext/filters/http/client/http_client_filter.cc @@ -48,10 +48,12 @@ /* default maximum size of payload eligible for GET request */ static constexpr size_t kMaxPayloadSizeForGet = 2048; -static void recv_initial_metadata_ready(void* user_data, grpc_error* error); -static void recv_trailing_metadata_ready(void* user_data, grpc_error* error); -static void on_send_message_next_done(void* arg, grpc_error* error); -static void send_message_on_complete(void* arg, grpc_error* error); +static void recv_initial_metadata_ready(void* user_data, + grpc_error_handle error); +static void recv_trailing_metadata_ready(void* user_data, + grpc_error_handle error); +static void on_send_message_next_done(void* arg, grpc_error_handle error); +static void send_message_on_complete(void* arg, grpc_error_handle error); namespace { struct call_data { @@ -81,14 +83,14 @@ struct call_data { grpc_linked_mdelem user_agent; // State for handling recv_initial_metadata ops. grpc_metadata_batch* recv_initial_metadata; - grpc_error* recv_initial_metadata_error = GRPC_ERROR_NONE; + grpc_error_handle recv_initial_metadata_error = GRPC_ERROR_NONE; grpc_closure* original_recv_initial_metadata_ready = nullptr; grpc_closure recv_initial_metadata_ready; // State for handling recv_trailing_metadata ops. grpc_metadata_batch* recv_trailing_metadata; grpc_closure* original_recv_trailing_metadata_ready; grpc_closure recv_trailing_metadata_ready; - grpc_error* recv_trailing_metadata_error = GRPC_ERROR_NONE; + grpc_error_handle recv_trailing_metadata_error = GRPC_ERROR_NONE; bool seen_recv_trailing_metadata_ready = false; // State for handling send_message ops. grpc_transport_stream_op_batch* send_message_batch; @@ -108,7 +110,8 @@ struct channel_data { }; } // namespace -static grpc_error* client_filter_incoming_metadata(grpc_metadata_batch* b) { +static grpc_error_handle client_filter_incoming_metadata( + grpc_metadata_batch* b) { if (b->idx.named.status != nullptr) { /* If both gRPC status and HTTP status are provided in the response, we * should prefer the gRPC status code, as mentioned in @@ -123,7 +126,7 @@ static grpc_error* client_filter_incoming_metadata(grpc_metadata_batch* b) { GPR_DUMP_ASCII); std::string msg = absl::StrCat("Received http2 header with status: ", val); - grpc_error* e = grpc_error_set_str( + grpc_error_handle e = grpc_error_set_str( grpc_error_set_int( grpc_error_set_str( GRPC_ERROR_CREATE_FROM_STATIC_STRING( @@ -182,7 +185,8 @@ static grpc_error* client_filter_incoming_metadata(grpc_metadata_batch* b) { return GRPC_ERROR_NONE; } -static void recv_initial_metadata_ready(void* user_data, grpc_error* error) { +static void recv_initial_metadata_ready(void* user_data, + grpc_error_handle error) { grpc_call_element* elem = static_cast<grpc_call_element*>(user_data); call_data* calld = static_cast<call_data*>(elem->call_data); if (error == GRPC_ERROR_NONE) { @@ -201,7 +205,8 @@ static void recv_initial_metadata_ready(void* user_data, grpc_error* error) { grpc_core::Closure::Run(DEBUG_LOCATION, closure, error); } -static void recv_trailing_metadata_ready(void* user_data, grpc_error* error) { +static void recv_trailing_metadata_ready(void* user_data, + grpc_error_handle error) { grpc_call_element* elem = static_cast<grpc_call_element*>(user_data); call_data* calld = static_cast<call_data*>(elem->call_data); if (calld->original_recv_initial_metadata_ready != nullptr) { @@ -223,7 +228,7 @@ static void recv_trailing_metadata_ready(void* user_data, grpc_error* error) { calld->original_recv_trailing_metadata_ready, error); } -static void send_message_on_complete(void* arg, grpc_error* error) { +static void send_message_on_complete(void* arg, grpc_error_handle error) { grpc_call_element* elem = static_cast<grpc_call_element*>(arg); call_data* calld = static_cast<call_data*>(elem->call_data); calld->send_message_cache.Destroy(); @@ -234,9 +239,10 @@ static void send_message_on_complete(void* arg, grpc_error* error) { // Pulls a slice from the send_message byte stream, updating // calld->send_message_bytes_read. -static grpc_error* pull_slice_from_send_message(call_data* calld) { +static grpc_error_handle pull_slice_from_send_message(call_data* calld) { grpc_slice incoming_slice; - grpc_error* error = calld->send_message_caching_stream->Pull(&incoming_slice); + grpc_error_handle error = + calld->send_message_caching_stream->Pull(&incoming_slice); if (error == GRPC_ERROR_NONE) { calld->send_message_bytes_read += GRPC_SLICE_LENGTH(incoming_slice); grpc_slice_unref_internal(incoming_slice); @@ -249,10 +255,11 @@ static grpc_error* pull_slice_from_send_message(call_data* calld) { // calld->send_message_caching_stream->length(), then we have completed // reading from the byte stream; otherwise, an async read has been dispatched // and on_send_message_next_done() will be invoked when it is complete. -static grpc_error* read_all_available_send_message_data(call_data* calld) { +static grpc_error_handle read_all_available_send_message_data( + call_data* calld) { while (calld->send_message_caching_stream->Next( SIZE_MAX, &calld->on_send_message_next_done)) { - grpc_error* error = pull_slice_from_send_message(calld); + grpc_error_handle error = pull_slice_from_send_message(calld); if (error != GRPC_ERROR_NONE) return error; if (calld->send_message_bytes_read == calld->send_message_caching_stream->length()) { @@ -263,7 +270,7 @@ static grpc_error* read_all_available_send_message_data(call_data* calld) { } // Async callback for ByteStream::Next(). -static void on_send_message_next_done(void* arg, grpc_error* error) { +static void on_send_message_next_done(void* arg, grpc_error_handle error) { grpc_call_element* elem = static_cast<grpc_call_element*>(arg); call_data* calld = static_cast<call_data*>(elem->call_data); if (error != GRPC_ERROR_NONE) { @@ -301,8 +308,8 @@ static char* slice_buffer_to_string(grpc_slice_buffer* slice_buffer) { // Modifies the path entry in the batch's send_initial_metadata to // append the base64-encoded query for a GET request. -static grpc_error* update_path_for_get(grpc_call_element* elem, - grpc_transport_stream_op_batch* batch) { +static grpc_error_handle update_path_for_get( + grpc_call_element* elem, grpc_transport_stream_op_batch* batch) { call_data* calld = static_cast<call_data*>(elem->call_data); grpc_slice path_slice = GRPC_MDVALUE(batch->payload->send_initial_metadata.send_initial_metadata @@ -376,7 +383,7 @@ static void http_client_start_transport_stream_op_batch( &calld->recv_trailing_metadata_ready; } - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; bool batch_will_be_handled_asynchronously = false; if (batch->send_initial_metadata) { // Decide which HTTP VERB to use. We use GET if the request is marked @@ -475,7 +482,7 @@ done: } /* Constructor for call_data */ -static grpc_error* http_client_init_call_elem( +static grpc_error_handle http_client_init_call_elem( grpc_call_element* elem, const grpc_call_element_args* args) { new (elem->call_data) call_data(elem, *args); return GRPC_ERROR_NONE; @@ -561,7 +568,7 @@ static grpc_core::ManagedMemorySlice user_agent_from_args( } /* Constructor for channel_data */ -static grpc_error* http_client_init_channel_elem( +static grpc_error_handle http_client_init_channel_elem( grpc_channel_element* elem, grpc_channel_element_args* args) { channel_data* chand = static_cast<channel_data*>(elem->channel_data); GPR_ASSERT(!args->is_last); diff --git a/grpc/src/core/ext/filters/http/client_authority_filter.cc b/grpc/src/core/ext/filters/http/client_authority_filter.cc index 9511d259..f44ef853 100644 --- a/grpc/src/core/ext/filters/http/client_authority_filter.cc +++ b/grpc/src/core/ext/filters/http/client_authority_filter.cc @@ -57,7 +57,7 @@ void client_authority_start_transport_stream_op_batch( if (batch->send_initial_metadata && batch->payload->send_initial_metadata.send_initial_metadata->idx.named .authority == nullptr) { - grpc_error* error = grpc_metadata_batch_add_head( + grpc_error_handle error = grpc_metadata_batch_add_head( batch->payload->send_initial_metadata.send_initial_metadata, &calld->authority_storage, GRPC_MDELEM_REF(chand->default_authority_mdelem), GRPC_BATCH_AUTHORITY); @@ -72,7 +72,7 @@ void client_authority_start_transport_stream_op_batch( } /* Constructor for call_data */ -grpc_error* client_authority_init_call_elem( +grpc_error_handle client_authority_init_call_elem( grpc_call_element* elem, const grpc_call_element_args* args) { call_data* calld = static_cast<call_data*>(elem->call_data); calld->call_combiner = args->call_combiner; @@ -85,7 +85,7 @@ void client_authority_destroy_call_elem( grpc_closure* /*ignored*/) {} /* Constructor for channel_data */ -grpc_error* client_authority_init_channel_elem( +grpc_error_handle client_authority_init_channel_elem( grpc_channel_element* elem, grpc_channel_element_args* args) { channel_data* chand = static_cast<channel_data*>(elem->channel_data); const grpc_arg* default_authority_arg = diff --git a/grpc/src/core/ext/filters/http/message_compress/message_compress_filter.cc b/grpc/src/core/ext/filters/http/message_compress/message_compress_filter.cc index 09c914fa..0fc85b1e 100644 --- a/grpc/src/core/ext/filters/http/message_compress/message_compress_filter.cc +++ b/grpc/src/core/ext/filters/http/message_compress/message_compress_filter.cc @@ -131,25 +131,25 @@ class CallData { bool SkipMessageCompression(); void InitializeState(grpc_call_element* elem); - grpc_error* ProcessSendInitialMetadata(grpc_call_element* elem, - grpc_metadata_batch* initial_metadata); + grpc_error_handle ProcessSendInitialMetadata( + grpc_call_element* elem, grpc_metadata_batch* initial_metadata); // Methods for processing a send_message batch - static void StartSendMessageBatch(void* elem_arg, grpc_error* unused); - static void OnSendMessageNextDone(void* elem_arg, grpc_error* error); - grpc_error* PullSliceFromSendMessage(); + static void StartSendMessageBatch(void* elem_arg, grpc_error_handle unused); + static void OnSendMessageNextDone(void* elem_arg, grpc_error_handle error); + grpc_error_handle PullSliceFromSendMessage(); void ContinueReadingSendMessage(grpc_call_element* elem); void FinishSendMessage(grpc_call_element* elem); void SendMessageBatchContinue(grpc_call_element* elem); static void FailSendMessageBatchInCallCombiner(void* calld_arg, - grpc_error* error); + grpc_error_handle error); - static void SendMessageOnComplete(void* calld_arg, grpc_error* error); + static void SendMessageOnComplete(void* calld_arg, grpc_error_handle error); grpc_core::CallCombiner* call_combiner_; grpc_message_compression_algorithm message_compression_algorithm_ = GRPC_MESSAGE_COMPRESS_NONE; - grpc_error* cancel_error_ = GRPC_ERROR_NONE; + grpc_error_handle cancel_error_ = GRPC_ERROR_NONE; grpc_transport_stream_op_batch* send_message_batch_ = nullptr; bool seen_initial_metadata_ = false; /* Set to true, if the fields below are initialized. */ @@ -232,7 +232,7 @@ void CallData::InitializeState(grpc_call_element* elem) { grpc_schedule_on_exec_ctx); } -grpc_error* CallData::ProcessSendInitialMetadata( +grpc_error_handle CallData::ProcessSendInitialMetadata( grpc_call_element* elem, grpc_metadata_batch* initial_metadata) { ChannelData* channeld = static_cast<ChannelData*>(elem->channel_data); // Find the compression algorithm. @@ -246,7 +246,7 @@ grpc_error* CallData::ProcessSendInitialMetadata( grpc_compression_algorithm_to_stream_compression_algorithm( compression_algorithm); // Hint compression algorithm. - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; if (message_compression_algorithm_ != GRPC_MESSAGE_COMPRESS_NONE) { InitializeState(elem); error = grpc_metadata_batch_add_tail( @@ -281,7 +281,7 @@ grpc_error* CallData::ProcessSendInitialMetadata( return error; } -void CallData::SendMessageOnComplete(void* calld_arg, grpc_error* error) { +void CallData::SendMessageOnComplete(void* calld_arg, grpc_error_handle error) { CallData* calld = static_cast<CallData*>(calld_arg); grpc_slice_buffer_reset_and_unref_internal(&calld->slices_); grpc_core::Closure::Run(DEBUG_LOCATION, @@ -348,7 +348,7 @@ void CallData::FinishSendMessage(grpc_call_element* elem) { } void CallData::FailSendMessageBatchInCallCombiner(void* calld_arg, - grpc_error* error) { + grpc_error_handle error) { CallData* calld = static_cast<CallData*>(calld_arg); if (calld->send_message_batch_ != nullptr) { grpc_transport_stream_op_batch_finish_with_failure( @@ -359,9 +359,9 @@ void CallData::FailSendMessageBatchInCallCombiner(void* calld_arg, } // Pulls a slice from the send_message byte stream and adds it to slices_. -grpc_error* CallData::PullSliceFromSendMessage() { +grpc_error_handle CallData::PullSliceFromSendMessage() { grpc_slice incoming_slice; - grpc_error* error = + grpc_error_handle error = send_message_batch_->payload->send_message.send_message->Pull( &incoming_slice); if (error == GRPC_ERROR_NONE) { @@ -382,7 +382,7 @@ void CallData::ContinueReadingSendMessage(grpc_call_element* elem) { } while (send_message_batch_->payload->send_message.send_message->Next( ~static_cast<size_t>(0), &on_send_message_next_done_)) { - grpc_error* error = PullSliceFromSendMessage(); + grpc_error_handle error = PullSliceFromSendMessage(); if (error != GRPC_ERROR_NONE) { // Closure callback; does not take ownership of error. FailSendMessageBatchInCallCombiner(this, error); @@ -398,7 +398,7 @@ void CallData::ContinueReadingSendMessage(grpc_call_element* elem) { } // Async callback for ByteStream::Next(). -void CallData::OnSendMessageNextDone(void* elem_arg, grpc_error* error) { +void CallData::OnSendMessageNextDone(void* elem_arg, grpc_error_handle error) { grpc_call_element* elem = static_cast<grpc_call_element*>(elem_arg); CallData* calld = static_cast<CallData*>(elem->call_data); if (error != GRPC_ERROR_NONE) { @@ -421,7 +421,8 @@ void CallData::OnSendMessageNextDone(void* elem_arg, grpc_error* error) { } } -void CallData::StartSendMessageBatch(void* elem_arg, grpc_error* /*unused*/) { +void CallData::StartSendMessageBatch(void* elem_arg, + grpc_error_handle /*unused*/) { grpc_call_element* elem = static_cast<grpc_call_element*>(elem_arg); CallData* calld = static_cast<CallData*>(elem->call_data); if (calld->SkipMessageCompression()) { @@ -458,7 +459,7 @@ void CallData::CompressStartTransportStreamOpBatch( // Handle send_initial_metadata. if (batch->send_initial_metadata) { GPR_ASSERT(!seen_initial_metadata_); - grpc_error* error = ProcessSendInitialMetadata( + grpc_error_handle error = ProcessSendInitialMetadata( elem, batch->payload->send_initial_metadata.send_initial_metadata); if (error != GRPC_ERROR_NONE) { grpc_transport_stream_op_batch_finish_with_failure(batch, error, @@ -503,8 +504,8 @@ void CompressStartTransportStreamOpBatch( } /* Constructor for call_data */ -grpc_error* CompressInitCallElem(grpc_call_element* elem, - const grpc_call_element_args* args) { +grpc_error_handle CompressInitCallElem(grpc_call_element* elem, + const grpc_call_element_args* args) { new (elem->call_data) CallData(elem, *args); return GRPC_ERROR_NONE; } @@ -518,8 +519,8 @@ void CompressDestroyCallElem(grpc_call_element* elem, } /* Constructor for ChannelData */ -grpc_error* CompressInitChannelElem(grpc_channel_element* elem, - grpc_channel_element_args* args) { +grpc_error_handle CompressInitChannelElem(grpc_channel_element* elem, + grpc_channel_element_args* args) { new (elem->channel_data) ChannelData(args); return GRPC_ERROR_NONE; } diff --git a/grpc/src/core/ext/filters/http/message_compress/message_decompress_filter.cc b/grpc/src/core/ext/filters/http/message_compress/message_decompress_filter.cc index 4ab8a563..426dd903 100644 --- a/grpc/src/core/ext/filters/http/message_compress/message_decompress_filter.cc +++ b/grpc/src/core/ext/filters/http/message_compress/message_decompress_filter.cc @@ -89,24 +89,24 @@ class CallData { grpc_call_element* elem, grpc_transport_stream_op_batch* batch); private: - static void OnRecvInitialMetadataReady(void* arg, grpc_error* error); + static void OnRecvInitialMetadataReady(void* arg, grpc_error_handle error); // Methods for processing a receive message event void MaybeResumeOnRecvMessageReady(); - static void OnRecvMessageReady(void* arg, grpc_error* error); - static void OnRecvMessageNextDone(void* arg, grpc_error* error); - grpc_error* PullSliceFromRecvMessage(); + static void OnRecvMessageReady(void* arg, grpc_error_handle error); + static void OnRecvMessageNextDone(void* arg, grpc_error_handle error); + grpc_error_handle PullSliceFromRecvMessage(); void ContinueReadingRecvMessage(); void FinishRecvMessage(); - void ContinueRecvMessageReadyCallback(grpc_error* error); + void ContinueRecvMessageReadyCallback(grpc_error_handle error); // Methods for processing a recv_trailing_metadata event void MaybeResumeOnRecvTrailingMetadataReady(); - static void OnRecvTrailingMetadataReady(void* arg, grpc_error* error); + static void OnRecvTrailingMetadataReady(void* arg, grpc_error_handle error); CallCombiner* call_combiner_; // Overall error for the call - grpc_error* error_ = GRPC_ERROR_NONE; + grpc_error_handle error_ = GRPC_ERROR_NONE; // Fields for handling recv_initial_metadata_ready callback grpc_closure on_recv_initial_metadata_ready_; grpc_closure* original_recv_initial_metadata_ready_ = nullptr; @@ -130,7 +130,7 @@ class CallData { bool seen_recv_trailing_metadata_ready_ = false; grpc_closure on_recv_trailing_metadata_ready_; grpc_closure* original_recv_trailing_metadata_ready_ = nullptr; - grpc_error* on_recv_trailing_metadata_ready_error_ = GRPC_ERROR_NONE; + grpc_error_handle on_recv_trailing_metadata_ready_error_ = GRPC_ERROR_NONE; }; grpc_message_compression_algorithm DecodeMessageCompressionAlgorithm( @@ -149,7 +149,7 @@ grpc_message_compression_algorithm DecodeMessageCompressionAlgorithm( return algorithm; } -void CallData::OnRecvInitialMetadataReady(void* arg, grpc_error* error) { +void CallData::OnRecvInitialMetadataReady(void* arg, grpc_error_handle error) { CallData* calld = static_cast<CallData*>(arg); if (error == GRPC_ERROR_NONE) { grpc_linked_mdelem* grpc_encoding = @@ -174,7 +174,7 @@ void CallData::MaybeResumeOnRecvMessageReady() { } } -void CallData::OnRecvMessageReady(void* arg, grpc_error* error) { +void CallData::OnRecvMessageReady(void* arg, grpc_error_handle error) { CallData* calld = static_cast<CallData*>(arg); if (error == GRPC_ERROR_NONE) { if (calld->original_recv_initial_metadata_ready_ != nullptr) { @@ -218,7 +218,7 @@ void CallData::ContinueReadingRecvMessage() { while ((*recv_message_) ->Next((*recv_message_)->length() - recv_slices_.length, &on_recv_message_next_done_)) { - grpc_error* error = PullSliceFromRecvMessage(); + grpc_error_handle error = PullSliceFromRecvMessage(); if (error != GRPC_ERROR_NONE) { return ContinueRecvMessageReadyCallback(error); } @@ -229,16 +229,16 @@ void CallData::ContinueReadingRecvMessage() { } } -grpc_error* CallData::PullSliceFromRecvMessage() { +grpc_error_handle CallData::PullSliceFromRecvMessage() { grpc_slice incoming_slice; - grpc_error* error = (*recv_message_)->Pull(&incoming_slice); + grpc_error_handle error = (*recv_message_)->Pull(&incoming_slice); if (error == GRPC_ERROR_NONE) { grpc_slice_buffer_add(&recv_slices_, incoming_slice); } return error; } -void CallData::OnRecvMessageNextDone(void* arg, grpc_error* error) { +void CallData::OnRecvMessageNextDone(void* arg, grpc_error_handle error) { CallData* calld = static_cast<CallData*>(arg); if (error != GRPC_ERROR_NONE) { return calld->ContinueRecvMessageReadyCallback(GRPC_ERROR_REF(error)); @@ -283,7 +283,7 @@ void CallData::FinishRecvMessage() { ContinueRecvMessageReadyCallback(GRPC_ERROR_REF(error_)); } -void CallData::ContinueRecvMessageReadyCallback(grpc_error* error) { +void CallData::ContinueRecvMessageReadyCallback(grpc_error_handle error) { MaybeResumeOnRecvTrailingMetadataReady(); // The surface will clean up the receiving stream if there is an error. grpc_closure* closure = original_recv_message_ready_; @@ -294,14 +294,14 @@ void CallData::ContinueRecvMessageReadyCallback(grpc_error* error) { void CallData::MaybeResumeOnRecvTrailingMetadataReady() { if (seen_recv_trailing_metadata_ready_) { seen_recv_trailing_metadata_ready_ = false; - grpc_error* error = on_recv_trailing_metadata_ready_error_; + grpc_error_handle error = on_recv_trailing_metadata_ready_error_; on_recv_trailing_metadata_ready_error_ = GRPC_ERROR_NONE; GRPC_CALL_COMBINER_START(call_combiner_, &on_recv_trailing_metadata_ready_, error, "Continuing OnRecvTrailingMetadataReady"); } } -void CallData::OnRecvTrailingMetadataReady(void* arg, grpc_error* error) { +void CallData::OnRecvTrailingMetadataReady(void* arg, grpc_error_handle error) { CallData* calld = static_cast<CallData*>(arg); if (calld->original_recv_initial_metadata_ready_ != nullptr || calld->original_recv_message_ready_ != nullptr) { @@ -356,8 +356,8 @@ void DecompressStartTransportStreamOpBatch( calld->DecompressStartTransportStreamOpBatch(elem, batch); } -grpc_error* DecompressInitCallElem(grpc_call_element* elem, - const grpc_call_element_args* args) { +grpc_error_handle DecompressInitCallElem(grpc_call_element* elem, + const grpc_call_element_args* args) { ChannelData* chand = static_cast<ChannelData*>(elem->channel_data); new (elem->call_data) CallData(*args, chand); return GRPC_ERROR_NONE; @@ -370,8 +370,8 @@ void DecompressDestroyCallElem(grpc_call_element* elem, calld->~CallData(); } -grpc_error* DecompressInitChannelElem(grpc_channel_element* elem, - grpc_channel_element_args* args) { +grpc_error_handle DecompressInitChannelElem(grpc_channel_element* elem, + grpc_channel_element_args* args) { ChannelData* chand = static_cast<ChannelData*>(elem->channel_data); new (chand) ChannelData(args); return GRPC_ERROR_NONE; diff --git a/grpc/src/core/ext/filters/http/server/http_server_filter.cc b/grpc/src/core/ext/filters/http/server/http_server_filter.cc index e4ece548..226ba020 100644 --- a/grpc/src/core/ext/filters/http/server/http_server_filter.cc +++ b/grpc/src/core/ext/filters/http/server/http_server_filter.cc @@ -35,9 +35,11 @@ #define EXPECTED_CONTENT_TYPE "application/grpc" #define EXPECTED_CONTENT_TYPE_LENGTH (sizeof(EXPECTED_CONTENT_TYPE) - 1) -static void hs_recv_initial_metadata_ready(void* user_data, grpc_error* err); -static void hs_recv_trailing_metadata_ready(void* user_data, grpc_error* err); -static void hs_recv_message_ready(void* user_data, grpc_error* err); +static void hs_recv_initial_metadata_ready(void* user_data, + grpc_error_handle err); +static void hs_recv_trailing_metadata_ready(void* user_data, + grpc_error_handle err); +static void hs_recv_message_ready(void* user_data, grpc_error_handle err); namespace { @@ -74,7 +76,7 @@ struct call_data { // State for intercepting recv_initial_metadata. grpc_closure recv_initial_metadata_ready; - grpc_error* recv_initial_metadata_ready_error = GRPC_ERROR_NONE; + grpc_error_handle recv_initial_metadata_ready_error = GRPC_ERROR_NONE; grpc_closure* original_recv_initial_metadata_ready; grpc_metadata_batch* recv_initial_metadata = nullptr; uint32_t* recv_initial_metadata_flags; @@ -89,7 +91,7 @@ struct call_data { // State for intercepting recv_trailing_metadata grpc_closure recv_trailing_metadata_ready; grpc_closure* original_recv_trailing_metadata_ready; - grpc_error* recv_trailing_metadata_ready_error; + grpc_error_handle recv_trailing_metadata_ready_error; bool seen_recv_trailing_metadata_ready = false; }; @@ -99,7 +101,7 @@ struct channel_data { } // namespace -static grpc_error* hs_filter_outgoing_metadata(grpc_metadata_batch* b) { +static grpc_error_handle hs_filter_outgoing_metadata(grpc_metadata_batch* b) { if (b->idx.named.grpc_message != nullptr) { grpc_slice pct_encoded_msg = grpc_percent_encode_slice( GRPC_MDVALUE(b->idx.named.grpc_message->md), @@ -114,8 +116,8 @@ static grpc_error* hs_filter_outgoing_metadata(grpc_metadata_batch* b) { return GRPC_ERROR_NONE; } -static void hs_add_error(const char* error_name, grpc_error** cumulative, - grpc_error* new_err) { +static void hs_add_error(const char* error_name, grpc_error_handle* cumulative, + grpc_error_handle new_err) { if (new_err == GRPC_ERROR_NONE) return; if (*cumulative == GRPC_ERROR_NONE) { *cumulative = GRPC_ERROR_CREATE_FROM_COPIED_STRING(error_name); @@ -149,10 +151,10 @@ static bool md_strict_equal(grpc_mdelem a, grpc_mdelem b_static) { } } -static grpc_error* hs_filter_incoming_metadata(grpc_call_element* elem, - grpc_metadata_batch* b) { +static grpc_error_handle hs_filter_incoming_metadata(grpc_call_element* elem, + grpc_metadata_batch* b) { call_data* calld = static_cast<call_data*>(elem->call_data); - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; static const char* error_name = "Failed processing incoming headers"; if (b->idx.named.method != nullptr) { @@ -330,7 +332,8 @@ static grpc_error* hs_filter_incoming_metadata(grpc_call_element* elem, return error; } -static void hs_recv_initial_metadata_ready(void* user_data, grpc_error* err) { +static void hs_recv_initial_metadata_ready(void* user_data, + grpc_error_handle err) { grpc_call_element* elem = static_cast<grpc_call_element*>(user_data); call_data* calld = static_cast<call_data*>(elem->call_data); calld->seen_recv_initial_metadata_ready = true; @@ -367,7 +370,7 @@ static void hs_recv_initial_metadata_ready(void* user_data, grpc_error* err) { calld->original_recv_initial_metadata_ready, err); } -static void hs_recv_message_ready(void* user_data, grpc_error* err) { +static void hs_recv_message_ready(void* user_data, grpc_error_handle err) { grpc_call_element* elem = static_cast<grpc_call_element*>(user_data); call_data* calld = static_cast<call_data*>(elem->call_data); calld->seen_recv_message_ready = true; @@ -392,7 +395,8 @@ static void hs_recv_message_ready(void* user_data, grpc_error* err) { } } -static void hs_recv_trailing_metadata_ready(void* user_data, grpc_error* err) { +static void hs_recv_trailing_metadata_ready(void* user_data, + grpc_error_handle err) { grpc_call_element* elem = static_cast<grpc_call_element*>(user_data); call_data* calld = static_cast<call_data*>(elem->call_data); if (!calld->seen_recv_initial_metadata_ready) { @@ -410,13 +414,13 @@ static void hs_recv_trailing_metadata_ready(void* user_data, grpc_error* err) { calld->original_recv_trailing_metadata_ready, err); } -static grpc_error* hs_mutate_op(grpc_call_element* elem, - grpc_transport_stream_op_batch* op) { +static grpc_error_handle hs_mutate_op(grpc_call_element* elem, + grpc_transport_stream_op_batch* op) { /* grab pointers to our data from the call element */ call_data* calld = static_cast<call_data*>(elem->call_data); if (op->send_initial_metadata) { - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; static const char* error_name = "Failed sending initial metadata"; hs_add_error( error_name, &error, @@ -463,7 +467,7 @@ static grpc_error* hs_mutate_op(grpc_call_element* elem, } if (op->send_trailing_metadata) { - grpc_error* error = hs_filter_outgoing_metadata( + grpc_error_handle error = hs_filter_outgoing_metadata( op->payload->send_trailing_metadata.send_trailing_metadata); if (error != GRPC_ERROR_NONE) return error; } @@ -475,7 +479,7 @@ static void hs_start_transport_stream_op_batch( grpc_call_element* elem, grpc_transport_stream_op_batch* op) { GPR_TIMER_SCOPE("hs_start_transport_stream_op_batch", 0); call_data* calld = static_cast<call_data*>(elem->call_data); - grpc_error* error = hs_mutate_op(elem, op); + grpc_error_handle error = hs_mutate_op(elem, op); if (error != GRPC_ERROR_NONE) { grpc_transport_stream_op_batch_finish_with_failure(op, error, calld->call_combiner); @@ -485,8 +489,8 @@ static void hs_start_transport_stream_op_batch( } /* Constructor for call_data */ -static grpc_error* hs_init_call_elem(grpc_call_element* elem, - const grpc_call_element_args* args) { +static grpc_error_handle hs_init_call_elem(grpc_call_element* elem, + const grpc_call_element_args* args) { new (elem->call_data) call_data(elem, *args); return GRPC_ERROR_NONE; } @@ -500,8 +504,8 @@ static void hs_destroy_call_elem(grpc_call_element* elem, } /* Constructor for channel_data */ -static grpc_error* hs_init_channel_elem(grpc_channel_element* elem, - grpc_channel_element_args* args) { +static grpc_error_handle hs_init_channel_elem(grpc_channel_element* elem, + grpc_channel_element_args* args) { channel_data* chand = static_cast<channel_data*>(elem->channel_data); GPR_ASSERT(!args->is_last); chand->surface_user_agent = grpc_channel_arg_get_bool( diff --git a/grpc/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc b/grpc/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc index 5d578307..46af805f 100644 --- a/grpc/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc +++ b/grpc/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc @@ -32,9 +32,9 @@ #include "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.h" #include "src/core/ext/filters/load_reporting/registered_opencensus_objects.h" #include "src/core/ext/filters/load_reporting/server_load_reporting_filter.h" +#include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/context.h" -#include "src/core/lib/iomgr/parse_address.h" #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/socket_utils.h" @@ -50,7 +50,7 @@ constexpr char kEncodedIpv6AddressLengthString[] = "32"; constexpr char kEmptyAddressLengthString[] = "00"; constexpr size_t kLengthPrefixSize = 2; -grpc_error* ServerLoadReportingChannelData::Init( +grpc_error_handle ServerLoadReportingChannelData::Init( grpc_channel_element* /* elem */, grpc_channel_element_args* args) { GPR_ASSERT(!args->is_last); // Find and record the peer_identity. @@ -72,7 +72,7 @@ grpc_error* ServerLoadReportingChannelData::Init( void ServerLoadReportingCallData::Destroy( grpc_call_element* elem, const grpc_call_final_info* final_info, - grpc_closure* then_call_closure) { + grpc_closure* /*then_call_closure*/) { ServerLoadReportingChannelData* chand = reinterpret_cast<ServerLoadReportingChannelData*>(elem->channel_data); // Only record an end if we've recorded its corresponding start, which is @@ -200,7 +200,7 @@ void ServerLoadReportingCallData::StoreClientIpAndLrToken(const char* lr_token, strncpy(cur_pos, lr_token, lr_token_len); } GPR_ASSERT(cur_pos + lr_token_len - client_ip_and_lr_token_ == - client_ip_and_lr_token_len_); + long(client_ip_and_lr_token_len_)); } grpc_filtered_mdelem ServerLoadReportingCallData::RecvInitialMetadataFilter( @@ -232,8 +232,8 @@ grpc_filtered_mdelem ServerLoadReportingCallData::RecvInitialMetadataFilter( return GRPC_FILTERED_MDELEM(md); } -void ServerLoadReportingCallData::RecvInitialMetadataReady(void* arg, - grpc_error* err) { +void ServerLoadReportingCallData::RecvInitialMetadataReady( + void* arg, grpc_error_handle err) { grpc_call_element* elem = reinterpret_cast<grpc_call_element*>(arg); ServerLoadReportingCallData* calld = reinterpret_cast<ServerLoadReportingCallData*>(elem->call_data); @@ -264,8 +264,8 @@ void ServerLoadReportingCallData::RecvInitialMetadataReady(void* arg, GRPC_ERROR_REF(err)); } -grpc_error* ServerLoadReportingCallData::Init( - grpc_call_element* elem, const grpc_call_element_args* args) { +grpc_error_handle ServerLoadReportingCallData::Init( + grpc_call_element* elem, const grpc_call_element_args* /*args*/) { service_method_ = grpc_empty_slice(); GRPC_CLOSURE_INIT(&recv_initial_metadata_ready_, RecvInitialMetadataReady, elem, grpc_schedule_on_exec_ctx); diff --git a/grpc/src/core/ext/filters/load_reporting/server_load_reporting_filter.h b/grpc/src/core/ext/filters/load_reporting/server_load_reporting_filter.h index 3bfdc989..47390fa0 100644 --- a/grpc/src/core/ext/filters/load_reporting/server_load_reporting_filter.h +++ b/grpc/src/core/ext/filters/load_reporting/server_load_reporting_filter.h @@ -30,8 +30,8 @@ namespace grpc { class ServerLoadReportingChannelData : public ChannelData { public: - grpc_error* Init(grpc_channel_element* elem, - grpc_channel_element_args* args) override; + grpc_error_handle Init(grpc_channel_element* elem, + grpc_channel_element_args* args) override; // Getters. const char* peer_identity() { return peer_identity_; } @@ -45,8 +45,8 @@ class ServerLoadReportingChannelData : public ChannelData { class ServerLoadReportingCallData : public CallData { public: - grpc_error* Init(grpc_call_element* elem, - const grpc_call_element_args* args) override; + grpc_error_handle Init(grpc_call_element* elem, + const grpc_call_element_args* args) override; void Destroy(grpc_call_element* elem, const grpc_call_final_info* final_info, grpc_closure* then_call_closure) override; @@ -68,7 +68,7 @@ class ServerLoadReportingCallData : public CallData { static const char* GetStatusTagForStatus(grpc_status_code status); // Records the call start. - static void RecvInitialMetadataReady(void* arg, grpc_error* err); + static void RecvInitialMetadataReady(void* arg, grpc_error_handle err); // From the initial metadata, extracts the service_method_, target_host_, and // client_ip_and_lr_token_. diff --git a/grpc/src/core/ext/filters/max_age/max_age_filter.cc b/grpc/src/core/ext/filters/max_age/max_age_filter.cc index b417db51..97a4dc28 100644 --- a/grpc/src/core/ext/filters/max_age/max_age_filter.cc +++ b/grpc/src/core/ext/filters/max_age/max_age_filter.cc @@ -54,16 +54,16 @@ struct channel_data { grpc_channel_stack* channel_stack; /* Guards access to max_age_timer, max_age_timer_pending, max_age_grace_timer and max_age_grace_timer_pending */ - gpr_mu max_age_timer_mu; + grpc_core::Mutex max_age_timer_mu; /* True if the max_age timer callback is currently pending */ - bool max_age_timer_pending; + bool max_age_timer_pending ABSL_GUARDED_BY(max_age_timer_mu) = false; /* True if the max_age_grace timer callback is currently pending */ - bool max_age_grace_timer_pending; + bool max_age_grace_timer_pending ABSL_GUARDED_BY(max_age_timer_mu) = false; /* The timer for checking if the channel has reached its max age */ - grpc_timer max_age_timer; + grpc_timer max_age_timer ABSL_GUARDED_BY(max_age_timer_mu); /* The timer for checking if the max-aged channel has uesed up the grace period */ - grpc_timer max_age_grace_timer; + grpc_timer max_age_grace_timer ABSL_GUARDED_BY(max_age_timer_mu); /* The timer for checking if the channel's idle duration reaches max_connection_idle */ grpc_timer max_idle_timer; @@ -206,7 +206,8 @@ static void decrease_call_count(channel_data* chand) { } } -static void start_max_idle_timer_after_init(void* arg, grpc_error* /*error*/) { +static void start_max_idle_timer_after_init(void* arg, + grpc_error_handle /*error*/) { channel_data* chand = static_cast<channel_data*>(arg); /* Decrease call_count. If there are no active calls at this time, max_idle_timer will start here. If the number of active calls is not 0, @@ -258,15 +259,18 @@ class ConnectivityWatcher : public AsyncConnectivityStateWatcherInterface { } // namespace grpc_core -static void start_max_age_timer_after_init(void* arg, grpc_error* /*error*/) { +static void start_max_age_timer_after_init(void* arg, + grpc_error_handle /*error*/) { channel_data* chand = static_cast<channel_data*>(arg); - gpr_mu_lock(&chand->max_age_timer_mu); - chand->max_age_timer_pending = true; - GRPC_CHANNEL_STACK_REF(chand->channel_stack, "max_age max_age_timer"); - grpc_timer_init(&chand->max_age_timer, - grpc_core::ExecCtx::Get()->Now() + chand->max_connection_age, - &chand->close_max_age_channel); - gpr_mu_unlock(&chand->max_age_timer_mu); + { + grpc_core::MutexLock lock(&chand->max_age_timer_mu); + chand->max_age_timer_pending = true; + GRPC_CHANNEL_STACK_REF(chand->channel_stack, "max_age max_age_timer"); + grpc_timer_init( + &chand->max_age_timer, + grpc_core::ExecCtx::Get()->Now() + chand->max_connection_age, + &chand->close_max_age_channel); + } grpc_transport_op* op = grpc_make_transport_op(nullptr); op->start_connectivity_watch.reset(new grpc_core::ConnectivityWatcher(chand)); op->start_connectivity_watch_state = GRPC_CHANNEL_IDLE; @@ -275,19 +279,20 @@ static void start_max_age_timer_after_init(void* arg, grpc_error* /*error*/) { "max_age start_max_age_timer_after_init"); } -static void start_max_age_grace_timer_after_goaway_op(void* arg, - grpc_error* /*error*/) { +static void start_max_age_grace_timer_after_goaway_op( + void* arg, grpc_error_handle /*error*/) { channel_data* chand = static_cast<channel_data*>(arg); - gpr_mu_lock(&chand->max_age_timer_mu); - chand->max_age_grace_timer_pending = true; - GRPC_CHANNEL_STACK_REF(chand->channel_stack, "max_age max_age_grace_timer"); - grpc_timer_init( - &chand->max_age_grace_timer, - chand->max_connection_age_grace == GRPC_MILLIS_INF_FUTURE - ? GRPC_MILLIS_INF_FUTURE - : grpc_core::ExecCtx::Get()->Now() + chand->max_connection_age_grace, - &chand->force_close_max_age_channel); - gpr_mu_unlock(&chand->max_age_timer_mu); + { + grpc_core::MutexLock lock(&chand->max_age_timer_mu); + chand->max_age_grace_timer_pending = true; + GRPC_CHANNEL_STACK_REF(chand->channel_stack, "max_age max_age_grace_timer"); + grpc_timer_init(&chand->max_age_grace_timer, + chand->max_connection_age_grace == GRPC_MILLIS_INF_FUTURE + ? GRPC_MILLIS_INF_FUTURE + : grpc_core::ExecCtx::Get()->Now() + + chand->max_connection_age_grace, + &chand->force_close_max_age_channel); + } GRPC_CHANNEL_STACK_UNREF(chand->channel_stack, "max_age start_max_age_grace_timer_after_goaway_op"); } @@ -304,7 +309,7 @@ static void close_max_idle_channel(channel_data* chand) { elem->filter->start_transport_op(elem, op); } -static void max_idle_timer_cb(void* arg, grpc_error* error) { +static void max_idle_timer_cb(void* arg, grpc_error_handle error) { channel_data* chand = static_cast<channel_data*>(arg); if (error == GRPC_ERROR_NONE) { bool try_again = true; @@ -348,11 +353,12 @@ static void max_idle_timer_cb(void* arg, grpc_error* error) { GRPC_CHANNEL_STACK_UNREF(chand->channel_stack, "max_age max_idle_timer"); } -static void close_max_age_channel(void* arg, grpc_error* error) { +static void close_max_age_channel(void* arg, grpc_error_handle error) { channel_data* chand = static_cast<channel_data*>(arg); - gpr_mu_lock(&chand->max_age_timer_mu); - chand->max_age_timer_pending = false; - gpr_mu_unlock(&chand->max_age_timer_mu); + { + grpc_core::MutexLock lock(&chand->max_age_timer_mu); + chand->max_age_timer_pending = false; + } if (error == GRPC_ERROR_NONE) { GRPC_CHANNEL_STACK_REF(chand->channel_stack, "max_age start_max_age_grace_timer_after_goaway_op"); @@ -370,11 +376,12 @@ static void close_max_age_channel(void* arg, grpc_error* error) { GRPC_CHANNEL_STACK_UNREF(chand->channel_stack, "max_age max_age_timer"); } -static void force_close_max_age_channel(void* arg, grpc_error* error) { +static void force_close_max_age_channel(void* arg, grpc_error_handle error) { channel_data* chand = static_cast<channel_data*>(arg); - gpr_mu_lock(&chand->max_age_timer_mu); - chand->max_age_grace_timer_pending = false; - gpr_mu_unlock(&chand->max_age_timer_mu); + { + grpc_core::MutexLock lock(&chand->max_age_timer_mu); + chand->max_age_grace_timer_pending = false; + } if (error == GRPC_ERROR_NONE) { grpc_transport_op* op = grpc_make_transport_op(nullptr); op->disconnect_with_error = @@ -407,7 +414,7 @@ add_random_max_connection_age_jitter_and_convert_to_grpc_millis(int value) { } /* Constructor for call_data. */ -static grpc_error* max_age_init_call_elem( +static grpc_error_handle max_age_init_call_elem( grpc_call_element* elem, const grpc_call_element_args* /*args*/) { channel_data* chand = static_cast<channel_data*>(elem->channel_data); increase_call_count(chand); @@ -423,12 +430,10 @@ static void max_age_destroy_call_elem( } /* Constructor for channel_data. */ -static grpc_error* max_age_init_channel_elem(grpc_channel_element* elem, - grpc_channel_element_args* args) { +static grpc_error_handle max_age_init_channel_elem( + grpc_channel_element* elem, grpc_channel_element_args* args) { channel_data* chand = static_cast<channel_data*>(elem->channel_data); - gpr_mu_init(&chand->max_age_timer_mu); - chand->max_age_timer_pending = false; - chand->max_age_grace_timer_pending = false; + new (chand) channel_data(); chand->channel_stack = args->channel_stack; chand->max_connection_age = add_random_max_connection_age_jitter_and_convert_to_grpc_millis( @@ -513,7 +518,7 @@ static grpc_error* max_age_init_channel_elem(grpc_channel_element* elem, /* Destructor for channel_data. */ static void max_age_destroy_channel_elem(grpc_channel_element* elem) { channel_data* chand = static_cast<channel_data*>(elem->channel_data); - gpr_mu_destroy(&chand->max_age_timer_mu); + chand->~channel_data(); } const grpc_channel_filter grpc_max_age_filter = { diff --git a/grpc/src/core/ext/filters/message_size/message_size_filter.cc b/grpc/src/core/ext/filters/message_size/message_size_filter.cc index 10a58d98..3c921e28 100644 --- a/grpc/src/core/ext/filters/message_size/message_size_filter.cc +++ b/grpc/src/core/ext/filters/message_size/message_size_filter.cc @@ -37,8 +37,9 @@ #include "src/core/lib/surface/call.h" #include "src/core/lib/surface/channel_init.h" -static void recv_message_ready(void* user_data, grpc_error* error); -static void recv_trailing_metadata_ready(void* user_data, grpc_error* error); +static void recv_message_ready(void* user_data, grpc_error_handle error); +static void recv_trailing_metadata_ready(void* user_data, + grpc_error_handle error); namespace grpc_core { @@ -67,9 +68,10 @@ const MessageSizeParsedConfig* MessageSizeParsedConfig::GetFromCallContext( std::unique_ptr<ServiceConfigParser::ParsedConfig> MessageSizeParser::ParsePerMethodParams(const grpc_channel_args* /*args*/, - const Json& json, grpc_error** error) { + const Json& json, + grpc_error_handle* error) { GPR_DEBUG_ASSERT(error != nullptr && *error == GRPC_ERROR_NONE); - std::vector<grpc_error*> error_list; + std::vector<grpc_error_handle> error_list; // Max request size. int max_request_message_bytes = -1; auto it = json.object_value().find("maxRequestMessageBytes"); @@ -179,7 +181,7 @@ struct call_data { grpc_closure recv_message_ready; grpc_closure recv_trailing_metadata_ready; // The error caused by a message that is too large, or GRPC_ERROR_NONE - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; // Used by recv_message_ready. grpc_core::OrphanablePtr<grpc_core::ByteStream>* recv_message = nullptr; // Original recv_message_ready callback, invoked after our own. @@ -187,20 +189,20 @@ struct call_data { // Original recv_trailing_metadata callback, invoked after our own. grpc_closure* original_recv_trailing_metadata_ready; bool seen_recv_trailing_metadata = false; - grpc_error* recv_trailing_metadata_error; + grpc_error_handle recv_trailing_metadata_error; }; } // namespace // Callback invoked when we receive a message. Here we check the max // receive message size. -static void recv_message_ready(void* user_data, grpc_error* error) { +static void recv_message_ready(void* user_data, grpc_error_handle error) { grpc_call_element* elem = static_cast<grpc_call_element*>(user_data); call_data* calld = static_cast<call_data*>(elem->call_data); if (*calld->recv_message != nullptr && calld->limits.max_recv_size >= 0 && (*calld->recv_message)->length() > static_cast<size_t>(calld->limits.max_recv_size)) { - grpc_error* new_error = grpc_error_set_int( + grpc_error_handle new_error = grpc_error_set_int( GRPC_ERROR_CREATE_FROM_COPIED_STRING( absl::StrFormat("Received message larger than max (%u vs. %d)", (*calld->recv_message)->length(), @@ -233,7 +235,8 @@ static void recv_message_ready(void* user_data, grpc_error* error) { // Callback invoked on completion of recv_trailing_metadata // Notifies the recv_trailing_metadata batch of any message size failures -static void recv_trailing_metadata_ready(void* user_data, grpc_error* error) { +static void recv_trailing_metadata_ready(void* user_data, + grpc_error_handle error) { grpc_call_element* elem = static_cast<grpc_call_element*>(user_data); call_data* calld = static_cast<call_data*>(elem->call_data); if (calld->next_recv_message_ready != nullptr) { @@ -291,7 +294,7 @@ static void message_size_start_transport_stream_op_batch( } // Constructor for call_data. -static grpc_error* message_size_init_call_elem( +static grpc_error_handle message_size_init_call_elem( grpc_call_element* elem, const grpc_call_element_args* args) { channel_data* chand = static_cast<channel_data*>(elem->channel_data); new (elem->call_data) call_data(elem, *chand, *args); @@ -315,7 +318,7 @@ grpc_core::MessageSizeParsedConfig::message_size_limits get_message_size_limits( } // Constructor for channel_data. -static grpc_error* message_size_init_channel_elem( +static grpc_error_handle message_size_init_channel_elem( grpc_channel_element* elem, grpc_channel_element_args* args) { GPR_ASSERT(!args->is_last); channel_data* chand = static_cast<channel_data*>(elem->channel_data); diff --git a/grpc/src/core/ext/filters/message_size/message_size_filter.h b/grpc/src/core/ext/filters/message_size/message_size_filter.h index 0583a789..6629803e 100644 --- a/grpc/src/core/ext/filters/message_size/message_size_filter.h +++ b/grpc/src/core/ext/filters/message_size/message_size_filter.h @@ -51,7 +51,7 @@ class MessageSizeParser : public ServiceConfigParser::Parser { public: std::unique_ptr<ServiceConfigParser::ParsedConfig> ParsePerMethodParams( const grpc_channel_args* /*args*/, const Json& json, - grpc_error** error) override; + grpc_error_handle* error) override; static void Register(); diff --git a/grpc/src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc b/grpc/src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc index 7f9a4fca..b2e8f3fd 100644 --- a/grpc/src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc +++ b/grpc/src/core/ext/filters/workarounds/workaround_cronet_compression_filter.cc @@ -54,7 +54,8 @@ static bool get_user_agent_mdelem(const grpc_metadata_batch* batch, } // Callback invoked when we receive an initial metadata. -static void recv_initial_metadata_ready(void* user_data, grpc_error* error) { +static void recv_initial_metadata_ready(void* user_data, + grpc_error_handle error) { grpc_call_element* elem = static_cast<grpc_call_element*>(user_data); call_data* calld = static_cast<call_data*>(elem->call_data); @@ -105,7 +106,7 @@ static void cronet_compression_start_transport_stream_op_batch( } // Constructor for call_data. -static grpc_error* cronet_compression_init_call_elem( +static grpc_error_handle cronet_compression_init_call_elem( grpc_call_element* elem, const grpc_call_element_args* /*args*/) { call_data* calld = static_cast<call_data*>(elem->call_data); calld->next_recv_initial_metadata_ready = nullptr; @@ -122,7 +123,7 @@ static void cronet_compression_destroy_call_elem( grpc_closure* /*ignored*/) {} // Constructor for channel_data. -static grpc_error* cronet_compression_init_channel_elem( +static grpc_error_handle cronet_compression_init_channel_elem( grpc_channel_element* /*elem*/, grpc_channel_element_args* /*args*/) { return GRPC_ERROR_NONE; } @@ -192,7 +193,7 @@ static bool register_workaround_cronet_compression( if (a == nullptr) { return true; } - if (grpc_channel_arg_get_bool(a, false) == false) { + if (!grpc_channel_arg_get_bool(a, false)) { return true; } return grpc_channel_stack_builder_prepend_filter( diff --git a/grpc/src/core/ext/transport/chttp2/client/chttp2_connector.cc b/grpc/src/core/ext/transport/chttp2/client/chttp2_connector.cc index 3408ed92..8b3d5d75 100644 --- a/grpc/src/core/ext/transport/chttp2/client/chttp2_connector.cc +++ b/grpc/src/core/ext/transport/chttp2/client/chttp2_connector.cc @@ -75,7 +75,7 @@ void Chttp2Connector::Connect(const Args& args, Result* result, args.channel_args, &addr, args.deadline); } -void Chttp2Connector::Shutdown(grpc_error* error) { +void Chttp2Connector::Shutdown(grpc_error_handle error) { MutexLock lock(&mu_); shutdown_ = true; if (handshake_mgr_ != nullptr) { @@ -89,7 +89,7 @@ void Chttp2Connector::Shutdown(grpc_error* error) { GRPC_ERROR_UNREF(error); } -void Chttp2Connector::Connected(void* arg, grpc_error* error) { +void Chttp2Connector::Connected(void* arg, grpc_error_handle error) { Chttp2Connector* self = static_cast<Chttp2Connector*>(arg); bool unref = false; { @@ -131,14 +131,14 @@ void Chttp2Connector::StartHandshakeLocked() { namespace { void NullThenSchedClosure(const DebugLocation& location, grpc_closure** closure, - grpc_error* error) { + grpc_error_handle error) { grpc_closure* c = *closure; *closure = nullptr; ExecCtx::Run(location, c, error); } } // namespace -void Chttp2Connector::OnHandshakeDone(void* arg, grpc_error* error) { +void Chttp2Connector::OnHandshakeDone(void* arg, grpc_error_handle error) { auto* args = static_cast<HandshakerArgs*>(arg); Chttp2Connector* self = static_cast<Chttp2Connector*>(args->user_data); { @@ -178,7 +178,7 @@ void Chttp2Connector::OnHandshakeDone(void* arg, grpc_error* error) { self->Ref().release(); // Ref held by OnTimeout() grpc_chttp2_transport_start_reading(self->result_->transport, args->read_buffer, - &self->on_receive_settings_); + &self->on_receive_settings_, nullptr); GRPC_CLOSURE_INIT(&self->on_timeout_, OnTimeout, self, grpc_schedule_on_exec_ctx); grpc_timer_init(&self->timer_, self->args_.deadline, &self->on_timeout_); @@ -194,7 +194,7 @@ void Chttp2Connector::OnHandshakeDone(void* arg, grpc_error* error) { self->Unref(); } -void Chttp2Connector::OnReceiveSettings(void* arg, grpc_error* error) { +void Chttp2Connector::OnReceiveSettings(void* arg, grpc_error_handle error) { Chttp2Connector* self = static_cast<Chttp2Connector*>(arg); { MutexLock lock(&self->mu_); @@ -220,7 +220,7 @@ void Chttp2Connector::OnReceiveSettings(void* arg, grpc_error* error) { self->Unref(); } -void Chttp2Connector::OnTimeout(void* arg, grpc_error* error) { +void Chttp2Connector::OnTimeout(void* arg, grpc_error_handle /*error*/) { Chttp2Connector* self = static_cast<Chttp2Connector*>(arg); { MutexLock lock(&self->mu_); @@ -245,7 +245,7 @@ void Chttp2Connector::OnTimeout(void* arg, grpc_error* error) { self->Unref(); } -void Chttp2Connector::MaybeNotify(grpc_error* error) { +void Chttp2Connector::MaybeNotify(grpc_error_handle error) { if (notify_error_.has_value()) { GRPC_ERROR_UNREF(error); NullThenSchedClosure(DEBUG_LOCATION, ¬ify_, notify_error_.value()); diff --git a/grpc/src/core/ext/transport/chttp2/client/chttp2_connector.h b/grpc/src/core/ext/transport/chttp2/client/chttp2_connector.h index 7624b7f8..59db078f 100644 --- a/grpc/src/core/ext/transport/chttp2/client/chttp2_connector.h +++ b/grpc/src/core/ext/transport/chttp2/client/chttp2_connector.h @@ -33,14 +33,14 @@ class Chttp2Connector : public SubchannelConnector { ~Chttp2Connector() override; void Connect(const Args& args, Result* result, grpc_closure* notify) override; - void Shutdown(grpc_error* error) override; + void Shutdown(grpc_error_handle error) override; private: - static void Connected(void* arg, grpc_error* error); + static void Connected(void* arg, grpc_error_handle error); void StartHandshakeLocked(); - static void OnHandshakeDone(void* arg, grpc_error* error); - static void OnReceiveSettings(void* arg, grpc_error* error); - static void OnTimeout(void* arg, grpc_error* error); + static void OnHandshakeDone(void* arg, grpc_error_handle error); + static void OnReceiveSettings(void* arg, grpc_error_handle error); + static void OnTimeout(void* arg, grpc_error_handle error); // We cannot invoke notify_ until both OnTimeout() and OnReceiveSettings() // have been called since that is an indicator to the upper layer that we are @@ -51,7 +51,7 @@ class Chttp2Connector : public SubchannelConnector { // invoked, we call MaybeNotify() again to actually invoke the notify_ // callback. Note that this only happens if the handshake is done and the // connector is waiting on the SETTINGS frame. - void MaybeNotify(grpc_error* error); + void MaybeNotify(grpc_error_handle error); Mutex mu_; Args args_; @@ -66,7 +66,7 @@ class Chttp2Connector : public SubchannelConnector { grpc_closure on_receive_settings_; grpc_timer timer_; grpc_closure on_timeout_; - absl::optional<grpc_error*> notify_error_; + absl::optional<grpc_error_handle> notify_error_; RefCountedPtr<HandshakeManager> handshake_mgr_; }; diff --git a/grpc/src/core/ext/transport/chttp2/client/insecure/channel_create.cc b/grpc/src/core/ext/transport/chttp2/client/insecure/channel_create.cc index a325533b..58f27426 100644 --- a/grpc/src/core/ext/transport/chttp2/client/insecure/channel_create.cc +++ b/grpc/src/core/ext/transport/chttp2/client/insecure/channel_create.cc @@ -37,10 +37,11 @@ namespace grpc_core { class Chttp2InsecureClientChannelFactory : public ClientChannelFactory { public: - Subchannel* CreateSubchannel(const grpc_channel_args* args) override { + RefCountedPtr<Subchannel> CreateSubchannel( + const grpc_channel_args* args) override { grpc_channel_args* new_args = grpc_default_authority_add_if_not_present(args); - Subchannel* s = + RefCountedPtr<Subchannel> s = Subchannel::Create(MakeOrphanable<Chttp2Connector>(), new_args); grpc_channel_args_destroy(new_args); return s; @@ -50,7 +51,7 @@ class Chttp2InsecureClientChannelFactory : public ClientChannelFactory { namespace { grpc_channel* CreateChannel(const char* target, const grpc_channel_args* args, - grpc_error** error) { + grpc_error_handle* error) { if (target == nullptr) { gpr_log(GPR_ERROR, "cannot create channel with NULL target name"); if (error != nullptr) { @@ -105,7 +106,7 @@ grpc_channel* grpc_insecure_channel_create(const char* target, const char* arg_to_remove = arg.key; grpc_channel_args* new_args = grpc_channel_args_copy_and_add_and_remove( args, &arg_to_remove, 1, &arg, 1); - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; // Create channel. grpc_channel* channel = grpc_core::CreateChannel(target, new_args, &error); // Clean up. diff --git a/grpc/src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc b/grpc/src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc index 27e64fb8..4700093e 100644 --- a/grpc/src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc +++ b/grpc/src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc @@ -56,13 +56,13 @@ grpc_channel* grpc_insecure_channel_create_from_fd( grpc_transport* transport = grpc_create_chttp2_transport(final_args, client, true); GPR_ASSERT(transport); - grpc_error* error = nullptr; + grpc_error_handle error = GRPC_ERROR_NONE; grpc_channel* channel = grpc_channel_create(target, final_args, GRPC_CLIENT_DIRECT_CHANNEL, transport, nullptr, &error); grpc_channel_args_destroy(final_args); if (channel != nullptr) { - grpc_chttp2_transport_start_reading(transport, nullptr, nullptr); + grpc_chttp2_transport_start_reading(transport, nullptr, nullptr, nullptr); grpc_core::ExecCtx::Get()->Flush(); } else { intptr_t integer; diff --git a/grpc/src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc b/grpc/src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc index 7edf6aa3..5b00098d 100644 --- a/grpc/src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc +++ b/grpc/src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc @@ -28,9 +28,9 @@ #include "src/core/ext/filters/client_channel/client_channel.h" #include "src/core/ext/filters/client_channel/resolver_registry.h" #include "src/core/ext/transport/chttp2/client/chttp2_connector.h" +#include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/memory.h" -#include "src/core/lib/iomgr/sockaddr_utils.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/lib/slice/slice_internal.h" @@ -43,14 +43,15 @@ namespace grpc_core { class Chttp2SecureClientChannelFactory : public ClientChannelFactory { public: - Subchannel* CreateSubchannel(const grpc_channel_args* args) override { + RefCountedPtr<Subchannel> CreateSubchannel( + const grpc_channel_args* args) override { grpc_channel_args* new_args = GetSecureNamingChannelArgs(args); if (new_args == nullptr) { gpr_log(GPR_ERROR, "Failed to create channel args during subchannel creation."); return nullptr; } - Subchannel* s = + RefCountedPtr<Subchannel> s = Subchannel::Create(MakeOrphanable<Chttp2Connector>(), new_args); grpc_channel_args_destroy(new_args); return s; @@ -128,7 +129,7 @@ class Chttp2SecureClientChannelFactory : public ClientChannelFactory { namespace { grpc_channel* CreateChannel(const char* target, const grpc_channel_args* args, - grpc_error** error) { + grpc_error_handle* error) { if (target == nullptr) { gpr_log(GPR_ERROR, "cannot create channel with NULL target name"); if (error != nullptr) { @@ -180,7 +181,7 @@ grpc_channel* grpc_secure_channel_create(grpc_channel_credentials* creds, 4, ((void*)creds, target, (void*)args, (void*)reserved)); GPR_ASSERT(reserved == nullptr); grpc_channel* channel = nullptr; - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; if (creds != nullptr) { // Add channel args containing the client channel factory and channel // credentials. diff --git a/grpc/src/core/ext/transport/chttp2/server/chttp2_server.cc b/grpc/src/core/ext/transport/chttp2/server/chttp2_server.cc index 8446a9f9..911af03b 100644 --- a/grpc/src/core/ext/transport/chttp2/server/chttp2_server.cc +++ b/grpc/src/core/ext/transport/chttp2/server/chttp2_server.cc @@ -38,6 +38,7 @@ #include "src/core/ext/filters/http/server/http_server_filter.h" #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/ext/transport/chttp2/transport/internal.h" +#include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/handshaker.h" #include "src/core/lib/channel/handshaker_registry.h" @@ -46,7 +47,6 @@ #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/resource_quota.h" -#include "src/core/lib/iomgr/sockaddr_utils.h" #include "src/core/lib/iomgr/tcp_server.h" #include "src/core/lib/iomgr/unix_sockets_posix.h" #include "src/core/lib/slice/slice_internal.h" @@ -61,14 +61,18 @@ const char kUnixAbstractUriPrefix[] = "unix-abstract:"; class Chttp2ServerListener : public Server::ListenerInterface { public: - static grpc_error* Create(Server* server, grpc_resolved_address* addr, - grpc_channel_args* args, int* port_num); + static grpc_error_handle Create(Server* server, grpc_resolved_address* addr, + grpc_channel_args* args, + Chttp2ServerArgsModifier args_modifier, + int* port_num); - static grpc_error* CreateWithAcceptor(Server* server, const char* name, - grpc_channel_args* args); + static grpc_error_handle CreateWithAcceptor( + Server* server, const char* name, grpc_channel_args* args, + Chttp2ServerArgsModifier args_modifier); // Do not instantiate directly. Use one of the factory methods above. - Chttp2ServerListener(Server* server, grpc_channel_args* args); + Chttp2ServerListener(Server* server, grpc_channel_args* args, + Chttp2ServerArgsModifier args_modifier); ~Chttp2ServerListener() override; void Start(Server* server, @@ -86,91 +90,209 @@ class Chttp2ServerListener : public Server::ListenerInterface { class ConfigFetcherWatcher : public grpc_server_config_fetcher::WatcherInterface { public: - explicit ConfigFetcherWatcher(Chttp2ServerListener* listener) - : listener_(listener) {} - - void UpdateConfig(grpc_channel_args* args) override { - { - MutexLock lock(&listener_->mu_); - // TODO(yashykt): Fix this - // grpc_channel_args_destroy(listener_->args_); - // listener_->args_ = args; - if (!listener_->shutdown_) return; // Already started listening. - } - int port_temp; - grpc_error* error = grpc_tcp_server_add_port( - listener_->tcp_server_, &listener_->resolved_address_, &port_temp); - if (error != GRPC_ERROR_NONE) { - GRPC_ERROR_UNREF(error); - gpr_log(GPR_ERROR, "Error adding port to server: %s", - grpc_error_string(error)); - // TODO(yashykt): We wouldn't need to assert here if we bound to the - // port earlier during AddPort. - GPR_ASSERT(0); - } - listener_->StartListening(); - } + explicit ConfigFetcherWatcher(RefCountedPtr<Chttp2ServerListener> listener) + : listener_(std::move(listener)) {} + + void UpdateConnectionManager( + RefCountedPtr<grpc_server_config_fetcher::ConnectionManager> + connection_manager) override; + + void StopServing() override; private: - Chttp2ServerListener* listener_; + RefCountedPtr<Chttp2ServerListener> listener_; }; - class ConnectionState : public RefCounted<ConnectionState> { + class ActiveConnection : public InternallyRefCounted<ActiveConnection> { public: - ConnectionState(Chttp2ServerListener* listener, - grpc_pollset* accepting_pollset, - grpc_tcp_server_acceptor* acceptor, - RefCountedPtr<HandshakeManager> handshake_mgr, - grpc_channel_args* args, grpc_endpoint* endpoint); + class HandshakingState : public InternallyRefCounted<HandshakingState> { + public: + HandshakingState(RefCountedPtr<ActiveConnection> connection_ref, + grpc_pollset* accepting_pollset, + grpc_tcp_server_acceptor* acceptor, + grpc_channel_args* args); + + ~HandshakingState() override; + + void Orphan() override; - ~ConnectionState() override; + void Start(grpc_endpoint* endpoint, grpc_channel_args* args); + + // Needed to be able to grab an external ref in ActiveConnection::Start() + using InternallyRefCounted<HandshakingState>::Ref; + + private: + static void OnTimeout(void* arg, grpc_error_handle error); + static void OnReceiveSettings(void* arg, grpc_error_handle /* error */); + static void OnHandshakeDone(void* arg, grpc_error_handle error); + RefCountedPtr<ActiveConnection> const connection_; + grpc_pollset* const accepting_pollset_; + grpc_tcp_server_acceptor* const acceptor_; + RefCountedPtr<HandshakeManager> handshake_mgr_ + ABSL_GUARDED_BY(&connection_->mu_); + // State for enforcing handshake timeout on receiving HTTP/2 settings. + grpc_millis const deadline_; + grpc_timer timer_ ABSL_GUARDED_BY(&connection_->mu_); + grpc_closure on_timeout_ ABSL_GUARDED_BY(&connection_->mu_); + grpc_closure on_receive_settings_ ABSL_GUARDED_BY(&connection_->mu_); + grpc_pollset_set* const interested_parties_; + }; + + ActiveConnection(grpc_pollset* accepting_pollset, + grpc_tcp_server_acceptor* acceptor, + grpc_channel_args* args); + ~ActiveConnection() override; + + void Orphan() override; + + void SendGoAway(); + + void Start(RefCountedPtr<Chttp2ServerListener> listener, + grpc_endpoint* endpoint, grpc_channel_args* args); + + // Needed to be able to grab an external ref in + // Chttp2ServerListener::OnAccept() + using InternallyRefCounted<ActiveConnection>::Ref; private: - static void OnTimeout(void* arg, grpc_error* error); - static void OnReceiveSettings(void* arg, grpc_error* error); - static void OnHandshakeDone(void* arg, grpc_error* error); - - Chttp2ServerListener* const listener_; - grpc_pollset* const accepting_pollset_; - grpc_tcp_server_acceptor* const acceptor_; - RefCountedPtr<HandshakeManager> handshake_mgr_; - // State for enforcing handshake timeout on receiving HTTP/2 settings. - grpc_chttp2_transport* transport_ = nullptr; - grpc_millis deadline_; - grpc_timer timer_; - grpc_closure on_timeout_; - grpc_closure on_receive_settings_; - grpc_pollset_set* const interested_parties_; + static void OnClose(void* arg, grpc_error_handle error); + + RefCountedPtr<Chttp2ServerListener> listener_; + Mutex mu_ ABSL_ACQUIRED_AFTER(&listener_->mu_); + // Set by HandshakingState before the handshaking begins and reset when + // handshaking is done. + OrphanablePtr<HandshakingState> handshaking_state_ ABSL_GUARDED_BY(&mu_); + // Set by HandshakingState when handshaking is done and a valid transport is + // created. + grpc_chttp2_transport* transport_ ABSL_GUARDED_BY(&mu_) = nullptr; + grpc_closure on_close_; + bool shutdown_ ABSL_GUARDED_BY(&mu_) = false; }; + // To allow access to RefCounted<> like interface. + friend class RefCountedPtr<Chttp2ServerListener>; + + // Should only be called once so as to start the TCP server. void StartListening(); static void OnAccept(void* arg, grpc_endpoint* tcp, grpc_pollset* accepting_pollset, grpc_tcp_server_acceptor* acceptor); - RefCountedPtr<HandshakeManager> CreateHandshakeManager(); - - static void TcpServerShutdownComplete(void* arg, grpc_error* error); + static void TcpServerShutdownComplete(void* arg, grpc_error_handle error); static void DestroyListener(Server* /*server*/, void* arg, grpc_closure* destroy_done); + // The interface required by RefCountedPtr<> has been manually implemented + // here to take a ref on tcp_server_ instead. Note that, the handshaker needs + // tcp_server_ to exist for the lifetime of the handshake since it's needed by + // acceptor. Sharing refs between the listener and tcp_server_ is just an + // optimization to avoid taking additional refs on the listener, since + // TcpServerShutdownComplete already holds a ref to the listener. + void IncrementRefCount() { grpc_tcp_server_ref(tcp_server_); } + void IncrementRefCount(const DebugLocation& /* location */, + const char* /* reason */) { + IncrementRefCount(); + } + + RefCountedPtr<Chttp2ServerListener> Ref() GRPC_MUST_USE_RESULT { + IncrementRefCount(); + return RefCountedPtr<Chttp2ServerListener>(this); + } + RefCountedPtr<Chttp2ServerListener> Ref(const DebugLocation& /* location */, + const char* /* reason */) + GRPC_MUST_USE_RESULT { + return Ref(); + } + + void Unref() { grpc_tcp_server_unref(tcp_server_); } + void Unref(const DebugLocation& /* location */, const char* /* reason */) { + Unref(); + } + Server* const server_; - grpc_channel_args* const args_; grpc_tcp_server* tcp_server_; grpc_resolved_address resolved_address_; - Mutex mu_; + Chttp2ServerArgsModifier const args_modifier_; ConfigFetcherWatcher* config_fetcher_watcher_ = nullptr; - bool shutdown_ = true; - grpc_closure tcp_server_shutdown_complete_; - grpc_closure* on_destroy_done_ = nullptr; - HandshakeManager* pending_handshake_mgrs_ = nullptr; + Mutex channel_args_mu_; + grpc_channel_args* args_ ABSL_GUARDED_BY(channel_args_mu_); + RefCountedPtr<grpc_server_config_fetcher::ConnectionManager> + connection_manager_ ABSL_GUARDED_BY(channel_args_mu_); + Mutex mu_; + // Signals whether grpc_tcp_server_start() has been called. + bool started_ ABSL_GUARDED_BY(mu_) = false; + // Signals whether grpc_tcp_server_start() has completed. + CondVar started_cv_ ABSL_GUARDED_BY(mu_); + // Signals whether new requests/connections are to be accepted. + bool is_serving_ ABSL_GUARDED_BY(mu_) = false; + // Signals whether the application has triggered shutdown. + bool shutdown_ ABSL_GUARDED_BY(mu_) = false; + std::map<ActiveConnection*, OrphanablePtr<ActiveConnection>> connections_ + ABSL_GUARDED_BY(mu_); + grpc_closure tcp_server_shutdown_complete_ ABSL_GUARDED_BY(mu_); + grpc_closure* on_destroy_done_ ABSL_GUARDED_BY(mu_) = nullptr; RefCountedPtr<channelz::ListenSocketNode> channelz_listen_socket_; }; // -// Chttp2ServerListener::ConnectionState +// Chttp2ServerListener::ConfigFetcherWatcher +// + +void Chttp2ServerListener::ConfigFetcherWatcher::UpdateConnectionManager( + RefCountedPtr<grpc_server_config_fetcher::ConnectionManager> + connection_manager) { + RefCountedPtr<grpc_server_config_fetcher::ConnectionManager> + connection_manager_to_destroy; + { + MutexLock lock(&listener_->channel_args_mu_); + connection_manager_to_destroy = listener_->connection_manager_; + listener_->connection_manager_ = std::move(connection_manager); + } + { + MutexLock lock(&listener_->mu_); + if (listener_->shutdown_) { + return; + } + listener_->is_serving_ = true; + if (listener_->started_) return; + } + int port_temp; + grpc_error_handle error = grpc_tcp_server_add_port( + listener_->tcp_server_, &listener_->resolved_address_, &port_temp); + if (error != GRPC_ERROR_NONE) { + GRPC_ERROR_UNREF(error); + gpr_log(GPR_ERROR, "Error adding port to server: %s", + grpc_error_std_string(error).c_str()); + // TODO(yashykt): We wouldn't need to assert here if we bound to the + // port earlier during AddPort. + GPR_ASSERT(0); + } + listener_->StartListening(); + { + MutexLock lock(&listener_->mu_); + listener_->started_ = true; + listener_->started_cv_.SignalAll(); + } +} + +void Chttp2ServerListener::ConfigFetcherWatcher::StopServing() { + std::map<ActiveConnection*, OrphanablePtr<ActiveConnection>> connections; + { + MutexLock lock(&listener_->mu_); + listener_->is_serving_ = false; + connections = std::move(listener_->connections_); + } + // Send GOAWAYs on the transports so that they disconnected when existing RPCs + // finish. + for (auto& connection : connections) { + connection.first->SendGoAway(); + } +} + +// +// Chttp2ServerListener::ActiveConnection::HandshakingState // grpc_millis GetConnectionDeadline(const grpc_channel_args* args) { @@ -180,73 +302,96 @@ grpc_millis GetConnectionDeadline(const grpc_channel_args* args) { return ExecCtx::Get()->Now() + timeout_ms; } -Chttp2ServerListener::ConnectionState::ConnectionState( - Chttp2ServerListener* listener, grpc_pollset* accepting_pollset, - grpc_tcp_server_acceptor* acceptor, - RefCountedPtr<HandshakeManager> handshake_mgr, grpc_channel_args* args, - grpc_endpoint* endpoint) - : listener_(listener), +Chttp2ServerListener::ActiveConnection::HandshakingState::HandshakingState( + RefCountedPtr<ActiveConnection> connection_ref, + grpc_pollset* accepting_pollset, grpc_tcp_server_acceptor* acceptor, + grpc_channel_args* args) + : connection_(std::move(connection_ref)), accepting_pollset_(accepting_pollset), acceptor_(acceptor), - handshake_mgr_(std::move(handshake_mgr)), + handshake_mgr_(MakeRefCounted<HandshakeManager>()), deadline_(GetConnectionDeadline(args)), interested_parties_(grpc_pollset_set_create()) { grpc_pollset_set_add_pollset(interested_parties_, accepting_pollset_); HandshakerRegistry::AddHandshakers(HANDSHAKER_SERVER, args, interested_parties_, handshake_mgr_.get()); - handshake_mgr_->DoHandshake(endpoint, args, deadline_, acceptor_, - OnHandshakeDone, this); } -Chttp2ServerListener::ConnectionState::~ConnectionState() { - if (transport_ != nullptr) { - GRPC_CHTTP2_UNREF_TRANSPORT(transport_, "receive settings timeout"); - } +Chttp2ServerListener::ActiveConnection::HandshakingState::~HandshakingState() { grpc_pollset_set_del_pollset(interested_parties_, accepting_pollset_); grpc_pollset_set_destroy(interested_parties_); } -void Chttp2ServerListener::ConnectionState::OnTimeout(void* arg, - grpc_error* error) { - ConnectionState* self = static_cast<ConnectionState*>(arg); +void Chttp2ServerListener::ActiveConnection::HandshakingState::Orphan() { + { + MutexLock lock(&connection_->mu_); + if (handshake_mgr_ != nullptr) { + handshake_mgr_->Shutdown( + GRPC_ERROR_CREATE_FROM_STATIC_STRING("Listener stopped serving.")); + } + } + Unref(); +} + +void Chttp2ServerListener::ActiveConnection::HandshakingState::Start( + grpc_endpoint* endpoint, grpc_channel_args* args) { + Ref().release(); // Held by OnHandshakeDone + RefCountedPtr<HandshakeManager> handshake_mgr; + { + MutexLock lock(&connection_->mu_); + if (handshake_mgr_ == nullptr) return; + handshake_mgr = handshake_mgr_; + } + handshake_mgr->DoHandshake(endpoint, args, deadline_, acceptor_, + OnHandshakeDone, this); +} + +void Chttp2ServerListener::ActiveConnection::HandshakingState::OnTimeout( + void* arg, grpc_error_handle error) { + HandshakingState* self = static_cast<HandshakingState*>(arg); // Note that we may be called with GRPC_ERROR_NONE when the timer fires // or with an error indicating that the timer system is being shut down. if (error != GRPC_ERROR_CANCELLED) { grpc_transport_op* op = grpc_make_transport_op(nullptr); op->disconnect_with_error = GRPC_ERROR_CREATE_FROM_STATIC_STRING( "Did not receive HTTP/2 settings before handshake timeout"); - grpc_transport_perform_op(&self->transport_->base, op); + grpc_chttp2_transport* transport = nullptr; + { + MutexLock lock(&self->connection_->mu_); + transport = self->connection_->transport_; + } + grpc_transport_perform_op(&transport->base, op); } self->Unref(); } -void Chttp2ServerListener::ConnectionState::OnReceiveSettings( - void* arg, grpc_error* error) { - ConnectionState* self = static_cast<ConnectionState*>(arg); - if (error == GRPC_ERROR_NONE) { - grpc_timer_cancel(&self->timer_); - } +void Chttp2ServerListener::ActiveConnection::HandshakingState:: + OnReceiveSettings(void* arg, grpc_error_handle /* error */) { + HandshakingState* self = static_cast<HandshakingState*>(arg); + grpc_timer_cancel(&self->timer_); self->Unref(); } -void Chttp2ServerListener::ConnectionState::OnHandshakeDone(void* arg, - grpc_error* error) { +void Chttp2ServerListener::ActiveConnection::HandshakingState::OnHandshakeDone( + void* arg, grpc_error_handle error) { auto* args = static_cast<HandshakerArgs*>(arg); - ConnectionState* self = static_cast<ConnectionState*>(args->user_data); + HandshakingState* self = static_cast<HandshakingState*>(args->user_data); + OrphanablePtr<HandshakingState> handshaking_state_ref; + RefCountedPtr<HandshakeManager> handshake_mgr; + bool cleanup_connection = false; + bool free_resource_quota = false; + grpc_resource_user* resource_user = + self->connection_->listener_->server_->default_resource_user(); { - MutexLock lock(&self->listener_->mu_); - grpc_resource_user* resource_user = - self->listener_->server_->default_resource_user(); - if (error != GRPC_ERROR_NONE || self->listener_->shutdown_) { - const char* error_str = grpc_error_string(error); - gpr_log(GPR_DEBUG, "Handshaking failed: %s", error_str); - if (resource_user != nullptr) { - grpc_resource_user_free(resource_user, - GRPC_RESOURCE_QUOTA_CHANNEL_SIZE); - } + MutexLock connection_lock(&self->connection_->mu_); + if (error != GRPC_ERROR_NONE || self->connection_->shutdown_) { + std::string error_str = grpc_error_std_string(error); + gpr_log(GPR_DEBUG, "Handshaking failed: %s", error_str.c_str()); + cleanup_connection = true; + free_resource_quota = true; if (error == GRPC_ERROR_NONE && args->endpoint != nullptr) { - // We were shut down after handshaking completed successfully, so - // destroy the endpoint here. + // We were shut down or stopped serving after handshaking completed + // successfully, so destroy the endpoint here. // TODO(ctiller): It is currently necessary to shutdown endpoints // before destroying them, even if we know that there are no // pending read/write callbacks. This should be fixed, at which @@ -264,9 +409,11 @@ void Chttp2ServerListener::ConnectionState::OnHandshakeDone(void* arg, if (args->endpoint != nullptr) { grpc_transport* transport = grpc_create_chttp2_transport( args->args, args->endpoint, false, resource_user); - grpc_error* channel_init_err = self->listener_->server_->SetupTransport( - transport, self->accepting_pollset_, args->args, - grpc_chttp2_transport_get_socket_node(transport), resource_user); + grpc_error_handle channel_init_err = + self->connection_->listener_->server_->SetupTransport( + transport, self->accepting_pollset_, args->args, + grpc_chttp2_transport_get_socket_node(transport), + resource_user); if (channel_init_err == GRPC_ERROR_NONE) { // Use notify_on_receive_settings callback to enforce the // handshake deadline. @@ -276,48 +423,153 @@ void Chttp2ServerListener::ConnectionState::OnHandshakeDone(void* arg, // static_cast<> to a derived class. // TODO(roth): Change to static_cast<> when we C++-ify the // transport API. - self->transport_ = + self->connection_->transport_ = reinterpret_cast<grpc_chttp2_transport*>(transport); + GRPC_CHTTP2_REF_TRANSPORT(self->connection_->transport_, + "ActiveConnection"); // Held by connection_ self->Ref().release(); // Held by OnReceiveSettings(). GRPC_CLOSURE_INIT(&self->on_receive_settings_, OnReceiveSettings, self, grpc_schedule_on_exec_ctx); + // If the listener has been configured with a config fetcher, we need + // to watch on the transport being closed so that we can an updated + // list of active connections. + grpc_closure* on_close = nullptr; + if (self->connection_->listener_->config_fetcher_watcher_ != + nullptr) { + // Refs helds by OnClose() + self->connection_->Ref().release(); + on_close = &self->connection_->on_close_; + } else { + // Remove the connection from the connections_ map since OnClose() + // will not be invoked when a config fetcher is set. + cleanup_connection = true; + } grpc_chttp2_transport_start_reading(transport, args->read_buffer, - &self->on_receive_settings_); + &self->on_receive_settings_, + on_close); grpc_channel_args_destroy(args->args); self->Ref().release(); // Held by OnTimeout(). - GRPC_CHTTP2_REF_TRANSPORT( - reinterpret_cast<grpc_chttp2_transport*>(transport), - "receive settings timeout"); GRPC_CLOSURE_INIT(&self->on_timeout_, OnTimeout, self, grpc_schedule_on_exec_ctx); grpc_timer_init(&self->timer_, self->deadline_, &self->on_timeout_); } else { // Failed to create channel from transport. Clean up. gpr_log(GPR_ERROR, "Failed to create channel: %s", - grpc_error_string(channel_init_err)); + grpc_error_std_string(channel_init_err).c_str()); GRPC_ERROR_UNREF(channel_init_err); grpc_transport_destroy(transport); grpc_slice_buffer_destroy_internal(args->read_buffer); gpr_free(args->read_buffer); - if (resource_user != nullptr) { - grpc_resource_user_free(resource_user, - GRPC_RESOURCE_QUOTA_CHANNEL_SIZE); - } + cleanup_connection = true; + free_resource_quota = true; grpc_channel_args_destroy(args->args); } } else { - if (resource_user != nullptr) { - grpc_resource_user_free(resource_user, - GRPC_RESOURCE_QUOTA_CHANNEL_SIZE); - } + cleanup_connection = true; + free_resource_quota = true; } } - self->handshake_mgr_->RemoveFromPendingMgrList( - &self->listener_->pending_handshake_mgrs_); + // Since the handshake manager is done, the connection no longer needs to + // shutdown the handshake when the listener needs to stop serving. + // Avoid calling the destructor of HandshakeManager and HandshakingState + // from within the critical region. + handshake_mgr = std::move(self->handshake_mgr_); + handshaking_state_ref = std::move(self->connection_->handshaking_state_); } - self->handshake_mgr_.reset(); gpr_free(self->acceptor_); - grpc_tcp_server_unref(self->listener_->tcp_server_); + OrphanablePtr<ActiveConnection> connection; + if (free_resource_quota && resource_user != nullptr) { + grpc_resource_user_free(resource_user, GRPC_RESOURCE_QUOTA_CHANNEL_SIZE); + } + if (cleanup_connection) { + MutexLock listener_lock(&self->connection_->listener_->mu_); + auto it = self->connection_->listener_->connections_.find( + self->connection_.get()); + if (it != self->connection_->listener_->connections_.end()) { + connection = std::move(it->second); + self->connection_->listener_->connections_.erase(it); + } + } + self->Unref(); +} + +// +// Chttp2ServerListener::ActiveConnection +// + +Chttp2ServerListener::ActiveConnection::ActiveConnection( + grpc_pollset* accepting_pollset, grpc_tcp_server_acceptor* acceptor, + grpc_channel_args* args) + : handshaking_state_(MakeOrphanable<HandshakingState>( + Ref(), accepting_pollset, acceptor, args)) { + GRPC_CLOSURE_INIT(&on_close_, ActiveConnection::OnClose, this, + grpc_schedule_on_exec_ctx); +} + +Chttp2ServerListener::ActiveConnection::~ActiveConnection() { + if (transport_ != nullptr) { + GRPC_CHTTP2_UNREF_TRANSPORT(transport_, "ActiveConnection"); + } +} + +void Chttp2ServerListener::ActiveConnection::Orphan() { + OrphanablePtr<HandshakingState> handshaking_state; + { + MutexLock lock(&mu_); + shutdown_ = true; + // Reset handshaking_state_ since we have been orphaned by the listener + // signaling that the listener has stopped serving. + handshaking_state = std::move(handshaking_state_); + } + Unref(); +} + +void Chttp2ServerListener::ActiveConnection::SendGoAway() { + grpc_chttp2_transport* transport = nullptr; + { + MutexLock lock(&mu_); + transport = transport_; + } + if (transport != nullptr) { + grpc_transport_op* op = grpc_make_transport_op(nullptr); + op->goaway_error = GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "Server is stopping to serve requests."); + grpc_transport_perform_op(&transport->base, op); + } +} + +void Chttp2ServerListener::ActiveConnection::Start( + RefCountedPtr<Chttp2ServerListener> listener, grpc_endpoint* endpoint, + grpc_channel_args* args) { + RefCountedPtr<HandshakingState> handshaking_state_ref; + listener_ = std::move(listener); + { + MutexLock lock(&mu_); + if (shutdown_) return; + // Hold a ref to HandshakingState to allow starting the handshake outside + // the critical region. + handshaking_state_ref = handshaking_state_->Ref(); + } + handshaking_state_ref->Start(endpoint, args); +} + +void Chttp2ServerListener::ActiveConnection::OnClose( + void* arg, grpc_error_handle /* error */) { + ActiveConnection* self = static_cast<ActiveConnection*>(arg); + OrphanablePtr<ActiveConnection> connection; + { + MutexLock listener_lock(&self->listener_->mu_); + MutexLock connection_lock(&self->mu_); + // The node was already deleted from the connections_ list if the connection + // is shutdown. + if (!self->shutdown_) { + auto it = self->listener_->connections_.find(self); + if (it != self->listener_->connections_.end()) { + connection = std::move(it->second); + self->listener_->connections_.erase(it); + } + } + } self->Unref(); } @@ -325,16 +577,15 @@ void Chttp2ServerListener::ConnectionState::OnHandshakeDone(void* arg, // Chttp2ServerListener // -grpc_error* Chttp2ServerListener::Create(Server* server, - grpc_resolved_address* addr, - grpc_channel_args* args, - int* port_num) { +grpc_error_handle Chttp2ServerListener::Create( + Server* server, grpc_resolved_address* addr, grpc_channel_args* args, + Chttp2ServerArgsModifier args_modifier, int* port_num) { Chttp2ServerListener* listener = nullptr; // The bulk of this method is inside of a lambda to make cleanup // easier without using goto. - grpc_error* error = [&]() { + grpc_error_handle error = [&]() { // Create Chttp2ServerListener. - listener = new Chttp2ServerListener(server, args); + listener = new Chttp2ServerListener(server, args, args_modifier); error = grpc_tcp_server_create(&listener->tcp_server_shutdown_complete_, args, &listener->tcp_server_); if (error != GRPC_ERROR_NONE) return error; @@ -349,7 +600,7 @@ grpc_error* Chttp2ServerListener::Create(Server* server, // Create channelz node. if (grpc_channel_args_find_bool(args, GRPC_ARG_ENABLE_CHANNELZ, GRPC_ENABLE_CHANNELZ_DEFAULT)) { - std::string string_address = grpc_sockaddr_to_string(addr, false); + std::string string_address = grpc_sockaddr_to_uri(addr); listener->channelz_listen_socket_ = MakeRefCounted<channelz::ListenSocketNode>( string_address.c_str(), @@ -374,11 +625,12 @@ grpc_error* Chttp2ServerListener::Create(Server* server, return error; } -grpc_error* Chttp2ServerListener::CreateWithAcceptor(Server* server, - const char* name, - grpc_channel_args* args) { - Chttp2ServerListener* listener = new Chttp2ServerListener(server, args); - grpc_error* error = grpc_tcp_server_create( +grpc_error_handle Chttp2ServerListener::CreateWithAcceptor( + Server* server, const char* name, grpc_channel_args* args, + Chttp2ServerArgsModifier args_modifier) { + Chttp2ServerListener* listener = + new Chttp2ServerListener(server, args, args_modifier); + grpc_error_handle error = grpc_tcp_server_create( &listener->tcp_server_shutdown_complete_, args, &listener->tcp_server_); if (error != GRPC_ERROR_NONE) { delete listener; @@ -392,14 +644,22 @@ grpc_error* Chttp2ServerListener::CreateWithAcceptor(Server* server, return GRPC_ERROR_NONE; } -Chttp2ServerListener::Chttp2ServerListener(Server* server, - grpc_channel_args* args) - : server_(server), args_(args) { +Chttp2ServerListener::Chttp2ServerListener( + Server* server, grpc_channel_args* args, + Chttp2ServerArgsModifier args_modifier) + : server_(server), args_modifier_(args_modifier), args_(args) { GRPC_CLOSURE_INIT(&tcp_server_shutdown_complete_, TcpServerShutdownComplete, this, grpc_schedule_on_exec_ctx); } Chttp2ServerListener::~Chttp2ServerListener() { + // Flush queued work before destroying handshaker factory, since that + // may do a synchronous unref. + ExecCtx::Get()->Flush(); + if (on_destroy_done_ != nullptr) { + ExecCtx::Run(DEBUG_LOCATION, on_destroy_done_, GRPC_ERROR_NONE); + ExecCtx::Get()->Flush(); + } grpc_channel_args_destroy(args_); } @@ -407,22 +667,28 @@ Chttp2ServerListener::~Chttp2ServerListener() { void Chttp2ServerListener::Start( Server* /*server*/, const std::vector<grpc_pollset*>* /* pollsets */) { if (server_->config_fetcher() != nullptr) { - auto watcher = absl::make_unique<ConfigFetcherWatcher>(this); + grpc_channel_args* args = nullptr; + auto watcher = absl::make_unique<ConfigFetcherWatcher>(Ref()); + config_fetcher_watcher_ = watcher.get(); { - MutexLock lock(&mu_); - config_fetcher_watcher_ = watcher.get(); + MutexLock lock(&channel_args_mu_); + args = grpc_channel_args_copy(args_); } server_->config_fetcher()->StartWatch( - grpc_sockaddr_to_string(&resolved_address_, false), std::move(watcher)); + grpc_sockaddr_to_string(&resolved_address_, false), args, + std::move(watcher)); } else { + { + MutexLock lock(&mu_); + started_ = true; + is_serving_ = true; + } StartListening(); } } void Chttp2ServerListener::StartListening() { grpc_tcp_server_start(tcp_server_, &server_->pollsets(), OnAccept, this); - MutexLock lock(&mu_); - shutdown_ = false; } void Chttp2ServerListener::SetOnDestroyDone(grpc_closure* on_destroy_done) { @@ -430,61 +696,94 @@ void Chttp2ServerListener::SetOnDestroyDone(grpc_closure* on_destroy_done) { on_destroy_done_ = on_destroy_done; } -RefCountedPtr<HandshakeManager> Chttp2ServerListener::CreateHandshakeManager() { - MutexLock lock(&mu_); - if (shutdown_) return nullptr; - grpc_resource_user* resource_user = server_->default_resource_user(); - if (resource_user != nullptr && - !grpc_resource_user_safe_alloc(resource_user, - GRPC_RESOURCE_QUOTA_CHANNEL_SIZE)) { - gpr_log(GPR_ERROR, - "Memory quota exhausted, rejecting connection, no handshaking."); - return nullptr; - } - auto handshake_mgr = MakeRefCounted<HandshakeManager>(); - handshake_mgr->AddToPendingMgrList(&pending_handshake_mgrs_); - grpc_tcp_server_ref(tcp_server_); // Ref held by ConnectionState. - return handshake_mgr; -} - void Chttp2ServerListener::OnAccept(void* arg, grpc_endpoint* tcp, grpc_pollset* accepting_pollset, grpc_tcp_server_acceptor* acceptor) { Chttp2ServerListener* self = static_cast<Chttp2ServerListener*>(arg); - RefCountedPtr<HandshakeManager> handshake_mgr = - self->CreateHandshakeManager(); - if (handshake_mgr == nullptr) { - grpc_endpoint_shutdown(tcp, GRPC_ERROR_NONE); + grpc_channel_args* args = nullptr; + RefCountedPtr<grpc_server_config_fetcher::ConnectionManager> + connection_manager; + { + MutexLock lock(&self->channel_args_mu_); + args = grpc_channel_args_copy(self->args_); + connection_manager = self->connection_manager_; + } + auto endpoint_cleanup = [&](grpc_error_handle error) { + grpc_endpoint_shutdown(tcp, error); grpc_endpoint_destroy(tcp); gpr_free(acceptor); - return; + }; + if (self->server_->config_fetcher() != nullptr) { + if (connection_manager == nullptr) { + grpc_error_handle error = GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "No ConnectionManager configured. Closing connection."); + endpoint_cleanup(error); + grpc_channel_args_destroy(args); + return; + } + // TODO(yashykt): Maybe combine the following two arg modifiers into a + // single one. + absl::StatusOr<grpc_channel_args*> args_result = + connection_manager->UpdateChannelArgsForConnection(args, tcp); + if (!args_result.ok()) { + gpr_log(GPR_DEBUG, "Closing connection: %s", + args_result.status().ToString().c_str()); + endpoint_cleanup(GRPC_ERROR_CREATE_FROM_COPIED_STRING( + args_result.status().ToString().c_str())); + return; + } + grpc_error_handle error = GRPC_ERROR_NONE; + args = self->args_modifier_(*args_result, &error); + if (error != GRPC_ERROR_NONE) { + gpr_log(GPR_DEBUG, "Closing connection: %s", + grpc_error_std_string(error).c_str()); + endpoint_cleanup(error); + grpc_channel_args_destroy(args); + return; + } } - // Deletes itself when done. - new ConnectionState(self, accepting_pollset, acceptor, - std::move(handshake_mgr), self->args_, tcp); -} - -void Chttp2ServerListener::TcpServerShutdownComplete(void* arg, - grpc_error* error) { - Chttp2ServerListener* self = static_cast<Chttp2ServerListener*>(arg); - /* ensure all threads have unlocked */ - grpc_closure* destroy_done = nullptr; + auto connection = + MakeOrphanable<ActiveConnection>(accepting_pollset, acceptor, args); + // Hold a ref to connection to allow starting handshake outside the + // critical region + RefCountedPtr<ActiveConnection> connection_ref = connection->Ref(); + RefCountedPtr<Chttp2ServerListener> listener_ref; { MutexLock lock(&self->mu_); - destroy_done = self->on_destroy_done_; - GPR_ASSERT(self->shutdown_); - if (self->pending_handshake_mgrs_ != nullptr) { - self->pending_handshake_mgrs_->ShutdownAllPending(GRPC_ERROR_REF(error)); + // Shutdown the the connection if listener's stopped serving. + if (!self->shutdown_ && self->is_serving_) { + grpc_resource_user* resource_user = + self->server_->default_resource_user(); + if (resource_user != nullptr && + !grpc_resource_user_safe_alloc(resource_user, + GRPC_RESOURCE_QUOTA_CHANNEL_SIZE)) { + gpr_log( + GPR_ERROR, + "Memory quota exhausted, rejecting connection, no handshaking."); + } else { + // This ref needs to be taken in the critical region after having made + // sure that the listener has not been Orphaned, so as to avoid + // heap-use-after-free issues where `Ref()` is invoked when the ref of + // tcp_server_ has already reached 0. (Ref() implementation of + // Chttp2ServerListener is grpc_tcp_server_ref().) + listener_ref = self->Ref(); + self->connections_.emplace(connection.get(), std::move(connection)); + } } - self->channelz_listen_socket_.reset(); } - // Flush queued work before destroying handshaker factory, since that - // may do a synchronous unref. - ExecCtx::Get()->Flush(); - if (destroy_done != nullptr) { - ExecCtx::Run(DEBUG_LOCATION, destroy_done, GRPC_ERROR_REF(error)); - ExecCtx::Get()->Flush(); + if (connection != nullptr) { + endpoint_cleanup(GRPC_ERROR_NONE); + } else { + connection_ref->Start(std::move(listener_ref), tcp, args); } + grpc_channel_args_destroy(args); +} + +void Chttp2ServerListener::TcpServerShutdownComplete(void* arg, + grpc_error_handle error) { + Chttp2ServerListener* self = static_cast<Chttp2ServerListener*>(arg); + self->channelz_listen_socket_.reset(); + GRPC_ERROR_UNREF(error); delete self; } @@ -496,10 +795,20 @@ void Chttp2ServerListener::Orphan() { if (config_fetcher_watcher_ != nullptr) { server_->config_fetcher()->CancelWatch(config_fetcher_watcher_); } + std::map<ActiveConnection*, OrphanablePtr<ActiveConnection>> connections; grpc_tcp_server* tcp_server; { MutexLock lock(&mu_); shutdown_ = true; + is_serving_ = false; + // Orphan the connections so that they can start cleaning up. + connections = std::move(connections_); + // If the listener is currently set to be serving but has not been started + // yet, it means that `grpc_tcp_server_start` is in progress. Wait for the + // operation to finish to avoid causing races. + while (is_serving_ && !started_) { + started_cv_.Wait(&mu_); + } tcp_server = tcp_server_; } grpc_tcp_server_shutdown_listeners(tcp_server); @@ -512,17 +821,19 @@ void Chttp2ServerListener::Orphan() { // Chttp2ServerAddPort() // -grpc_error* Chttp2ServerAddPort(Server* server, const char* addr, - grpc_channel_args* args, int* port_num) { +grpc_error_handle Chttp2ServerAddPort(Server* server, const char* addr, + grpc_channel_args* args, + Chttp2ServerArgsModifier args_modifier, + int* port_num) { if (strncmp(addr, "external:", 9) == 0) { - return grpc_core::Chttp2ServerListener::CreateWithAcceptor(server, addr, - args); + return grpc_core::Chttp2ServerListener::CreateWithAcceptor( + server, addr, args, args_modifier); } *port_num = -1; grpc_resolved_addresses* resolved = nullptr; - std::vector<grpc_error*> error_list; + std::vector<grpc_error_handle> error_list; // Using lambda to avoid use of goto. - grpc_error* error = [&]() { + grpc_error_handle error = [&]() { if (absl::StartsWith(addr, kUnixUriPrefix)) { error = grpc_resolve_unix_domain_address( addr + sizeof(kUnixUriPrefix) - 1, &resolved); @@ -540,10 +851,10 @@ grpc_error* Chttp2ServerAddPort(Server* server, const char* addr, if (*port_num != -1 && grpc_sockaddr_get_port(&resolved->addrs[i]) == 0) { grpc_sockaddr_set_port(&resolved->addrs[i], *port_num); } - int port_temp; + int port_temp = -1; error = grpc_core::Chttp2ServerListener::Create( server, &resolved->addrs[i], grpc_channel_args_copy(args), - &port_temp); + args_modifier, &port_temp); if (error != GRPC_ERROR_NONE) { error_list.push_back(error); } else { @@ -567,13 +878,13 @@ grpc_error* Chttp2ServerAddPort(Server* server, const char* addr, resolved->naddrs - error_list.size(), resolved->naddrs); error = GRPC_ERROR_CREATE_REFERENCING_FROM_COPIED_STRING( msg.c_str(), error_list.data(), error_list.size()); - gpr_log(GPR_INFO, "WARNING: %s", grpc_error_string(error)); + gpr_log(GPR_INFO, "WARNING: %s", grpc_error_std_string(error).c_str()); GRPC_ERROR_UNREF(error); // we managed to bind some addresses: continue without error } return GRPC_ERROR_NONE; }(); // lambda end - for (grpc_error* error : error_list) { + for (grpc_error_handle error : error_list) { GRPC_ERROR_UNREF(error); } grpc_channel_args_destroy(args); diff --git a/grpc/src/core/ext/transport/chttp2/server/chttp2_server.h b/grpc/src/core/ext/transport/chttp2/server/chttp2_server.h index 095cc5e4..e4e6b7cc 100644 --- a/grpc/src/core/ext/transport/chttp2/server/chttp2_server.h +++ b/grpc/src/core/ext/transport/chttp2/server/chttp2_server.h @@ -28,10 +28,19 @@ namespace grpc_core { +// A function to modify channel args for a listening addr:port. Note that this +// is used to create a security connector for listeners when the servers are +// configured with a config fetcher. Not invoked if there is no config fetcher +// added to the server. Takes ownership of the args. Caller takes ownership of +// returned args. On failure, the error parameter will be set. +using Chttp2ServerArgsModifier = + std::function<grpc_channel_args*(grpc_channel_args*, grpc_error_handle*)>; + /// Adds a port to \a server. Sets \a port_num to the port number. /// Takes ownership of \a args. -grpc_error* Chttp2ServerAddPort(Server* server, const char* addr, - grpc_channel_args* args, int* port_num); +grpc_error_handle Chttp2ServerAddPort( + Server* server, const char* addr, grpc_channel_args* args, + Chttp2ServerArgsModifier connection_args_modifier, int* port_num); } // namespace grpc_core diff --git a/grpc/src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc b/grpc/src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc index eebae9ef..e00bc927 100644 --- a/grpc/src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc +++ b/grpc/src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc @@ -27,17 +27,26 @@ #include "src/core/lib/surface/api_trace.h" #include "src/core/lib/surface/server.h" +namespace { + +grpc_channel_args* ModifyArgsForConnection(grpc_channel_args* args, + grpc_error_handle* /*error*/) { + return args; +} + +} // namespace + int grpc_server_add_insecure_http2_port(grpc_server* server, const char* addr) { grpc_core::ExecCtx exec_ctx; int port_num = 0; GRPC_API_TRACE("grpc_server_add_insecure_http2_port(server=%p, addr=%s)", 2, (server, addr)); - grpc_error* err = grpc_core::Chttp2ServerAddPort( + grpc_error_handle err = grpc_core::Chttp2ServerAddPort( server->core_server.get(), addr, - grpc_channel_args_copy(server->core_server->channel_args()), &port_num); + grpc_channel_args_copy(server->core_server->channel_args()), + ModifyArgsForConnection, &port_num); if (err != GRPC_ERROR_NONE) { - const char* msg = grpc_error_string(err); - gpr_log(GPR_ERROR, "%s", msg); + gpr_log(GPR_ERROR, "%s", grpc_error_std_string(err).c_str()); GRPC_ERROR_UNREF(err); } diff --git a/grpc/src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc b/grpc/src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc index e27c9079..fd57939f 100644 --- a/grpc/src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc +++ b/grpc/src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc @@ -51,16 +51,16 @@ void grpc_server_add_insecure_channel_from_fd(grpc_server* server, grpc_transport* transport = grpc_create_chttp2_transport( server_args, server_endpoint, false /* is_client */); - grpc_error* error = + grpc_error_handle error = core_server->SetupTransport(transport, nullptr, server_args, nullptr); if (error == GRPC_ERROR_NONE) { for (grpc_pollset* pollset : core_server->pollsets()) { grpc_endpoint_add_to_pollset(server_endpoint, pollset); } - grpc_chttp2_transport_start_reading(transport, nullptr, nullptr); + grpc_chttp2_transport_start_reading(transport, nullptr, nullptr, nullptr); } else { gpr_log(GPR_ERROR, "Failed to create channel: %s", - grpc_error_string(error)); + grpc_error_std_string(error).c_str()); GRPC_ERROR_UNREF(error); grpc_transport_destroy(transport); } diff --git a/grpc/src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.cc b/grpc/src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.cc index a181db47..f0a0eed9 100644 --- a/grpc/src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.cc +++ b/grpc/src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.cc @@ -18,12 +18,11 @@ #include <grpc/support/port_platform.h> -#include <grpc/grpc.h> - #include <string.h> #include "absl/strings/str_cat.h" +#include <grpc/grpc.h> #include <grpc/support/alloc.h> #include <grpc/support/log.h> @@ -38,10 +37,39 @@ #include "src/core/lib/surface/api_trace.h" #include "src/core/lib/surface/server.h" +namespace { + +grpc_channel_args* ModifyArgsForConnection(grpc_channel_args* args, + grpc_error_handle* error) { + grpc_server_credentials* server_credentials = + grpc_find_server_credentials_in_args(args); + if (server_credentials == nullptr) { + *error = GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "Could not find server credentials"); + return args; + } + auto security_connector = server_credentials->create_security_connector(args); + if (security_connector == nullptr) { + *error = GRPC_ERROR_CREATE_FROM_COPIED_STRING( + absl::StrCat("Unable to create secure server with credentials of type ", + server_credentials->type()) + .c_str()); + return args; + } + grpc_arg arg_to_add = + grpc_security_connector_to_arg(security_connector.get()); + grpc_channel_args* new_args = + grpc_channel_args_copy_and_add(args, &arg_to_add, 1); + grpc_channel_args_destroy(args); + return new_args; +} + +} // namespace + int grpc_server_add_secure_http2_port(grpc_server* server, const char* addr, grpc_server_credentials* creds) { grpc_core::ExecCtx exec_ctx; - grpc_error* err = GRPC_ERROR_NONE; + grpc_error_handle err = GRPC_ERROR_NONE; grpc_core::RefCountedPtr<grpc_server_security_connector> sc; int port_num = 0; grpc_channel_args* args = nullptr; @@ -55,30 +83,45 @@ int grpc_server_add_secure_http2_port(grpc_server* server, const char* addr, "No credentials specified for secure server port (creds==NULL)"); goto done; } - sc = creds->create_security_connector(); - if (sc == nullptr) { - err = GRPC_ERROR_CREATE_FROM_COPIED_STRING( - absl::StrCat("Unable to create secure server with credentials of type ", - creds->type()) - .c_str()); - goto done; + // TODO(yashykt): Ideally, we would not want to have different behavior here + // based on whether a config fetcher is configured or not. Currently, we have + // a feature for SSL credentials reloading with an application callback that + // assumes that there is a single security connector. If we delay the creation + // of the security connector to after the creation of the listener(s), we + // would have potentially multiple security connectors which breaks the + // assumption for SSL creds reloading. When the API for SSL creds reloading is + // rewritten, we would be able to make this workaround go away by removing + // that assumption. As an immediate drawback of this workaround, config + // fetchers need to be registered before adding ports to the server. + if (server->core_server->config_fetcher() != nullptr) { + // Create channel args. + grpc_arg arg_to_add = grpc_server_credentials_to_arg(creds); + args = grpc_channel_args_copy_and_add(server->core_server->channel_args(), + &arg_to_add, 1); + } else { + sc = creds->create_security_connector(nullptr); + if (sc == nullptr) { + err = GRPC_ERROR_CREATE_FROM_COPIED_STRING( + absl::StrCat( + "Unable to create secure server with credentials of type ", + creds->type()) + .c_str()); + goto done; + } + grpc_arg args_to_add[2]; + args_to_add[0] = grpc_server_credentials_to_arg(creds); + args_to_add[1] = grpc_security_connector_to_arg(sc.get()); + args = grpc_channel_args_copy_and_add(server->core_server->channel_args(), + args_to_add, + GPR_ARRAY_SIZE(args_to_add)); } - // Create channel args. - grpc_arg args_to_add[2]; - args_to_add[0] = grpc_server_credentials_to_arg(creds); - args_to_add[1] = grpc_security_connector_to_arg(sc.get()); - args = - grpc_channel_args_copy_and_add(server->core_server->channel_args(), - args_to_add, GPR_ARRAY_SIZE(args_to_add)); // Add server port. err = grpc_core::Chttp2ServerAddPort(server->core_server.get(), addr, args, - &port_num); + ModifyArgsForConnection, &port_num); done: sc.reset(DEBUG_LOCATION, "server"); - if (err != GRPC_ERROR_NONE) { - const char* msg = grpc_error_string(err); - gpr_log(GPR_ERROR, "%s", msg); + gpr_log(GPR_ERROR, "%s", grpc_error_std_string(err).c_str()); GRPC_ERROR_UNREF(err); } diff --git a/grpc/src/core/ext/transport/chttp2/transport/chttp2_transport.cc b/grpc/src/core/ext/transport/chttp2/transport/chttp2_transport.cc index 900cd3cc..1ff64756 100644 --- a/grpc/src/core/ext/transport/chttp2/transport/chttp2_transport.cc +++ b/grpc/src/core/ext/transport/chttp2/transport/chttp2_transport.cc @@ -100,23 +100,23 @@ grpc_core::DebugOnlyTraceFlag grpc_trace_chttp2_refcount(false, "chttp2_refcount"); // forward declarations of various callbacks that we'll build closures around -static void write_action_begin_locked(void* t, grpc_error* error); -static void write_action(void* t, grpc_error* error); -static void write_action_end(void* t, grpc_error* error); -static void write_action_end_locked(void* t, grpc_error* error); +static void write_action_begin_locked(void* t, grpc_error_handle error); +static void write_action(void* t, grpc_error_handle error); +static void write_action_end(void* t, grpc_error_handle error); +static void write_action_end_locked(void* t, grpc_error_handle error); -static void read_action(void* t, grpc_error* error); -static void read_action_locked(void* t, grpc_error* error); +static void read_action(void* t, grpc_error_handle error); +static void read_action_locked(void* t, grpc_error_handle error); static void continue_read_action_locked(grpc_chttp2_transport* t); -static void complete_fetch(void* gs, grpc_error* error); -static void complete_fetch_locked(void* gs, grpc_error* error); +static void complete_fetch(void* gs, grpc_error_handle error); +static void complete_fetch_locked(void* gs, grpc_error_handle error); // Set a transport level setting, and push it to our peer static void queue_setting_update(grpc_chttp2_transport* t, grpc_chttp2_setting_id id, uint32_t value); static void close_from_api(grpc_chttp2_transport* t, grpc_chttp2_stream* s, - grpc_error* error); + grpc_error_handle error); // Start new streams that have been created if we can static void maybe_start_some_streams(grpc_chttp2_transport* t); @@ -126,45 +126,68 @@ static void connectivity_state_set(grpc_chttp2_transport* t, const absl::Status& status, const char* reason); -static void benign_reclaimer(void* arg, grpc_error* error); -static void destructive_reclaimer(void* arg, grpc_error* error); -static void benign_reclaimer_locked(void* arg, grpc_error* error); -static void destructive_reclaimer_locked(void* arg, grpc_error* error); +static void benign_reclaimer(void* arg, grpc_error_handle error); +static void destructive_reclaimer(void* arg, grpc_error_handle error); +static void benign_reclaimer_locked(void* arg, grpc_error_handle error); +static void destructive_reclaimer_locked(void* arg, grpc_error_handle error); static void post_benign_reclaimer(grpc_chttp2_transport* t); static void post_destructive_reclaimer(grpc_chttp2_transport* t); -static void close_transport_locked(grpc_chttp2_transport* t, grpc_error* error); -static void end_all_the_calls(grpc_chttp2_transport* t, grpc_error* error); - -static void start_bdp_ping(void* tp, grpc_error* error); -static void finish_bdp_ping(void* tp, grpc_error* error); -static void start_bdp_ping_locked(void* tp, grpc_error* error); -static void finish_bdp_ping_locked(void* tp, grpc_error* error); -static void next_bdp_ping_timer_expired(void* tp, grpc_error* error); -static void next_bdp_ping_timer_expired_locked(void* tp, grpc_error* error); - -static void cancel_pings(grpc_chttp2_transport* t, grpc_error* error); +static void close_transport_locked(grpc_chttp2_transport* t, + grpc_error_handle error); +static void end_all_the_calls(grpc_chttp2_transport* t, + grpc_error_handle error); + +static void start_bdp_ping(void* tp, grpc_error_handle error); +static void finish_bdp_ping(void* tp, grpc_error_handle error); +static void start_bdp_ping_locked(void* tp, grpc_error_handle error); +static void finish_bdp_ping_locked(void* tp, grpc_error_handle error); +static void next_bdp_ping_timer_expired(void* tp, grpc_error_handle error); +static void next_bdp_ping_timer_expired_locked(void* tp, + grpc_error_handle error); + +static void cancel_pings(grpc_chttp2_transport* t, grpc_error_handle error); static void send_ping_locked(grpc_chttp2_transport* t, grpc_closure* on_initiate, grpc_closure* on_ack); -static void retry_initiate_ping_locked(void* tp, grpc_error* error); +static void retry_initiate_ping_locked(void* tp, grpc_error_handle error); // keepalive-relevant functions -static void init_keepalive_ping(void* arg, grpc_error* error); -static void init_keepalive_ping_locked(void* arg, grpc_error* error); -static void start_keepalive_ping(void* arg, grpc_error* error); -static void finish_keepalive_ping(void* arg, grpc_error* error); -static void start_keepalive_ping_locked(void* arg, grpc_error* error); -static void finish_keepalive_ping_locked(void* arg, grpc_error* error); -static void keepalive_watchdog_fired(void* arg, grpc_error* error); -static void keepalive_watchdog_fired_locked(void* arg, grpc_error* error); +static void init_keepalive_ping(void* arg, grpc_error_handle error); +static void init_keepalive_ping_locked(void* arg, grpc_error_handle error); +static void start_keepalive_ping(void* arg, grpc_error_handle error); +static void finish_keepalive_ping(void* arg, grpc_error_handle error); +static void start_keepalive_ping_locked(void* arg, grpc_error_handle error); +static void finish_keepalive_ping_locked(void* arg, grpc_error_handle error); +static void keepalive_watchdog_fired(void* arg, grpc_error_handle error); +static void keepalive_watchdog_fired_locked(void* arg, grpc_error_handle error); -static void reset_byte_stream(void* arg, grpc_error* error); +static void reset_byte_stream(void* arg, grpc_error_handle error); // Flow control default enabled. Can be disabled by setting // GRPC_EXPERIMENTAL_DISABLE_FLOW_CONTROL bool g_flow_control_enabled = true; +namespace grpc_core { + +namespace { +TestOnlyGlobalHttp2TransportInitCallback test_only_init_callback = nullptr; +TestOnlyGlobalHttp2TransportDestructCallback test_only_destruct_callback = + nullptr; +} // namespace + +void TestOnlySetGlobalHttp2TransportInitCallback( + TestOnlyGlobalHttp2TransportInitCallback callback) { + test_only_init_callback = callback; +} + +void TestOnlySetGlobalHttp2TransportDestructCallback( + TestOnlyGlobalHttp2TransportDestructCallback callback) { + test_only_destruct_callback = callback; +} + +} // namespace grpc_core + // // CONSTRUCTION/DESTRUCTION/REFCOUNTING // @@ -183,7 +206,7 @@ grpc_chttp2_transport::~grpc_chttp2_transport() { grpc_slice_buffer_destroy_internal(&outbuf); grpc_chttp2_hpack_compressor_destroy(&hpack_compressor); - grpc_error* error = + grpc_error_handle error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("Transport destroyed"); // ContextList::Execute follows semantics of a callback function and does not // take a ref on error @@ -221,6 +244,9 @@ grpc_chttp2_transport::~grpc_chttp2_transport() { GRPC_ERROR_UNREF(closed_with_error); gpr_free(ping_acks); + if (grpc_core::test_only_destruct_callback != nullptr) { + grpc_core::test_only_destruct_callback(); + } } static const grpc_transport_vtable* get_vtable(void); @@ -366,7 +392,9 @@ static bool read_channel_args(grpc_chttp2_transport* t, t->channelz_socket = grpc_core::MakeRefCounted<grpc_core::channelz::SocketNode>( std::string(grpc_endpoint_get_local_address(t->ep)), t->peer_string, - absl::StrFormat("%s %s", get_vtable()->name, t->peer_string)); + absl::StrFormat("%s %s", get_vtable()->name, t->peer_string), + grpc_core::channelz::SocketNode::Security::GetFromChannelArgs( + channel_args)); } return enable_bdp; } @@ -504,9 +532,12 @@ grpc_chttp2_transport::grpc_chttp2_transport( grpc_chttp2_initiate_write(this, GRPC_CHTTP2_INITIATE_WRITE_INITIAL_WRITE); post_benign_reclaimer(this); + if (grpc_core::test_only_init_callback != nullptr) { + grpc_core::test_only_init_callback(); + } } -static void destroy_transport_locked(void* tp, grpc_error* /*error*/) { +static void destroy_transport_locked(void* tp, grpc_error_handle /*error*/) { grpc_chttp2_transport* t = static_cast<grpc_chttp2_transport*>(tp); t->destroying = 1; close_transport_locked( @@ -524,7 +555,7 @@ static void destroy_transport(grpc_transport* gt) { } static void close_transport_locked(grpc_chttp2_transport* t, - grpc_error* error) { + grpc_error_handle error) { end_all_the_calls(t, GRPC_ERROR_REF(error)); cancel_pings(t, GRPC_ERROR_REF(error)); if (t->closed_with_error == GRPC_ERROR_NONE) { @@ -579,6 +610,11 @@ static void close_transport_locked(grpc_chttp2_transport* t, GRPC_ERROR_REF(error)); t->notify_on_receive_settings = nullptr; } + if (t->notify_on_close != nullptr) { + grpc_core::ExecCtx::Run(DEBUG_LOCATION, t->notify_on_close, + GRPC_ERROR_REF(error)); + t->notify_on_close = nullptr; + } GRPC_ERROR_UNREF(error); } @@ -698,7 +734,7 @@ static int init_stream(grpc_transport* gt, grpc_stream* gs, return 0; } -static void destroy_stream_locked(void* sp, grpc_error* /*error*/) { +static void destroy_stream_locked(void* sp, grpc_error_handle /*error*/) { GPR_TIMER_SCOPE("destroy_stream", 0); grpc_chttp2_stream* s = static_cast<grpc_chttp2_stream*>(sp); s->~grpc_chttp2_stream(); @@ -786,7 +822,7 @@ static void set_write_state(grpc_chttp2_transport* t, if (st == GRPC_CHTTP2_WRITE_STATE_IDLE) { grpc_core::ExecCtx::RunList(DEBUG_LOCATION, &t->run_after_write); if (t->close_transport_on_writes_finished != nullptr) { - grpc_error* err = t->close_transport_on_writes_finished; + grpc_error_handle err = t->close_transport_on_writes_finished; t->close_transport_on_writes_finished = nullptr; close_transport_locked(t, err); } @@ -918,7 +954,8 @@ static const char* begin_writing_desc(bool partial) { } } -static void write_action_begin_locked(void* gt, grpc_error* /*error_ignored*/) { +static void write_action_begin_locked(void* gt, + grpc_error_handle /*error_ignored*/) { GPR_TIMER_SCOPE("write_action_begin_locked", 0); grpc_chttp2_transport* t = static_cast<grpc_chttp2_transport*>(gt); GPR_ASSERT(t->write_state != GRPC_CHTTP2_WRITE_STATE_IDLE); @@ -957,7 +994,7 @@ static void write_action_begin_locked(void* gt, grpc_error* /*error_ignored*/) { } } -static void write_action(void* gt, grpc_error* /*error*/) { +static void write_action(void* gt, grpc_error_handle /*error*/) { GPR_TIMER_SCOPE("write_action", 0); grpc_chttp2_transport* t = static_cast<grpc_chttp2_transport*>(gt); void* cl = t->cl; @@ -969,7 +1006,7 @@ static void write_action(void* gt, grpc_error* /*error*/) { cl); } -static void write_action_end(void* tp, grpc_error* error) { +static void write_action_end(void* tp, grpc_error_handle error) { grpc_chttp2_transport* t = static_cast<grpc_chttp2_transport*>(tp); t->combiner->Run(GRPC_CLOSURE_INIT(&t->write_action_end_locked, write_action_end_locked, t, nullptr), @@ -978,7 +1015,7 @@ static void write_action_end(void* tp, grpc_error* error) { // Callback from the grpc_endpoint after bytes have been written by calling // sendmsg -static void write_action_end_locked(void* tp, grpc_error* error) { +static void write_action_end_locked(void* tp, grpc_error_handle error) { GPR_TIMER_SCOPE("terminate_writing_with_lock", 0); grpc_chttp2_transport* t = static_cast<grpc_chttp2_transport*>(tp); @@ -1067,7 +1104,7 @@ void grpc_chttp2_add_incoming_goaway(grpc_chttp2_transport* t, // received a GOAWAY with a non NO_ERROR code. if (goaway_error != GRPC_HTTP2_NO_ERROR) { gpr_log(GPR_INFO, "%s: Got goaway [%d] err=%s", t->peer_string.c_str(), - goaway_error, grpc_error_string(t->goaway_error)); + goaway_error, grpc_error_std_string(t->goaway_error).c_str()); } absl::Status status = grpc_error_to_absl_status(t->goaway_error); // When a client receives a GOAWAY with error code ENHANCE_YOUR_CALM and debug @@ -1173,7 +1210,8 @@ static void null_then_sched_closure(grpc_closure** closure) { void grpc_chttp2_complete_closure_step(grpc_chttp2_transport* t, grpc_chttp2_stream* /*s*/, grpc_closure** pclosure, - grpc_error* error, const char* desc) { + grpc_error_handle error, + const char* desc) { grpc_closure* closure = *pclosure; *pclosure = nullptr; if (closure == nullptr) { @@ -1182,7 +1220,6 @@ void grpc_chttp2_complete_closure_step(grpc_chttp2_transport* t, } closure->next_data.scratch -= CLOSURE_BARRIER_FIRST_REF_BIT; if (GRPC_TRACE_FLAG_ENABLED(grpc_http_trace)) { - const char* errstr = grpc_error_string(error); gpr_log( GPR_INFO, "complete_closure_step: t=%p %p refs=%d flags=0x%04x desc=%s err=%s " @@ -1192,7 +1229,8 @@ void grpc_chttp2_complete_closure_step(grpc_chttp2_transport* t, CLOSURE_BARRIER_FIRST_REF_BIT), static_cast<int>(closure->next_data.scratch % CLOSURE_BARRIER_FIRST_REF_BIT), - desc, errstr, write_state_name(t->write_state)); + desc, grpc_error_std_string(error).c_str(), + write_state_name(t->write_state)); } if (error != GRPC_ERROR_NONE) { if (closure->error_data.error == GRPC_ERROR_NONE) { @@ -1281,7 +1319,8 @@ static void continue_fetching_send_locked(grpc_chttp2_transport* t, UINT32_MAX, GRPC_CLOSURE_INIT(&s->complete_fetch_locked, ::complete_fetch, s, grpc_schedule_on_exec_ctx))) { - grpc_error* error = s->fetching_send_message->Pull(&s->fetching_slice); + grpc_error_handle error = + s->fetching_send_message->Pull(&s->fetching_slice); if (error != GRPC_ERROR_NONE) { s->fetching_send_message.reset(); grpc_chttp2_cancel_stream(t, s, error); @@ -1292,14 +1331,14 @@ static void continue_fetching_send_locked(grpc_chttp2_transport* t, } } -static void complete_fetch(void* gs, grpc_error* error) { +static void complete_fetch(void* gs, grpc_error_handle error) { grpc_chttp2_stream* s = static_cast<grpc_chttp2_stream*>(gs); s->t->combiner->Run(GRPC_CLOSURE_INIT(&s->complete_fetch_locked, ::complete_fetch_locked, s, nullptr), GRPC_ERROR_REF(error)); } -static void complete_fetch_locked(void* gs, grpc_error* error) { +static void complete_fetch_locked(void* gs, grpc_error_handle error) { grpc_chttp2_stream* s = static_cast<grpc_chttp2_stream*>(gs); grpc_chttp2_transport* t = s->t; if (error == GRPC_ERROR_NONE) { @@ -1329,7 +1368,7 @@ static void log_metadata(const grpc_metadata_batch* md_batch, uint32_t id, } static void perform_stream_op_locked(void* stream_op, - grpc_error* /*error_ignored*/) { + grpc_error_handle /*error_ignored*/) { GPR_TIMER_SCOPE("perform_stream_op_locked", 0); grpc_transport_stream_op_batch* op = @@ -1613,7 +1652,7 @@ static void perform_stream_op(grpc_transport* gt, grpc_stream* gs, GRPC_ERROR_NONE); } -static void cancel_pings(grpc_chttp2_transport* t, grpc_error* error) { +static void cancel_pings(grpc_chttp2_transport* t, grpc_error_handle error) { // callback remaining pings: they're not allowed to call into the transport, // and maybe they hold resources that need to be freed grpc_chttp2_ping_queue* pq = &t->ping_queue; @@ -1680,14 +1719,14 @@ static void send_keepalive_ping_locked(grpc_chttp2_transport* t) { GRPC_ERROR_NONE); } -void grpc_chttp2_retry_initiate_ping(void* tp, grpc_error* error) { +void grpc_chttp2_retry_initiate_ping(void* tp, grpc_error_handle error) { grpc_chttp2_transport* t = static_cast<grpc_chttp2_transport*>(tp); t->combiner->Run(GRPC_CLOSURE_INIT(&t->retry_initiate_ping_locked, retry_initiate_ping_locked, t, nullptr), GRPC_ERROR_REF(error)); } -static void retry_initiate_ping_locked(void* tp, grpc_error* error) { +static void retry_initiate_ping_locked(void* tp, grpc_error_handle error) { grpc_chttp2_transport* t = static_cast<grpc_chttp2_transport*>(tp); t->ping_state.is_delayed_ping_timer_set = false; if (error == GRPC_ERROR_NONE) { @@ -1710,10 +1749,10 @@ void grpc_chttp2_ack_ping(grpc_chttp2_transport* t, uint64_t id) { } } -static void send_goaway(grpc_chttp2_transport* t, grpc_error* error) { +static void send_goaway(grpc_chttp2_transport* t, grpc_error_handle error) { // We want to log this irrespective of whether http tracing is enabled gpr_log(GPR_INFO, "%s: Sending goaway err=%s", t->peer_string.c_str(), - grpc_error_string(error)); + grpc_error_std_string(error).c_str()); t->sent_goaway_state = GRPC_CHTTP2_GOAWAY_SEND_SCHEDULED; grpc_http2_error_code http_error; grpc_slice slice; @@ -1751,7 +1790,7 @@ void grpc_chttp2_reset_ping_clock(grpc_chttp2_transport* t) { } static void perform_transport_op_locked(void* stream_op, - grpc_error* /*error_ignored*/) { + grpc_error_handle /*error_ignored*/) { grpc_transport_op* op = static_cast<grpc_transport_op*>(stream_op); grpc_chttp2_transport* t = static_cast<grpc_chttp2_transport*>(op->handler_private.extra_arg); @@ -1831,7 +1870,7 @@ void grpc_chttp2_maybe_complete_recv_initial_metadata( void grpc_chttp2_maybe_complete_recv_message(grpc_chttp2_transport* /*t*/, grpc_chttp2_stream* s) { - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; if (s->recv_message_ready != nullptr) { *s->recv_message = nullptr; if (s->final_metadata_requested && s->seen_error) { @@ -1981,7 +2020,7 @@ void grpc_chttp2_maybe_complete_recv_trailing_metadata(grpc_chttp2_transport* t, } static void remove_stream(grpc_chttp2_transport* t, uint32_t id, - grpc_error* error) { + grpc_error_handle error) { grpc_chttp2_stream* s = static_cast<grpc_chttp2_stream*>( grpc_chttp2_stream_map_delete(&t->stream_map, id)); GPR_DEBUG_ASSERT(s); @@ -2024,7 +2063,7 @@ static void remove_stream(grpc_chttp2_transport* t, uint32_t id, } void grpc_chttp2_cancel_stream(grpc_chttp2_transport* t, grpc_chttp2_stream* s, - grpc_error* due_to_error) { + grpc_error_handle due_to_error) { if (!t->is_client && !s->sent_trailing_metadata && grpc_error_has_clear_grpc_status(due_to_error)) { close_from_api(t, s, due_to_error); @@ -2048,7 +2087,7 @@ void grpc_chttp2_cancel_stream(grpc_chttp2_transport* t, grpc_chttp2_stream* s, } void grpc_chttp2_fake_status(grpc_chttp2_transport* t, grpc_chttp2_stream* s, - grpc_error* error) { + grpc_error_handle error) { grpc_status_code status; grpc_slice slice; grpc_error_get_status(error, s->deadline, &status, &slice, nullptr, nullptr); @@ -2085,7 +2124,8 @@ void grpc_chttp2_fake_status(grpc_chttp2_transport* t, grpc_chttp2_stream* s, GRPC_ERROR_UNREF(error); } -static void add_error(grpc_error* error, grpc_error** refs, size_t* nrefs) { +static void add_error(grpc_error_handle error, grpc_error_handle* refs, + size_t* nrefs) { if (error == GRPC_ERROR_NONE) return; for (size_t i = 0; i < *nrefs; i++) { if (error == refs[i]) { @@ -2096,16 +2136,17 @@ static void add_error(grpc_error* error, grpc_error** refs, size_t* nrefs) { ++*nrefs; } -static grpc_error* removal_error(grpc_error* extra_error, grpc_chttp2_stream* s, - const char* master_error_msg) { - grpc_error* refs[3]; +static grpc_error_handle removal_error(grpc_error_handle extra_error, + grpc_chttp2_stream* s, + const char* main_error_msg) { + grpc_error_handle refs[3]; size_t nrefs = 0; add_error(s->read_closed_error, refs, &nrefs); add_error(s->write_closed_error, refs, &nrefs); add_error(extra_error, refs, &nrefs); - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; if (nrefs > 0) { - error = GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING(master_error_msg, + error = GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING(main_error_msg, refs, nrefs); } GRPC_ERROR_UNREF(extra_error); @@ -2113,7 +2154,8 @@ static grpc_error* removal_error(grpc_error* extra_error, grpc_chttp2_stream* s, } static void flush_write_list(grpc_chttp2_transport* t, grpc_chttp2_stream* s, - grpc_chttp2_write_cb** list, grpc_error* error) { + grpc_chttp2_write_cb** list, + grpc_error_handle error) { while (*list) { grpc_chttp2_write_cb* cb = *list; *list = cb->next; @@ -2126,7 +2168,8 @@ static void flush_write_list(grpc_chttp2_transport* t, grpc_chttp2_stream* s, } void grpc_chttp2_fail_pending_writes(grpc_chttp2_transport* t, - grpc_chttp2_stream* s, grpc_error* error) { + grpc_chttp2_stream* s, + grpc_error_handle error) { error = removal_error(error, s, "Pending writes failed due to stream closure"); s->send_initial_metadata = nullptr; @@ -2150,10 +2193,10 @@ void grpc_chttp2_fail_pending_writes(grpc_chttp2_transport* t, void grpc_chttp2_mark_stream_closed(grpc_chttp2_transport* t, grpc_chttp2_stream* s, int close_reads, - int close_writes, grpc_error* error) { + int close_writes, grpc_error_handle error) { if (s->read_closed && s->write_closed) { // already closed, but we should still fake the status if needed. - grpc_error* overall_error = removal_error(error, s, "Stream removed"); + grpc_error_handle overall_error = removal_error(error, s, "Stream removed"); if (overall_error != GRPC_ERROR_NONE) { grpc_chttp2_fake_status(t, s, overall_error); } @@ -2174,7 +2217,7 @@ void grpc_chttp2_mark_stream_closed(grpc_chttp2_transport* t, } if (s->read_closed && s->write_closed) { became_closed = true; - grpc_error* overall_error = + grpc_error_handle overall_error = removal_error(GRPC_ERROR_REF(error), s, "Stream removed"); if (s->id != 0) { remove_stream(t, s->id, GRPC_ERROR_REF(overall_error)); @@ -2203,7 +2246,7 @@ void grpc_chttp2_mark_stream_closed(grpc_chttp2_transport* t, } static void close_from_api(grpc_chttp2_transport* t, grpc_chttp2_stream* s, - grpc_error* error) { + grpc_error_handle error) { grpc_slice hdr; grpc_slice status_hdr; grpc_slice http_status_hdr; @@ -2361,7 +2404,7 @@ static void close_from_api(grpc_chttp2_transport* t, grpc_chttp2_stream* s, } struct cancel_stream_cb_args { - grpc_error* error; + grpc_error_handle error; grpc_chttp2_transport* t; }; @@ -2371,7 +2414,8 @@ static void cancel_stream_cb(void* user_data, uint32_t /*key*/, void* stream) { grpc_chttp2_cancel_stream(args->t, s, GRPC_ERROR_REF(args->error)); } -static void end_all_the_calls(grpc_chttp2_transport* t, grpc_error* error) { +static void end_all_the_calls(grpc_chttp2_transport* t, + grpc_error_handle error) { intptr_t http2_error; // If there is no explicit grpc or HTTP/2 error, set to UNAVAILABLE on server. if (!t->is_client && !grpc_error_has_clear_grpc_status(error) && @@ -2425,15 +2469,15 @@ void grpc_chttp2_act_on_flowctl_action( }); } -static grpc_error* try_http_parsing(grpc_chttp2_transport* t) { +static grpc_error_handle try_http_parsing(grpc_chttp2_transport* t) { grpc_http_parser parser; size_t i = 0; - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; grpc_http_response response; grpc_http_parser_init(&parser, GRPC_HTTP_RESPONSE, &response); - grpc_error* parse_error = GRPC_ERROR_NONE; + grpc_error_handle parse_error = GRPC_ERROR_NONE; for (; i < t->read_buffer.count && parse_error == GRPC_ERROR_NONE; i++) { parse_error = grpc_http_parser_parse(&parser, t->read_buffer.slices[i], nullptr); @@ -2454,34 +2498,34 @@ static grpc_error* try_http_parsing(grpc_chttp2_transport* t) { return error; } -static void read_action(void* tp, grpc_error* error) { +static void read_action(void* tp, grpc_error_handle error) { grpc_chttp2_transport* t = static_cast<grpc_chttp2_transport*>(tp); t->combiner->Run( GRPC_CLOSURE_INIT(&t->read_action_locked, read_action_locked, t, nullptr), GRPC_ERROR_REF(error)); } -static void read_action_locked(void* tp, grpc_error* error) { +static void read_action_locked(void* tp, grpc_error_handle error) { GPR_TIMER_SCOPE("reading_action_locked", 0); grpc_chttp2_transport* t = static_cast<grpc_chttp2_transport*>(tp); GRPC_ERROR_REF(error); - grpc_error* err = error; + grpc_error_handle err = error; if (err != GRPC_ERROR_NONE) { err = grpc_error_set_int(GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Endpoint read failed", &err, 1), GRPC_ERROR_INT_OCCURRED_DURING_WRITE, t->write_state); } - GPR_SWAP(grpc_error*, err, error); + GPR_SWAP(grpc_error_handle, err, error); GRPC_ERROR_UNREF(err); if (t->closed_with_error == GRPC_ERROR_NONE) { GPR_TIMER_SCOPE("reading_action.parse", 0); size_t i = 0; - grpc_error* errors[3] = {GRPC_ERROR_REF(error), GRPC_ERROR_NONE, - GRPC_ERROR_NONE}; + grpc_error_handle errors[3] = {GRPC_ERROR_REF(error), GRPC_ERROR_NONE, + GRPC_ERROR_NONE}; for (; i < t->read_buffer.count && errors[1] == GRPC_ERROR_NONE; i++) { errors[1] = grpc_chttp2_perform_read(t, t->read_buffer.slices[i]); } @@ -2569,23 +2613,21 @@ void schedule_bdp_ping_locked(grpc_chttp2_transport* t) { grpc_schedule_on_exec_ctx), GRPC_CLOSURE_INIT(&t->finish_bdp_ping_locked, finish_bdp_ping, t, grpc_schedule_on_exec_ctx)); - // TODO(yashykt): Enabling this causes internal b/168345569. Re-enable once - // fixed. - // grpc_chttp2_initiate_write(t, GRPC_CHTTP2_INITIATE_WRITE_BDP_PING); + grpc_chttp2_initiate_write(t, GRPC_CHTTP2_INITIATE_WRITE_BDP_PING); } -static void start_bdp_ping(void* tp, grpc_error* error) { +static void start_bdp_ping(void* tp, grpc_error_handle error) { grpc_chttp2_transport* t = static_cast<grpc_chttp2_transport*>(tp); t->combiner->Run(GRPC_CLOSURE_INIT(&t->start_bdp_ping_locked, start_bdp_ping_locked, t, nullptr), GRPC_ERROR_REF(error)); } -static void start_bdp_ping_locked(void* tp, grpc_error* error) { +static void start_bdp_ping_locked(void* tp, grpc_error_handle error) { grpc_chttp2_transport* t = static_cast<grpc_chttp2_transport*>(tp); if (GRPC_TRACE_FLAG_ENABLED(grpc_http_trace)) { gpr_log(GPR_INFO, "%s: Start BDP ping err=%s", t->peer_string.c_str(), - grpc_error_string(error)); + grpc_error_std_string(error).c_str()); } if (error != GRPC_ERROR_NONE || t->closed_with_error != GRPC_ERROR_NONE) { return; @@ -2598,18 +2640,18 @@ static void start_bdp_ping_locked(void* tp, grpc_error* error) { t->bdp_ping_started = true; } -static void finish_bdp_ping(void* tp, grpc_error* error) { +static void finish_bdp_ping(void* tp, grpc_error_handle error) { grpc_chttp2_transport* t = static_cast<grpc_chttp2_transport*>(tp); t->combiner->Run(GRPC_CLOSURE_INIT(&t->finish_bdp_ping_locked, finish_bdp_ping_locked, t, nullptr), GRPC_ERROR_REF(error)); } -static void finish_bdp_ping_locked(void* tp, grpc_error* error) { +static void finish_bdp_ping_locked(void* tp, grpc_error_handle error) { grpc_chttp2_transport* t = static_cast<grpc_chttp2_transport*>(tp); if (GRPC_TRACE_FLAG_ENABLED(grpc_http_trace)) { gpr_log(GPR_INFO, "%s: Complete BDP ping err=%s", t->peer_string.c_str(), - grpc_error_string(error)); + grpc_error_std_string(error).c_str()); } if (error != GRPC_ERROR_NONE || t->closed_with_error != GRPC_ERROR_NONE) { GRPC_CHTTP2_UNREF_TRANSPORT(t, "bdp_ping"); @@ -2635,7 +2677,7 @@ static void finish_bdp_ping_locked(void* tp, grpc_error* error) { &t->next_bdp_ping_timer_expired_locked); } -static void next_bdp_ping_timer_expired(void* tp, grpc_error* error) { +static void next_bdp_ping_timer_expired(void* tp, grpc_error_handle error) { grpc_chttp2_transport* t = static_cast<grpc_chttp2_transport*>(tp); t->combiner->Run( GRPC_CLOSURE_INIT(&t->next_bdp_ping_timer_expired_locked, @@ -2643,7 +2685,8 @@ static void next_bdp_ping_timer_expired(void* tp, grpc_error* error) { GRPC_ERROR_REF(error)); } -static void next_bdp_ping_timer_expired_locked(void* tp, grpc_error* error) { +static void next_bdp_ping_timer_expired_locked(void* tp, + grpc_error_handle error) { grpc_chttp2_transport* t = static_cast<grpc_chttp2_transport*>(tp); GPR_ASSERT(t->have_next_bdp_ping_timer); t->have_next_bdp_ping_timer = false; @@ -2719,14 +2762,14 @@ void grpc_chttp2_config_default_keepalive_args(grpc_channel_args* args, } } -static void init_keepalive_ping(void* arg, grpc_error* error) { +static void init_keepalive_ping(void* arg, grpc_error_handle error) { grpc_chttp2_transport* t = static_cast<grpc_chttp2_transport*>(arg); t->combiner->Run(GRPC_CLOSURE_INIT(&t->init_keepalive_ping_locked, init_keepalive_ping_locked, t, nullptr), GRPC_ERROR_REF(error)); } -static void init_keepalive_ping_locked(void* arg, grpc_error* error) { +static void init_keepalive_ping_locked(void* arg, grpc_error_handle error) { grpc_chttp2_transport* t = static_cast<grpc_chttp2_transport*>(arg); GPR_ASSERT(t->keepalive_state == GRPC_CHTTP2_KEEPALIVE_STATE_WAITING); if (t->destroying || t->closed_with_error != GRPC_ERROR_NONE) { @@ -2759,14 +2802,14 @@ static void init_keepalive_ping_locked(void* arg, grpc_error* error) { GRPC_CHTTP2_UNREF_TRANSPORT(t, "init keepalive ping"); } -static void start_keepalive_ping(void* arg, grpc_error* error) { +static void start_keepalive_ping(void* arg, grpc_error_handle error) { grpc_chttp2_transport* t = static_cast<grpc_chttp2_transport*>(arg); t->combiner->Run(GRPC_CLOSURE_INIT(&t->start_keepalive_ping_locked, start_keepalive_ping_locked, t, nullptr), GRPC_ERROR_REF(error)); } -static void start_keepalive_ping_locked(void* arg, grpc_error* error) { +static void start_keepalive_ping_locked(void* arg, grpc_error_handle error) { grpc_chttp2_transport* t = static_cast<grpc_chttp2_transport*>(arg); if (error != GRPC_ERROR_NONE) { return; @@ -2787,14 +2830,14 @@ static void start_keepalive_ping_locked(void* arg, grpc_error* error) { t->keepalive_ping_started = true; } -static void finish_keepalive_ping(void* arg, grpc_error* error) { +static void finish_keepalive_ping(void* arg, grpc_error_handle error) { grpc_chttp2_transport* t = static_cast<grpc_chttp2_transport*>(arg); t->combiner->Run(GRPC_CLOSURE_INIT(&t->finish_keepalive_ping_locked, finish_keepalive_ping_locked, t, nullptr), GRPC_ERROR_REF(error)); } -static void finish_keepalive_ping_locked(void* arg, grpc_error* error) { +static void finish_keepalive_ping_locked(void* arg, grpc_error_handle error) { grpc_chttp2_transport* t = static_cast<grpc_chttp2_transport*>(arg); if (t->keepalive_state == GRPC_CHTTP2_KEEPALIVE_STATE_PINGING) { if (error == GRPC_ERROR_NONE) { @@ -2825,7 +2868,7 @@ static void finish_keepalive_ping_locked(void* arg, grpc_error* error) { GRPC_CHTTP2_UNREF_TRANSPORT(t, "keepalive ping end"); } -static void keepalive_watchdog_fired(void* arg, grpc_error* error) { +static void keepalive_watchdog_fired(void* arg, grpc_error_handle error) { grpc_chttp2_transport* t = static_cast<grpc_chttp2_transport*>(arg); t->combiner->Run( GRPC_CLOSURE_INIT(&t->keepalive_watchdog_fired_locked, @@ -2833,7 +2876,8 @@ static void keepalive_watchdog_fired(void* arg, grpc_error* error) { GRPC_ERROR_REF(error)); } -static void keepalive_watchdog_fired_locked(void* arg, grpc_error* error) { +static void keepalive_watchdog_fired_locked(void* arg, + grpc_error_handle error) { grpc_chttp2_transport* t = static_cast<grpc_chttp2_transport*>(arg); if (t->keepalive_state == GRPC_CHTTP2_KEEPALIVE_STATE_PINGING) { if (error == GRPC_ERROR_NONE) { @@ -2890,7 +2934,7 @@ static void set_pollset_set(grpc_transport* gt, grpc_stream* /*gs*/, // BYTE STREAM // -static void reset_byte_stream(void* arg, grpc_error* error) { +static void reset_byte_stream(void* arg, grpc_error_handle error) { grpc_chttp2_stream* s = static_cast<grpc_chttp2_stream*>(arg); s->pending_byte_stream = false; if (error == GRPC_ERROR_NONE) { @@ -2921,8 +2965,8 @@ Chttp2IncomingByteStream::Chttp2IncomingByteStream( stream->byte_stream_error = GRPC_ERROR_NONE; } -void Chttp2IncomingByteStream::OrphanLocked(void* arg, - grpc_error* /*error_ignored*/) { +void Chttp2IncomingByteStream::OrphanLocked( + void* arg, grpc_error_handle /*error_ignored*/) { Chttp2IncomingByteStream* bs = static_cast<Chttp2IncomingByteStream*>(arg); grpc_chttp2_stream* s = bs->stream_; grpc_chttp2_transport* t = s->t; @@ -2941,7 +2985,7 @@ void Chttp2IncomingByteStream::Orphan() { } void Chttp2IncomingByteStream::NextLocked(void* arg, - grpc_error* /*error_ignored*/) { + grpc_error_handle /*error_ignored*/) { Chttp2IncomingByteStream* bs = static_cast<Chttp2IncomingByteStream*>(arg); grpc_chttp2_transport* t = bs->transport_; grpc_chttp2_stream* s = bs->stream_; @@ -3011,9 +3055,9 @@ void Chttp2IncomingByteStream::MaybeCreateStreamDecompressionCtx() { } } -grpc_error* Chttp2IncomingByteStream::Pull(grpc_slice* slice) { +grpc_error_handle Chttp2IncomingByteStream::Pull(grpc_slice* slice) { GPR_TIMER_SCOPE("incoming_byte_stream_pull", 0); - grpc_error* error; + grpc_error_handle error; if (stream_->unprocessed_incoming_frames_buffer.length > 0) { if (!stream_->unprocessed_incoming_frames_decompressed && stream_->stream_decompression_method != @@ -3056,7 +3100,7 @@ grpc_error* Chttp2IncomingByteStream::Pull(grpc_slice* slice) { return GRPC_ERROR_NONE; } -void Chttp2IncomingByteStream::PublishError(grpc_error* error) { +void Chttp2IncomingByteStream::PublishError(grpc_error_handle error) { GPR_ASSERT(error != GRPC_ERROR_NONE); grpc_core::ExecCtx::Run(DEBUG_LOCATION, stream_->on_next, GRPC_ERROR_REF(error)); @@ -3066,10 +3110,10 @@ void Chttp2IncomingByteStream::PublishError(grpc_error* error) { grpc_chttp2_cancel_stream(transport_, stream_, GRPC_ERROR_REF(error)); } -grpc_error* Chttp2IncomingByteStream::Push(const grpc_slice& slice, - grpc_slice* slice_out) { +grpc_error_handle Chttp2IncomingByteStream::Push(const grpc_slice& slice, + grpc_slice* slice_out) { if (remaining_bytes_ < GRPC_SLICE_LENGTH(slice)) { - grpc_error* error = + grpc_error_handle error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("Too many bytes in stream"); transport_->combiner->Run(&stream_->reset_byte_stream, GRPC_ERROR_REF(error)); @@ -3084,8 +3128,8 @@ grpc_error* Chttp2IncomingByteStream::Push(const grpc_slice& slice, } } -grpc_error* Chttp2IncomingByteStream::Finished(grpc_error* error, - bool reset_on_error) { +grpc_error_handle Chttp2IncomingByteStream::Finished(grpc_error_handle error, + bool reset_on_error) { if (error == GRPC_ERROR_NONE) { if (remaining_bytes_ != 0) { error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("Truncated message"); @@ -3099,7 +3143,7 @@ grpc_error* Chttp2IncomingByteStream::Finished(grpc_error* error, return error; } -void Chttp2IncomingByteStream::Shutdown(grpc_error* error) { +void Chttp2IncomingByteStream::Shutdown(grpc_error_handle error) { GRPC_ERROR_UNREF(Finished(error, true /* reset_on_error */)); } @@ -3131,14 +3175,14 @@ static void post_destructive_reclaimer(grpc_chttp2_transport* t) { } } -static void benign_reclaimer(void* arg, grpc_error* error) { +static void benign_reclaimer(void* arg, grpc_error_handle error) { grpc_chttp2_transport* t = static_cast<grpc_chttp2_transport*>(arg); t->combiner->Run(GRPC_CLOSURE_INIT(&t->benign_reclaimer_locked, benign_reclaimer_locked, t, nullptr), GRPC_ERROR_REF(error)); } -static void benign_reclaimer_locked(void* arg, grpc_error* error) { +static void benign_reclaimer_locked(void* arg, grpc_error_handle error) { grpc_chttp2_transport* t = static_cast<grpc_chttp2_transport*>(arg); if (error == GRPC_ERROR_NONE && grpc_chttp2_stream_map_size(&t->stream_map) == 0) { @@ -3168,14 +3212,14 @@ static void benign_reclaimer_locked(void* arg, grpc_error* error) { GRPC_CHTTP2_UNREF_TRANSPORT(t, "benign_reclaimer"); } -static void destructive_reclaimer(void* arg, grpc_error* error) { +static void destructive_reclaimer(void* arg, grpc_error_handle error) { grpc_chttp2_transport* t = static_cast<grpc_chttp2_transport*>(arg); t->combiner->Run(GRPC_CLOSURE_INIT(&t->destructive_reclaimer_locked, destructive_reclaimer_locked, t, nullptr), GRPC_ERROR_REF(error)); } -static void destructive_reclaimer_locked(void* arg, grpc_error* error) { +static void destructive_reclaimer_locked(void* arg, grpc_error_handle error) { grpc_chttp2_transport* t = static_cast<grpc_chttp2_transport*>(arg); size_t n = grpc_chttp2_stream_map_size(&t->stream_map); t->destructive_reclaimer_registered = false; @@ -3293,7 +3337,7 @@ grpc_transport* grpc_create_chttp2_transport( void grpc_chttp2_transport_start_reading( grpc_transport* transport, grpc_slice_buffer* read_buffer, - grpc_closure* notify_on_receive_settings) { + grpc_closure* notify_on_receive_settings, grpc_closure* notify_on_close) { grpc_chttp2_transport* t = reinterpret_cast<grpc_chttp2_transport*>(transport); GRPC_CHTTP2_REF_TRANSPORT( @@ -3303,6 +3347,7 @@ void grpc_chttp2_transport_start_reading( gpr_free(read_buffer); } t->notify_on_receive_settings = notify_on_receive_settings; + t->notify_on_close = notify_on_close; t->combiner->Run( GRPC_CLOSURE_INIT(&t->read_action_locked, read_action_locked, t, nullptr), GRPC_ERROR_NONE); diff --git a/grpc/src/core/ext/transport/chttp2/transport/chttp2_transport.h b/grpc/src/core/ext/transport/chttp2/transport/chttp2_transport.h index b04630bb..a72d268d 100644 --- a/grpc/src/core/ext/transport/chttp2/transport/chttp2_transport.h +++ b/grpc/src/core/ext/transport/chttp2/transport/chttp2_transport.h @@ -47,6 +47,17 @@ grpc_chttp2_transport_get_socket_node(grpc_transport* transport); /// HTTP/2 settings are received from the peer. void grpc_chttp2_transport_start_reading( grpc_transport* transport, grpc_slice_buffer* read_buffer, - grpc_closure* notify_on_receive_settings); + grpc_closure* notify_on_receive_settings, grpc_closure* notify_on_close); + +namespace grpc_core { +typedef void (*TestOnlyGlobalHttp2TransportInitCallback)(); +typedef void (*TestOnlyGlobalHttp2TransportDestructCallback)(); + +void TestOnlySetGlobalHttp2TransportInitCallback( + TestOnlyGlobalHttp2TransportInitCallback callback); + +void TestOnlySetGlobalHttp2TransportDestructCallback( + TestOnlyGlobalHttp2TransportDestructCallback callback); +} // namespace grpc_core #endif /* GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_CHTTP2_TRANSPORT_H */ diff --git a/grpc/src/core/ext/transport/chttp2/transport/context_list.cc b/grpc/src/core/ext/transport/chttp2/transport/context_list.cc index a0473ea8..afb18abc 100644 --- a/grpc/src/core/ext/transport/chttp2/transport/context_list.cc +++ b/grpc/src/core/ext/transport/chttp2/transport/context_list.cc @@ -22,7 +22,7 @@ namespace { void (*write_timestamps_callback_g)(void*, grpc_core::Timestamps*, - grpc_error* error) = nullptr; + grpc_error_handle error) = nullptr; void* (*get_copied_context_fn_g)(void*) = nullptr; } // namespace @@ -41,7 +41,7 @@ void ContextList::Append(ContextList** head, grpc_chttp2_stream* s) { } void ContextList::Execute(void* arg, grpc_core::Timestamps* ts, - grpc_error* error) { + grpc_error_handle error) { ContextList* head = static_cast<ContextList*>(arg); ContextList* to_be_freed; while (head != nullptr) { @@ -57,9 +57,8 @@ void ContextList::Execute(void* arg, grpc_core::Timestamps* ts, } } -void grpc_http2_set_write_timestamps_callback(void (*fn)(void*, - grpc_core::Timestamps*, - grpc_error* error)) { +void grpc_http2_set_write_timestamps_callback( + void (*fn)(void*, grpc_core::Timestamps*, grpc_error_handle error)) { write_timestamps_callback_g = fn; } diff --git a/grpc/src/core/ext/transport/chttp2/transport/context_list.h b/grpc/src/core/ext/transport/chttp2/transport/context_list.h index 5b9d2ab3..54ec87c6 100644 --- a/grpc/src/core/ext/transport/chttp2/transport/context_list.h +++ b/grpc/src/core/ext/transport/chttp2/transport/context_list.h @@ -36,7 +36,8 @@ class ContextList { /* Executes a function \a fn with each context in the list and \a ts. It also * frees up the entire list after this operation. It is intended as a callback * and hence does not take a ref on \a error */ - static void Execute(void* arg, grpc_core::Timestamps* ts, grpc_error* error); + static void Execute(void* arg, grpc_core::Timestamps* ts, + grpc_error_handle error); private: void* trace_context_ = nullptr; @@ -44,9 +45,8 @@ class ContextList { size_t byte_offset_ = 0; }; -void grpc_http2_set_write_timestamps_callback(void (*fn)(void*, - grpc_core::Timestamps*, - grpc_error* error)); +void grpc_http2_set_write_timestamps_callback( + void (*fn)(void*, grpc_core::Timestamps*, grpc_error_handle error)); void grpc_http2_set_fn_get_copied_context(void* (*fn)(void*)); } /* namespace grpc_core */ diff --git a/grpc/src/core/ext/transport/chttp2/transport/flow_control.cc b/grpc/src/core/ext/transport/chttp2/transport/flow_control.cc index 09bd7ab6..5f5e5515 100644 --- a/grpc/src/core/ext/transport/chttp2/transport/flow_control.cc +++ b/grpc/src/core/ext/transport/chttp2/transport/flow_control.cc @@ -203,7 +203,7 @@ uint32_t TransportFlowControl::MaybeSendUpdate(bool writing_anyway) { return 0; } -grpc_error* TransportFlowControl::ValidateRecvData( +grpc_error_handle TransportFlowControl::ValidateRecvData( int64_t incoming_frame_size) { if (incoming_frame_size > announced_window_) { return GRPC_ERROR_CREATE_FROM_COPIED_STRING( @@ -219,10 +219,10 @@ StreamFlowControl::StreamFlowControl(TransportFlowControl* tfc, const grpc_chttp2_stream* s) : tfc_(tfc), s_(s) {} -grpc_error* StreamFlowControl::RecvData(int64_t incoming_frame_size) { +grpc_error_handle StreamFlowControl::RecvData(int64_t incoming_frame_size) { FlowControlTrace trace(" data recv", tfc_, this); - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; error = tfc_->ValidateRecvData(incoming_frame_size); if (error != GRPC_ERROR_NONE) return error; diff --git a/grpc/src/core/ext/transport/chttp2/transport/flow_control.h b/grpc/src/core/ext/transport/chttp2/transport/flow_control.h index 7e053585..e5088964 100644 --- a/grpc/src/core/ext/transport/chttp2/transport/flow_control.h +++ b/grpc/src/core/ext/transport/chttp2/transport/flow_control.h @@ -168,7 +168,7 @@ class TransportFlowControlBase { // Called to do bookkeeping when a stream owned by this transport receives // data from the wire. Also does error checking for frame size. - virtual grpc_error* RecvData(int64_t /* incoming_frame_size */) = 0; + virtual grpc_error_handle RecvData(int64_t /* incoming_frame_size */) = 0; // Called to do bookkeeping when we receive a WINDOW_UPDATE frame. virtual void RecvUpdate(uint32_t /* size */) = 0; @@ -210,7 +210,7 @@ class TransportFlowControlDisabled final : public TransportFlowControlBase { FlowControlAction MakeAction() override { return FlowControlAction(); } FlowControlAction PeriodicUpdate() override { return FlowControlAction(); } void StreamSentData(int64_t /* size */) override {} - grpc_error* RecvData(int64_t /* incoming_frame_size */) override { + grpc_error_handle RecvData(int64_t /* incoming_frame_size */) override { return GRPC_ERROR_NONE; } void RecvUpdate(uint32_t /* size */) override {} @@ -246,14 +246,14 @@ class TransportFlowControl final : public TransportFlowControlBase { void StreamSentData(int64_t size) override { remote_window_ -= size; } - grpc_error* ValidateRecvData(int64_t incoming_frame_size); + grpc_error_handle ValidateRecvData(int64_t incoming_frame_size); void CommitRecvData(int64_t incoming_frame_size) { announced_window_ -= incoming_frame_size; } - grpc_error* RecvData(int64_t incoming_frame_size) override { + grpc_error_handle RecvData(int64_t incoming_frame_size) override { FlowControlTrace trace(" data recv", this, nullptr); - grpc_error* error = ValidateRecvData(incoming_frame_size); + grpc_error_handle error = ValidateRecvData(incoming_frame_size); if (error != GRPC_ERROR_NONE) return error; CommitRecvData(incoming_frame_size); return GRPC_ERROR_NONE; @@ -352,7 +352,7 @@ class StreamFlowControlBase { virtual void SentData(int64_t /* outgoing_frame_size */) = 0; // Bookkeeping and error checking for when data is received by this stream. - virtual grpc_error* RecvData(int64_t /* incoming_frame_size */) = 0; + virtual grpc_error_handle RecvData(int64_t /* incoming_frame_size */) = 0; // Called to check if this stream needs to send a WINDOW_UPDATE frame. virtual uint32_t MaybeSendUpdate() = 0; @@ -395,7 +395,7 @@ class StreamFlowControlDisabled : public StreamFlowControlBase { } FlowControlAction MakeAction() override { return FlowControlAction(); } void SentData(int64_t /* outgoing_frame_size */) override {} - grpc_error* RecvData(int64_t /* incoming_frame_size */) override { + grpc_error_handle RecvData(int64_t /* incoming_frame_size */) override { return GRPC_ERROR_NONE; } uint32_t MaybeSendUpdate() override { return 0; } @@ -427,7 +427,7 @@ class StreamFlowControl final : public StreamFlowControlBase { } // we have received data from the wire - grpc_error* RecvData(int64_t incoming_frame_size) override; + grpc_error_handle RecvData(int64_t incoming_frame_size) override; // returns an announce if we should send a stream update to our peer, else // returns zero diff --git a/grpc/src/core/ext/transport/chttp2/transport/frame_data.cc b/grpc/src/core/ext/transport/chttp2/transport/frame_data.cc index 0924a4b0..745f32a2 100644 --- a/grpc/src/core/ext/transport/chttp2/transport/frame_data.cc +++ b/grpc/src/core/ext/transport/chttp2/transport/frame_data.cc @@ -41,7 +41,7 @@ grpc_chttp2_data_parser::~grpc_chttp2_data_parser() { GRPC_ERROR_UNREF(error); } -grpc_error* grpc_chttp2_data_parser_begin_frame( +grpc_error_handle grpc_chttp2_data_parser_begin_frame( grpc_chttp2_data_parser* /*parser*/, uint8_t flags, uint32_t stream_id, grpc_chttp2_stream* s) { if (flags & ~GRPC_CHTTP2_DATA_FLAG_END_STREAM) { @@ -89,11 +89,11 @@ void grpc_chttp2_encode_data(uint32_t id, grpc_slice_buffer* inbuf, stats->data_bytes += write_bytes; } -grpc_error* grpc_deframe_unprocessed_incoming_frames( +grpc_error_handle grpc_deframe_unprocessed_incoming_frames( grpc_chttp2_data_parser* p, grpc_chttp2_stream* s, grpc_slice_buffer* slices, grpc_slice* slice_out, grpc_core::OrphanablePtr<grpc_core::ByteStream>* stream_out) { - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; grpc_chttp2_transport* t = s->t; while (slices->count > 0) { @@ -275,11 +275,11 @@ grpc_error* grpc_deframe_unprocessed_incoming_frames( return GRPC_ERROR_NONE; } -grpc_error* grpc_chttp2_data_parser_parse(void* /*parser*/, - grpc_chttp2_transport* t, - grpc_chttp2_stream* s, - const grpc_slice& slice, - int is_last) { +grpc_error_handle grpc_chttp2_data_parser_parse(void* /*parser*/, + grpc_chttp2_transport* t, + grpc_chttp2_stream* s, + const grpc_slice& slice, + int is_last) { if (!s->pending_byte_stream) { grpc_slice_ref_internal(slice); grpc_slice_buffer_add(&s->frame_storage, slice); @@ -297,7 +297,11 @@ grpc_error* grpc_chttp2_data_parser_parse(void* /*parser*/, } if (is_last && s->received_last_frame) { - grpc_chttp2_mark_stream_closed(t, s, true, false, GRPC_ERROR_NONE); + grpc_chttp2_mark_stream_closed( + t, s, true, false, + t->is_client ? GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "Data frame with END_STREAM flag received") + : GRPC_ERROR_NONE); } return GRPC_ERROR_NONE; diff --git a/grpc/src/core/ext/transport/chttp2/transport/frame_data.h b/grpc/src/core/ext/transport/chttp2/transport/frame_data.h index ec389009..5aa4a3e7 100644 --- a/grpc/src/core/ext/transport/chttp2/transport/frame_data.h +++ b/grpc/src/core/ext/transport/chttp2/transport/frame_data.h @@ -50,31 +50,31 @@ struct grpc_chttp2_data_parser { grpc_chttp2_stream_state state = GRPC_CHTTP2_DATA_FH_0; uint8_t frame_type = 0; uint32_t frame_size = 0; - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; bool is_frame_compressed = false; grpc_core::Chttp2IncomingByteStream* parsing_frame = nullptr; }; /* start processing a new data frame */ -grpc_error* grpc_chttp2_data_parser_begin_frame(grpc_chttp2_data_parser* parser, - uint8_t flags, - uint32_t stream_id, - grpc_chttp2_stream* s); +grpc_error_handle grpc_chttp2_data_parser_begin_frame( + grpc_chttp2_data_parser* parser, uint8_t flags, uint32_t stream_id, + grpc_chttp2_stream* s); /* handle a slice of a data frame - is_last indicates the last slice of a frame */ -grpc_error* grpc_chttp2_data_parser_parse(void* parser, - grpc_chttp2_transport* t, - grpc_chttp2_stream* s, - const grpc_slice& slice, int is_last); +grpc_error_handle grpc_chttp2_data_parser_parse(void* parser, + grpc_chttp2_transport* t, + grpc_chttp2_stream* s, + const grpc_slice& slice, + int is_last); void grpc_chttp2_encode_data(uint32_t id, grpc_slice_buffer* inbuf, uint32_t write_bytes, int is_eof, grpc_transport_one_way_stats* stats, grpc_slice_buffer* outbuf); -grpc_error* grpc_deframe_unprocessed_incoming_frames( +grpc_error_handle grpc_deframe_unprocessed_incoming_frames( grpc_chttp2_data_parser* p, grpc_chttp2_stream* s, grpc_slice_buffer* slices, grpc_slice* slice_out, grpc_core::OrphanablePtr<grpc_core::ByteStream>* stream_out); diff --git a/grpc/src/core/ext/transport/chttp2/transport/frame_goaway.cc b/grpc/src/core/ext/transport/chttp2/transport/frame_goaway.cc index 3831b801..a139bea1 100644 --- a/grpc/src/core/ext/transport/chttp2/transport/frame_goaway.cc +++ b/grpc/src/core/ext/transport/chttp2/transport/frame_goaway.cc @@ -36,9 +36,8 @@ void grpc_chttp2_goaway_parser_destroy(grpc_chttp2_goaway_parser* p) { gpr_free(p->debug_data); } -grpc_error* grpc_chttp2_goaway_parser_begin_frame(grpc_chttp2_goaway_parser* p, - uint32_t length, - uint8_t /*flags*/) { +grpc_error_handle grpc_chttp2_goaway_parser_begin_frame( + grpc_chttp2_goaway_parser* p, uint32_t length, uint8_t /*flags*/) { if (length < 8) { return GRPC_ERROR_CREATE_FROM_COPIED_STRING( absl::StrFormat("goaway frame too short (%d bytes)", length).c_str()); @@ -52,11 +51,11 @@ grpc_error* grpc_chttp2_goaway_parser_begin_frame(grpc_chttp2_goaway_parser* p, return GRPC_ERROR_NONE; } -grpc_error* grpc_chttp2_goaway_parser_parse(void* parser, - grpc_chttp2_transport* t, - grpc_chttp2_stream* /*s*/, - const grpc_slice& slice, - int is_last) { +grpc_error_handle grpc_chttp2_goaway_parser_parse(void* parser, + grpc_chttp2_transport* t, + grpc_chttp2_stream* /*s*/, + const grpc_slice& slice, + int is_last) { const uint8_t* const beg = GRPC_SLICE_START_PTR(slice); const uint8_t* const end = GRPC_SLICE_END_PTR(slice); const uint8_t* cur = beg; diff --git a/grpc/src/core/ext/transport/chttp2/transport/frame_goaway.h b/grpc/src/core/ext/transport/chttp2/transport/frame_goaway.h index df6274d6..674f7423 100644 --- a/grpc/src/core/ext/transport/chttp2/transport/frame_goaway.h +++ b/grpc/src/core/ext/transport/chttp2/transport/frame_goaway.h @@ -47,13 +47,13 @@ struct grpc_chttp2_goaway_parser { }; void grpc_chttp2_goaway_parser_init(grpc_chttp2_goaway_parser* p); void grpc_chttp2_goaway_parser_destroy(grpc_chttp2_goaway_parser* p); -grpc_error* grpc_chttp2_goaway_parser_begin_frame( +grpc_error_handle grpc_chttp2_goaway_parser_begin_frame( grpc_chttp2_goaway_parser* parser, uint32_t length, uint8_t flags); -grpc_error* grpc_chttp2_goaway_parser_parse(void* parser, - grpc_chttp2_transport* t, - grpc_chttp2_stream* s, - const grpc_slice& slice, - int is_last); +grpc_error_handle grpc_chttp2_goaway_parser_parse(void* parser, + grpc_chttp2_transport* t, + grpc_chttp2_stream* s, + const grpc_slice& slice, + int is_last); void grpc_chttp2_goaway_append(uint32_t last_stream_id, uint32_t error_code, const grpc_slice& debug_data, diff --git a/grpc/src/core/ext/transport/chttp2/transport/frame_ping.cc b/grpc/src/core/ext/transport/chttp2/transport/frame_ping.cc index 98412328..9da4a72a 100644 --- a/grpc/src/core/ext/transport/chttp2/transport/frame_ping.cc +++ b/grpc/src/core/ext/transport/chttp2/transport/frame_ping.cc @@ -55,9 +55,8 @@ grpc_slice grpc_chttp2_ping_create(uint8_t ack, uint64_t opaque_8bytes) { return slice; } -grpc_error* grpc_chttp2_ping_parser_begin_frame(grpc_chttp2_ping_parser* parser, - uint32_t length, - uint8_t flags) { +grpc_error_handle grpc_chttp2_ping_parser_begin_frame( + grpc_chttp2_ping_parser* parser, uint32_t length, uint8_t flags) { if (flags & 0xfe || length != 8) { return GRPC_ERROR_CREATE_FROM_COPIED_STRING( absl::StrFormat("invalid ping: length=%d, flags=%02x", length, flags) @@ -69,11 +68,11 @@ grpc_error* grpc_chttp2_ping_parser_begin_frame(grpc_chttp2_ping_parser* parser, return GRPC_ERROR_NONE; } -grpc_error* grpc_chttp2_ping_parser_parse(void* parser, - grpc_chttp2_transport* t, - grpc_chttp2_stream* /*s*/, - const grpc_slice& slice, - int is_last) { +grpc_error_handle grpc_chttp2_ping_parser_parse(void* parser, + grpc_chttp2_transport* t, + grpc_chttp2_stream* /*s*/, + const grpc_slice& slice, + int is_last) { const uint8_t* const beg = GRPC_SLICE_START_PTR(slice); const uint8_t* const end = GRPC_SLICE_END_PTR(slice); const uint8_t* cur = beg; diff --git a/grpc/src/core/ext/transport/chttp2/transport/frame_ping.h b/grpc/src/core/ext/transport/chttp2/transport/frame_ping.h index e356bf43..6b5318e9 100644 --- a/grpc/src/core/ext/transport/chttp2/transport/frame_ping.h +++ b/grpc/src/core/ext/transport/chttp2/transport/frame_ping.h @@ -31,12 +31,13 @@ struct grpc_chttp2_ping_parser { }; grpc_slice grpc_chttp2_ping_create(uint8_t ack, uint64_t opaque_8bytes); -grpc_error* grpc_chttp2_ping_parser_begin_frame(grpc_chttp2_ping_parser* parser, - uint32_t length, uint8_t flags); -grpc_error* grpc_chttp2_ping_parser_parse(void* parser, - grpc_chttp2_transport* t, - grpc_chttp2_stream* s, - const grpc_slice& slice, int is_last); +grpc_error_handle grpc_chttp2_ping_parser_begin_frame( + grpc_chttp2_ping_parser* parser, uint32_t length, uint8_t flags); +grpc_error_handle grpc_chttp2_ping_parser_parse(void* parser, + grpc_chttp2_transport* t, + grpc_chttp2_stream* s, + const grpc_slice& slice, + int is_last); /* Test-only function for disabling ping ack */ void grpc_set_disable_ping_ack(bool disable_ping_ack); diff --git a/grpc/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc b/grpc/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc index bcfcb173..03a7c61d 100644 --- a/grpc/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc +++ b/grpc/src/core/ext/transport/chttp2/transport/frame_rst_stream.cc @@ -68,7 +68,7 @@ void grpc_chttp2_add_rst_stream_to_next_write( grpc_chttp2_rst_stream_create(id, code, stats)); } -grpc_error* grpc_chttp2_rst_stream_parser_begin_frame( +grpc_error_handle grpc_chttp2_rst_stream_parser_begin_frame( grpc_chttp2_rst_stream_parser* parser, uint32_t length, uint8_t flags) { if (length != 4) { return GRPC_ERROR_CREATE_FROM_COPIED_STRING( @@ -80,11 +80,11 @@ grpc_error* grpc_chttp2_rst_stream_parser_begin_frame( return GRPC_ERROR_NONE; } -grpc_error* grpc_chttp2_rst_stream_parser_parse(void* parser, - grpc_chttp2_transport* t, - grpc_chttp2_stream* s, - const grpc_slice& slice, - int is_last) { +grpc_error_handle grpc_chttp2_rst_stream_parser_parse(void* parser, + grpc_chttp2_transport* t, + grpc_chttp2_stream* s, + const grpc_slice& slice, + int is_last) { const uint8_t* const beg = GRPC_SLICE_START_PTR(slice); const uint8_t* const end = GRPC_SLICE_END_PTR(slice); const uint8_t* cur = beg; @@ -104,7 +104,7 @@ grpc_error* grpc_chttp2_rst_stream_parser_parse(void* parser, ((static_cast<uint32_t>(p->reason_bytes[1])) << 16) | ((static_cast<uint32_t>(p->reason_bytes[2])) << 8) | ((static_cast<uint32_t>(p->reason_bytes[3]))); - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; if (reason != GRPC_HTTP2_NO_ERROR || s->metadata_buffer[1].size == 0) { error = grpc_error_set_int( grpc_error_set_str( diff --git a/grpc/src/core/ext/transport/chttp2/transport/frame_rst_stream.h b/grpc/src/core/ext/transport/chttp2/transport/frame_rst_stream.h index e324ee2c..865e74d9 100644 --- a/grpc/src/core/ext/transport/chttp2/transport/frame_rst_stream.h +++ b/grpc/src/core/ext/transport/chttp2/transport/frame_rst_stream.h @@ -39,12 +39,12 @@ void grpc_chttp2_add_rst_stream_to_next_write( grpc_chttp2_transport* t, uint32_t id, uint32_t code, grpc_transport_one_way_stats* stats); -grpc_error* grpc_chttp2_rst_stream_parser_begin_frame( +grpc_error_handle grpc_chttp2_rst_stream_parser_begin_frame( grpc_chttp2_rst_stream_parser* parser, uint32_t length, uint8_t flags); -grpc_error* grpc_chttp2_rst_stream_parser_parse(void* parser, - grpc_chttp2_transport* t, - grpc_chttp2_stream* s, - const grpc_slice& slice, - int is_last); +grpc_error_handle grpc_chttp2_rst_stream_parser_parse(void* parser, + grpc_chttp2_transport* t, + grpc_chttp2_stream* s, + const grpc_slice& slice, + int is_last); #endif /* GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_RST_STREAM_H */ diff --git a/grpc/src/core/ext/transport/chttp2/transport/frame_settings.cc b/grpc/src/core/ext/transport/chttp2/transport/frame_settings.cc index 7dbfc69e..576f8158 100644 --- a/grpc/src/core/ext/transport/chttp2/transport/frame_settings.cc +++ b/grpc/src/core/ext/transport/chttp2/transport/frame_settings.cc @@ -84,7 +84,7 @@ grpc_slice grpc_chttp2_settings_ack_create(void) { return output; } -grpc_error* grpc_chttp2_settings_parser_begin_frame( +grpc_error_handle grpc_chttp2_settings_parser_begin_frame( grpc_chttp2_settings_parser* parser, uint32_t length, uint8_t flags, uint32_t* settings) { parser->target_settings = settings; @@ -110,10 +110,11 @@ grpc_error* grpc_chttp2_settings_parser_begin_frame( } } -grpc_error* grpc_chttp2_settings_parser_parse(void* p, grpc_chttp2_transport* t, - grpc_chttp2_stream* /*s*/, - const grpc_slice& slice, - int is_last) { +grpc_error_handle grpc_chttp2_settings_parser_parse(void* p, + grpc_chttp2_transport* t, + grpc_chttp2_stream* /*s*/, + const grpc_slice& slice, + int is_last) { grpc_chttp2_settings_parser* parser = static_cast<grpc_chttp2_settings_parser*>(p); const uint8_t* cur = GRPC_SLICE_START_PTR(slice); diff --git a/grpc/src/core/ext/transport/chttp2/transport/frame_settings.h b/grpc/src/core/ext/transport/chttp2/transport/frame_settings.h index 147d5ea3..7268277a 100644 --- a/grpc/src/core/ext/transport/chttp2/transport/frame_settings.h +++ b/grpc/src/core/ext/transport/chttp2/transport/frame_settings.h @@ -49,13 +49,13 @@ grpc_slice grpc_chttp2_settings_create(uint32_t* old_settings, /* Create an ack settings frame */ grpc_slice grpc_chttp2_settings_ack_create(void); -grpc_error* grpc_chttp2_settings_parser_begin_frame( +grpc_error_handle grpc_chttp2_settings_parser_begin_frame( grpc_chttp2_settings_parser* parser, uint32_t length, uint8_t flags, uint32_t* settings); -grpc_error* grpc_chttp2_settings_parser_parse(void* parser, - grpc_chttp2_transport* t, - grpc_chttp2_stream* s, - const grpc_slice& slice, - int is_last); +grpc_error_handle grpc_chttp2_settings_parser_parse(void* parser, + grpc_chttp2_transport* t, + grpc_chttp2_stream* s, + const grpc_slice& slice, + int is_last); #endif /* GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_SETTINGS_H */ diff --git a/grpc/src/core/ext/transport/chttp2/transport/frame_window_update.cc b/grpc/src/core/ext/transport/chttp2/transport/frame_window_update.cc index 943ea177..37e69ff0 100644 --- a/grpc/src/core/ext/transport/chttp2/transport/frame_window_update.cc +++ b/grpc/src/core/ext/transport/chttp2/transport/frame_window_update.cc @@ -53,7 +53,7 @@ grpc_slice grpc_chttp2_window_update_create( return slice; } -grpc_error* grpc_chttp2_window_update_parser_begin_frame( +grpc_error_handle grpc_chttp2_window_update_parser_begin_frame( grpc_chttp2_window_update_parser* parser, uint32_t length, uint8_t flags) { if (flags || length != 4) { return GRPC_ERROR_CREATE_FROM_COPIED_STRING( @@ -66,11 +66,9 @@ grpc_error* grpc_chttp2_window_update_parser_begin_frame( return GRPC_ERROR_NONE; } -grpc_error* grpc_chttp2_window_update_parser_parse(void* parser, - grpc_chttp2_transport* t, - grpc_chttp2_stream* s, - const grpc_slice& slice, - int is_last) { +grpc_error_handle grpc_chttp2_window_update_parser_parse( + void* parser, grpc_chttp2_transport* t, grpc_chttp2_stream* s, + const grpc_slice& slice, int is_last) { const uint8_t* const beg = GRPC_SLICE_START_PTR(slice); const uint8_t* const end = GRPC_SLICE_END_PTR(slice); const uint8_t* cur = beg; diff --git a/grpc/src/core/ext/transport/chttp2/transport/frame_window_update.h b/grpc/src/core/ext/transport/chttp2/transport/frame_window_update.h index 340445d8..5a07b9e5 100644 --- a/grpc/src/core/ext/transport/chttp2/transport/frame_window_update.h +++ b/grpc/src/core/ext/transport/chttp2/transport/frame_window_update.h @@ -33,12 +33,10 @@ struct grpc_chttp2_window_update_parser { grpc_slice grpc_chttp2_window_update_create( uint32_t id, uint32_t window_delta, grpc_transport_one_way_stats* stats); -grpc_error* grpc_chttp2_window_update_parser_begin_frame( +grpc_error_handle grpc_chttp2_window_update_parser_begin_frame( grpc_chttp2_window_update_parser* parser, uint32_t length, uint8_t flags); -grpc_error* grpc_chttp2_window_update_parser_parse(void* parser, - grpc_chttp2_transport* t, - grpc_chttp2_stream* s, - const grpc_slice& slice, - int is_last); +grpc_error_handle grpc_chttp2_window_update_parser_parse( + void* parser, grpc_chttp2_transport* t, grpc_chttp2_stream* s, + const grpc_slice& slice, int is_last); #endif /* GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_FRAME_WINDOW_UPDATE_H */ diff --git a/grpc/src/core/ext/transport/chttp2/transport/hpack_encoder.cc b/grpc/src/core/ext/transport/chttp2/transport/hpack_encoder.cc index 4ceaec24..cc1eba96 100644 --- a/grpc/src/core/ext/transport/chttp2/transport/hpack_encoder.cc +++ b/grpc/src/core/ext/transport/chttp2/transport/hpack_encoder.cc @@ -104,7 +104,7 @@ struct SliceRefComparator { struct MetadataComparator { typedef grpc_mdelem Type; - static const grpc_mdelem Null() { return {0}; } + static grpc_mdelem Null() { return {0}; } static bool IsNull(const grpc_mdelem md) { return md.payload == 0; } static bool Equals(const grpc_mdelem md1, const grpc_mdelem md2) { return md1.payload == md2.payload; diff --git a/grpc/src/core/ext/transport/chttp2/transport/hpack_parser.cc b/grpc/src/core/ext/transport/chttp2/transport/hpack_parser.cc index 668c2cb7..99c308f0 100644 --- a/grpc/src/core/ext/transport/chttp2/transport/hpack_parser.cc +++ b/grpc/src/core/ext/transport/chttp2/transport/hpack_parser.cc @@ -67,71 +67,82 @@ typedef enum { a set of indirect jumps, and so not waste stack space. */ /* forward declarations for parsing states */ -static grpc_error* parse_begin(grpc_chttp2_hpack_parser* p, const uint8_t* cur, - const uint8_t* end); -static grpc_error* parse_error(grpc_chttp2_hpack_parser* p, const uint8_t* cur, - const uint8_t* end, grpc_error* error); -static grpc_error* still_parse_error(grpc_chttp2_hpack_parser* p, +static grpc_error_handle parse_begin(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end); -static grpc_error* parse_illegal_op(grpc_chttp2_hpack_parser* p, - const uint8_t* cur, const uint8_t* end); - -static grpc_error* parse_string_prefix(grpc_chttp2_hpack_parser* p, - const uint8_t* cur, const uint8_t* end); -static grpc_error* parse_key_string(grpc_chttp2_hpack_parser* p, - const uint8_t* cur, const uint8_t* end); -static grpc_error* parse_value_string_with_indexed_key( +static grpc_error_handle parse_error(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, const uint8_t* end, + grpc_error_handle error); +static grpc_error_handle still_parse_error(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, + const uint8_t* end); +static grpc_error_handle parse_illegal_op(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, + const uint8_t* end); + +static grpc_error_handle parse_string_prefix(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, + const uint8_t* end); +static grpc_error_handle parse_key_string(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, + const uint8_t* end); +static grpc_error_handle parse_value_string_with_indexed_key( grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end); -static grpc_error* parse_value_string_with_literal_key( +static grpc_error_handle parse_value_string_with_literal_key( grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end); -static grpc_error* parse_value0(grpc_chttp2_hpack_parser* p, const uint8_t* cur, - const uint8_t* end); -static grpc_error* parse_value1(grpc_chttp2_hpack_parser* p, const uint8_t* cur, - const uint8_t* end); -static grpc_error* parse_value2(grpc_chttp2_hpack_parser* p, const uint8_t* cur, - const uint8_t* end); -static grpc_error* parse_value3(grpc_chttp2_hpack_parser* p, const uint8_t* cur, - const uint8_t* end); -static grpc_error* parse_value4(grpc_chttp2_hpack_parser* p, const uint8_t* cur, - const uint8_t* end); -static grpc_error* parse_value5up(grpc_chttp2_hpack_parser* p, - const uint8_t* cur, const uint8_t* end); - -static grpc_error* parse_indexed_field(grpc_chttp2_hpack_parser* p, - const uint8_t* cur, const uint8_t* end); -static grpc_error* parse_indexed_field_x(grpc_chttp2_hpack_parser* p, - const uint8_t* cur, - const uint8_t* end); -static grpc_error* parse_lithdr_incidx(grpc_chttp2_hpack_parser* p, - const uint8_t* cur, const uint8_t* end); -static grpc_error* parse_lithdr_incidx_x(grpc_chttp2_hpack_parser* p, - const uint8_t* cur, - const uint8_t* end); -static grpc_error* parse_lithdr_incidx_v(grpc_chttp2_hpack_parser* p, - const uint8_t* cur, - const uint8_t* end); -static grpc_error* parse_lithdr_notidx(grpc_chttp2_hpack_parser* p, - const uint8_t* cur, const uint8_t* end); -static grpc_error* parse_lithdr_notidx_x(grpc_chttp2_hpack_parser* p, - const uint8_t* cur, - const uint8_t* end); -static grpc_error* parse_lithdr_notidx_v(grpc_chttp2_hpack_parser* p, - const uint8_t* cur, - const uint8_t* end); -static grpc_error* parse_lithdr_nvridx(grpc_chttp2_hpack_parser* p, - const uint8_t* cur, const uint8_t* end); -static grpc_error* parse_lithdr_nvridx_x(grpc_chttp2_hpack_parser* p, - const uint8_t* cur, - const uint8_t* end); -static grpc_error* parse_lithdr_nvridx_v(grpc_chttp2_hpack_parser* p, - const uint8_t* cur, - const uint8_t* end); -static grpc_error* parse_max_tbl_size(grpc_chttp2_hpack_parser* p, +static grpc_error_handle parse_value0(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, const uint8_t* end); +static grpc_error_handle parse_value1(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end); -static grpc_error* parse_max_tbl_size_x(grpc_chttp2_hpack_parser* p, +static grpc_error_handle parse_value2(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, const uint8_t* end); +static grpc_error_handle parse_value3(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, const uint8_t* end); +static grpc_error_handle parse_value4(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, const uint8_t* end); +static grpc_error_handle parse_value5up(grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end); +static grpc_error_handle parse_indexed_field(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, + const uint8_t* end); +static grpc_error_handle parse_indexed_field_x(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, + const uint8_t* end); +static grpc_error_handle parse_lithdr_incidx(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, + const uint8_t* end); +static grpc_error_handle parse_lithdr_incidx_x(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, + const uint8_t* end); +static grpc_error_handle parse_lithdr_incidx_v(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, + const uint8_t* end); +static grpc_error_handle parse_lithdr_notidx(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, + const uint8_t* end); +static grpc_error_handle parse_lithdr_notidx_x(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, + const uint8_t* end); +static grpc_error_handle parse_lithdr_notidx_v(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, + const uint8_t* end); +static grpc_error_handle parse_lithdr_nvridx(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, + const uint8_t* end); +static grpc_error_handle parse_lithdr_nvridx_x(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, + const uint8_t* end); +static grpc_error_handle parse_lithdr_nvridx_v(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, + const uint8_t* end); +static grpc_error_handle parse_max_tbl_size(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, + const uint8_t* end); +static grpc_error_handle parse_max_tbl_size_x(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, + const uint8_t* end); + /* we translate the first byte of a hpack field into one of these decoding cases, then use a lookup table to jump directly to the appropriate parser. @@ -647,14 +658,14 @@ static void GPR_ATTRIBUTE_NOINLINE on_hdr_log(grpc_mdelem md) { /* emission helpers */ template <bool do_add> -static grpc_error* on_hdr(grpc_chttp2_hpack_parser* p, grpc_mdelem md) { +static grpc_error_handle on_hdr(grpc_chttp2_hpack_parser* p, grpc_mdelem md) { if (GRPC_TRACE_FLAG_ENABLED(grpc_trace_chttp2_hpack_parser)) { on_hdr_log(md); } if (do_add) { GPR_DEBUG_ASSERT(GRPC_MDELEM_STORAGE(md) == GRPC_MDELEM_STORAGE_INTERNED || GRPC_MDELEM_STORAGE(md) == GRPC_MDELEM_STORAGE_STATIC); - grpc_error* err = grpc_chttp2_hptbl_add(&p->table, md); + grpc_error_handle err = grpc_chttp2_hptbl_add(&p->table, md); if (GPR_UNLIKELY(err != GRPC_ERROR_NONE)) return err; } return p->on_header(p->on_header_user_data, md); @@ -693,16 +704,16 @@ static grpc_core::ManagedMemorySlice take_string_intern( } /* jump to the next state */ -static grpc_error* parse_next(grpc_chttp2_hpack_parser* p, const uint8_t* cur, - const uint8_t* end) { +static grpc_error_handle parse_next(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, const uint8_t* end) { p->state = *p->next_state++; return p->state(p, cur, end); } /* begin parsing a header: all functionality is encoded into lookup tables above */ -static grpc_error* parse_begin(grpc_chttp2_hpack_parser* p, const uint8_t* cur, - const uint8_t* end) { +static grpc_error_handle parse_begin(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, const uint8_t* end) { if (cur == end) { p->state = parse_begin; return GRPC_ERROR_NONE; @@ -712,8 +723,9 @@ static grpc_error* parse_begin(grpc_chttp2_hpack_parser* p, const uint8_t* cur, } /* stream dependency and prioritization data: we just skip it */ -static grpc_error* parse_stream_weight(grpc_chttp2_hpack_parser* p, - const uint8_t* cur, const uint8_t* end) { +static grpc_error_handle parse_stream_weight(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, + const uint8_t* end) { if (cur == end) { p->state = parse_stream_weight; return GRPC_ERROR_NONE; @@ -722,8 +734,9 @@ static grpc_error* parse_stream_weight(grpc_chttp2_hpack_parser* p, return p->after_prioritization(p, cur + 1, end); } -static grpc_error* parse_stream_dep3(grpc_chttp2_hpack_parser* p, - const uint8_t* cur, const uint8_t* end) { +static grpc_error_handle parse_stream_dep3(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, + const uint8_t* end) { if (cur == end) { p->state = parse_stream_dep3; return GRPC_ERROR_NONE; @@ -732,8 +745,9 @@ static grpc_error* parse_stream_dep3(grpc_chttp2_hpack_parser* p, return parse_stream_weight(p, cur + 1, end); } -static grpc_error* parse_stream_dep2(grpc_chttp2_hpack_parser* p, - const uint8_t* cur, const uint8_t* end) { +static grpc_error_handle parse_stream_dep2(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, + const uint8_t* end) { if (cur == end) { p->state = parse_stream_dep2; return GRPC_ERROR_NONE; @@ -742,8 +756,9 @@ static grpc_error* parse_stream_dep2(grpc_chttp2_hpack_parser* p, return parse_stream_dep3(p, cur + 1, end); } -static grpc_error* parse_stream_dep1(grpc_chttp2_hpack_parser* p, - const uint8_t* cur, const uint8_t* end) { +static grpc_error_handle parse_stream_dep1(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, + const uint8_t* end) { if (cur == end) { p->state = parse_stream_dep1; return GRPC_ERROR_NONE; @@ -752,8 +767,9 @@ static grpc_error* parse_stream_dep1(grpc_chttp2_hpack_parser* p, return parse_stream_dep2(p, cur + 1, end); } -static grpc_error* parse_stream_dep0(grpc_chttp2_hpack_parser* p, - const uint8_t* cur, const uint8_t* end) { +static grpc_error_handle parse_stream_dep0(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, + const uint8_t* end) { if (cur == end) { p->state = parse_stream_dep0; return GRPC_ERROR_NONE; @@ -762,7 +778,7 @@ static grpc_error* parse_stream_dep0(grpc_chttp2_hpack_parser* p, return parse_stream_dep1(p, cur + 1, end); } -static grpc_error* GPR_ATTRIBUTE_NOINLINE +static grpc_error_handle GPR_ATTRIBUTE_NOINLINE on_invalid_hpack_idx(grpc_chttp2_hpack_parser* p) { return grpc_error_set_int( grpc_error_set_int( @@ -772,22 +788,23 @@ on_invalid_hpack_idx(grpc_chttp2_hpack_parser* p) { } /* emit an indexed field; jumps to begin the next field on completion */ -static grpc_error* finish_indexed_field(grpc_chttp2_hpack_parser* p, - const uint8_t* cur, - const uint8_t* end) { +static grpc_error_handle finish_indexed_field(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, + const uint8_t* end) { grpc_mdelem md = grpc_chttp2_hptbl_lookup<true>(&p->table, p->index); if (GPR_UNLIKELY(GRPC_MDISNULL(md))) { return on_invalid_hpack_idx(p); } GRPC_STATS_INC_HPACK_RECV_INDEXED(); - grpc_error* err = on_hdr<false>(p, md); + grpc_error_handle err = on_hdr<false>(p, md); if (GPR_UNLIKELY(err != GRPC_ERROR_NONE)) return err; return parse_begin(p, cur, end); } /* parse an indexed field with index < 127 */ -static grpc_error* parse_indexed_field(grpc_chttp2_hpack_parser* p, - const uint8_t* cur, const uint8_t* end) { +static grpc_error_handle parse_indexed_field(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, + const uint8_t* end) { p->dynamic_table_update_allowed = 0; p->index = (*cur) & 0x7f; p->md_for_index.payload = 0; /* Invalidate cached md when index changes. */ @@ -795,9 +812,9 @@ static grpc_error* parse_indexed_field(grpc_chttp2_hpack_parser* p, } /* parse an indexed field with index >= 127 */ -static grpc_error* parse_indexed_field_x(grpc_chttp2_hpack_parser* p, - const uint8_t* cur, - const uint8_t* end) { +static grpc_error_handle parse_indexed_field_x(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, + const uint8_t* end) { static const grpc_chttp2_hpack_parser_state and_then[] = { finish_indexed_field}; p->dynamic_table_update_allowed = 0; @@ -830,12 +847,12 @@ static const grpc_core::ManagedMemorySlice& get_indexed_key(grpc_mdelem md) { } /* finish a literal header with incremental indexing */ -static grpc_error* finish_lithdr_incidx(grpc_chttp2_hpack_parser* p, - const uint8_t* cur, - const uint8_t* end) { +static grpc_error_handle finish_lithdr_incidx(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, + const uint8_t* end) { GRPC_STATS_INC_HPACK_RECV_LITHDR_INCIDX(); grpc_mdelem md = get_precomputed_md_for_idx(p); - grpc_error* err = on_hdr<true>( + grpc_error_handle err = on_hdr<true>( p, grpc_mdelem_from_slices(get_indexed_key(md), take_string_intern(p, &p->value))); if (err != GRPC_ERROR_NONE) return parse_error(p, cur, end, err); @@ -843,11 +860,11 @@ static grpc_error* finish_lithdr_incidx(grpc_chttp2_hpack_parser* p, } /* finish a literal header with incremental indexing with no index */ -static grpc_error* finish_lithdr_incidx_v(grpc_chttp2_hpack_parser* p, - const uint8_t* cur, - const uint8_t* end) { +static grpc_error_handle finish_lithdr_incidx_v(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, + const uint8_t* end) { GRPC_STATS_INC_HPACK_RECV_LITHDR_INCIDX_V(); - grpc_error* err = on_hdr<true>( + grpc_error_handle err = on_hdr<true>( p, grpc_mdelem_from_slices(take_string_intern(p, &p->key), take_string_intern(p, &p->value))); if (err != GRPC_ERROR_NONE) return parse_error(p, cur, end, err); @@ -855,8 +872,9 @@ static grpc_error* finish_lithdr_incidx_v(grpc_chttp2_hpack_parser* p, } /* parse a literal header with incremental indexing; index < 63 */ -static grpc_error* parse_lithdr_incidx(grpc_chttp2_hpack_parser* p, - const uint8_t* cur, const uint8_t* end) { +static grpc_error_handle parse_lithdr_incidx(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, + const uint8_t* end) { static const grpc_chttp2_hpack_parser_state and_then[] = { parse_value_string_with_indexed_key, finish_lithdr_incidx}; p->dynamic_table_update_allowed = 0; @@ -867,9 +885,9 @@ static grpc_error* parse_lithdr_incidx(grpc_chttp2_hpack_parser* p, } /* parse a literal header with incremental indexing; index >= 63 */ -static grpc_error* parse_lithdr_incidx_x(grpc_chttp2_hpack_parser* p, - const uint8_t* cur, - const uint8_t* end) { +static grpc_error_handle parse_lithdr_incidx_x(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, + const uint8_t* end) { static const grpc_chttp2_hpack_parser_state and_then[] = { parse_string_prefix, parse_value_string_with_indexed_key, finish_lithdr_incidx}; @@ -882,9 +900,9 @@ static grpc_error* parse_lithdr_incidx_x(grpc_chttp2_hpack_parser* p, } /* parse a literal header with incremental indexing; index = 0 */ -static grpc_error* parse_lithdr_incidx_v(grpc_chttp2_hpack_parser* p, - const uint8_t* cur, - const uint8_t* end) { +static grpc_error_handle parse_lithdr_incidx_v(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, + const uint8_t* end) { static const grpc_chttp2_hpack_parser_state and_then[] = { parse_key_string, parse_string_prefix, parse_value_string_with_literal_key, finish_lithdr_incidx_v}; @@ -894,12 +912,12 @@ static grpc_error* parse_lithdr_incidx_v(grpc_chttp2_hpack_parser* p, } /* finish a literal header without incremental indexing */ -static grpc_error* finish_lithdr_notidx(grpc_chttp2_hpack_parser* p, - const uint8_t* cur, - const uint8_t* end) { +static grpc_error_handle finish_lithdr_notidx(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, + const uint8_t* end) { GRPC_STATS_INC_HPACK_RECV_LITHDR_NOTIDX(); grpc_mdelem md = get_precomputed_md_for_idx(p); - grpc_error* err = on_hdr<false>( + grpc_error_handle err = on_hdr<false>( p, grpc_mdelem_from_slices(get_indexed_key(md), take_string_extern(p, &p->value))); if (err != GRPC_ERROR_NONE) return parse_error(p, cur, end, err); @@ -907,11 +925,11 @@ static grpc_error* finish_lithdr_notidx(grpc_chttp2_hpack_parser* p, } /* finish a literal header without incremental indexing with index = 0 */ -static grpc_error* finish_lithdr_notidx_v(grpc_chttp2_hpack_parser* p, - const uint8_t* cur, - const uint8_t* end) { +static grpc_error_handle finish_lithdr_notidx_v(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, + const uint8_t* end) { GRPC_STATS_INC_HPACK_RECV_LITHDR_NOTIDX_V(); - grpc_error* err = on_hdr<false>( + grpc_error_handle err = on_hdr<false>( p, grpc_mdelem_from_slices(take_string_intern(p, &p->key), take_string_extern(p, &p->value))); if (err != GRPC_ERROR_NONE) return parse_error(p, cur, end, err); @@ -919,8 +937,9 @@ static grpc_error* finish_lithdr_notidx_v(grpc_chttp2_hpack_parser* p, } /* parse a literal header without incremental indexing; index < 15 */ -static grpc_error* parse_lithdr_notidx(grpc_chttp2_hpack_parser* p, - const uint8_t* cur, const uint8_t* end) { +static grpc_error_handle parse_lithdr_notidx(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, + const uint8_t* end) { static const grpc_chttp2_hpack_parser_state and_then[] = { parse_value_string_with_indexed_key, finish_lithdr_notidx}; p->dynamic_table_update_allowed = 0; @@ -931,9 +950,9 @@ static grpc_error* parse_lithdr_notidx(grpc_chttp2_hpack_parser* p, } /* parse a literal header without incremental indexing; index >= 15 */ -static grpc_error* parse_lithdr_notidx_x(grpc_chttp2_hpack_parser* p, - const uint8_t* cur, - const uint8_t* end) { +static grpc_error_handle parse_lithdr_notidx_x(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, + const uint8_t* end) { static const grpc_chttp2_hpack_parser_state and_then[] = { parse_string_prefix, parse_value_string_with_indexed_key, finish_lithdr_notidx}; @@ -946,9 +965,9 @@ static grpc_error* parse_lithdr_notidx_x(grpc_chttp2_hpack_parser* p, } /* parse a literal header without incremental indexing; index == 0 */ -static grpc_error* parse_lithdr_notidx_v(grpc_chttp2_hpack_parser* p, - const uint8_t* cur, - const uint8_t* end) { +static grpc_error_handle parse_lithdr_notidx_v(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, + const uint8_t* end) { static const grpc_chttp2_hpack_parser_state and_then[] = { parse_key_string, parse_string_prefix, parse_value_string_with_literal_key, finish_lithdr_notidx_v}; @@ -958,12 +977,12 @@ static grpc_error* parse_lithdr_notidx_v(grpc_chttp2_hpack_parser* p, } /* finish a literal header that is never indexed */ -static grpc_error* finish_lithdr_nvridx(grpc_chttp2_hpack_parser* p, - const uint8_t* cur, - const uint8_t* end) { +static grpc_error_handle finish_lithdr_nvridx(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, + const uint8_t* end) { GRPC_STATS_INC_HPACK_RECV_LITHDR_NVRIDX(); grpc_mdelem md = get_precomputed_md_for_idx(p); - grpc_error* err = on_hdr<false>( + grpc_error_handle err = on_hdr<false>( p, grpc_mdelem_from_slices(get_indexed_key(md), take_string_extern(p, &p->value))); if (err != GRPC_ERROR_NONE) return parse_error(p, cur, end, err); @@ -971,11 +990,11 @@ static grpc_error* finish_lithdr_nvridx(grpc_chttp2_hpack_parser* p, } /* finish a literal header that is never indexed with an extra value */ -static grpc_error* finish_lithdr_nvridx_v(grpc_chttp2_hpack_parser* p, - const uint8_t* cur, - const uint8_t* end) { +static grpc_error_handle finish_lithdr_nvridx_v(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, + const uint8_t* end) { GRPC_STATS_INC_HPACK_RECV_LITHDR_NVRIDX_V(); - grpc_error* err = on_hdr<false>( + grpc_error_handle err = on_hdr<false>( p, grpc_mdelem_from_slices(take_string_intern(p, &p->key), take_string_extern(p, &p->value))); if (err != GRPC_ERROR_NONE) return parse_error(p, cur, end, err); @@ -983,8 +1002,9 @@ static grpc_error* finish_lithdr_nvridx_v(grpc_chttp2_hpack_parser* p, } /* parse a literal header that is never indexed; index < 15 */ -static grpc_error* parse_lithdr_nvridx(grpc_chttp2_hpack_parser* p, - const uint8_t* cur, const uint8_t* end) { +static grpc_error_handle parse_lithdr_nvridx(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, + const uint8_t* end) { static const grpc_chttp2_hpack_parser_state and_then[] = { parse_value_string_with_indexed_key, finish_lithdr_nvridx}; p->dynamic_table_update_allowed = 0; @@ -995,9 +1015,9 @@ static grpc_error* parse_lithdr_nvridx(grpc_chttp2_hpack_parser* p, } /* parse a literal header that is never indexed; index >= 15 */ -static grpc_error* parse_lithdr_nvridx_x(grpc_chttp2_hpack_parser* p, - const uint8_t* cur, - const uint8_t* end) { +static grpc_error_handle parse_lithdr_nvridx_x(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, + const uint8_t* end) { static const grpc_chttp2_hpack_parser_state and_then[] = { parse_string_prefix, parse_value_string_with_indexed_key, finish_lithdr_nvridx}; @@ -1010,9 +1030,9 @@ static grpc_error* parse_lithdr_nvridx_x(grpc_chttp2_hpack_parser* p, } /* parse a literal header that is never indexed; index == 0 */ -static grpc_error* parse_lithdr_nvridx_v(grpc_chttp2_hpack_parser* p, - const uint8_t* cur, - const uint8_t* end) { +static grpc_error_handle parse_lithdr_nvridx_v(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, + const uint8_t* end) { static const grpc_chttp2_hpack_parser_state and_then[] = { parse_key_string, parse_string_prefix, parse_value_string_with_literal_key, finish_lithdr_nvridx_v}; @@ -1022,20 +1042,22 @@ static grpc_error* parse_lithdr_nvridx_v(grpc_chttp2_hpack_parser* p, } /* finish parsing a max table size change */ -static grpc_error* finish_max_tbl_size(grpc_chttp2_hpack_parser* p, - const uint8_t* cur, const uint8_t* end) { +static grpc_error_handle finish_max_tbl_size(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, + const uint8_t* end) { if (GRPC_TRACE_FLAG_ENABLED(grpc_trace_chttp2_hpack_parser)) { gpr_log(GPR_INFO, "MAX TABLE SIZE: %d", p->index); } - grpc_error* err = + grpc_error_handle err = grpc_chttp2_hptbl_set_current_table_size(&p->table, p->index); if (err != GRPC_ERROR_NONE) return parse_error(p, cur, end, err); return parse_begin(p, cur, end); } /* parse a max table size change, max size < 15 */ -static grpc_error* parse_max_tbl_size(grpc_chttp2_hpack_parser* p, - const uint8_t* cur, const uint8_t* end) { +static grpc_error_handle parse_max_tbl_size(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, + const uint8_t* end) { if (p->dynamic_table_update_allowed == 0) { return parse_error( p, cur, end, @@ -1049,9 +1071,9 @@ static grpc_error* parse_max_tbl_size(grpc_chttp2_hpack_parser* p, } /* parse a max table size change, max size >= 15 */ -static grpc_error* parse_max_tbl_size_x(grpc_chttp2_hpack_parser* p, - const uint8_t* cur, - const uint8_t* end) { +static grpc_error_handle parse_max_tbl_size_x(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, + const uint8_t* end) { static const grpc_chttp2_hpack_parser_state and_then[] = { finish_max_tbl_size}; if (p->dynamic_table_update_allowed == 0) { @@ -1069,9 +1091,10 @@ static grpc_error* parse_max_tbl_size_x(grpc_chttp2_hpack_parser* p, } /* a parse error: jam the parse state into parse_error, and return error */ -static grpc_error* parse_error(grpc_chttp2_hpack_parser* p, - const uint8_t* /*cur*/, const uint8_t* /*end*/, - grpc_error* err) { +static grpc_error_handle parse_error(grpc_chttp2_hpack_parser* p, + const uint8_t* /*cur*/, + const uint8_t* /*end*/, + grpc_error_handle err) { GPR_ASSERT(err != GRPC_ERROR_NONE); if (p->last_error == GRPC_ERROR_NONE) { p->last_error = GRPC_ERROR_REF(err); @@ -1080,24 +1103,25 @@ static grpc_error* parse_error(grpc_chttp2_hpack_parser* p, return err; } -static grpc_error* still_parse_error(grpc_chttp2_hpack_parser* p, - const uint8_t* /*cur*/, - const uint8_t* /*end*/) { +static grpc_error_handle still_parse_error(grpc_chttp2_hpack_parser* p, + const uint8_t* /*cur*/, + const uint8_t* /*end*/) { return GRPC_ERROR_REF(p->last_error); } -static grpc_error* parse_illegal_op(grpc_chttp2_hpack_parser* p, - const uint8_t* cur, const uint8_t* end) { +static grpc_error_handle parse_illegal_op(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, + const uint8_t* end) { GPR_ASSERT(cur != end); - grpc_error* err = GRPC_ERROR_CREATE_FROM_COPIED_STRING( + grpc_error_handle err = GRPC_ERROR_CREATE_FROM_COPIED_STRING( absl::StrCat("Illegal hpack op code ", *cur).c_str()); return parse_error(p, cur, end, err); } /* parse the 1st byte of a varint into p->parsing.value no overflow is possible */ -static grpc_error* parse_value0(grpc_chttp2_hpack_parser* p, const uint8_t* cur, - const uint8_t* end) { +static grpc_error_handle parse_value0(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, const uint8_t* end) { if (cur == end) { p->state = parse_value0; return GRPC_ERROR_NONE; @@ -1114,8 +1138,8 @@ static grpc_error* parse_value0(grpc_chttp2_hpack_parser* p, const uint8_t* cur, /* parse the 2nd byte of a varint into p->parsing.value no overflow is possible */ -static grpc_error* parse_value1(grpc_chttp2_hpack_parser* p, const uint8_t* cur, - const uint8_t* end) { +static grpc_error_handle parse_value1(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, const uint8_t* end) { if (cur == end) { p->state = parse_value1; return GRPC_ERROR_NONE; @@ -1132,8 +1156,8 @@ static grpc_error* parse_value1(grpc_chttp2_hpack_parser* p, const uint8_t* cur, /* parse the 3rd byte of a varint into p->parsing.value no overflow is possible */ -static grpc_error* parse_value2(grpc_chttp2_hpack_parser* p, const uint8_t* cur, - const uint8_t* end) { +static grpc_error_handle parse_value2(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, const uint8_t* end) { if (cur == end) { p->state = parse_value2; return GRPC_ERROR_NONE; @@ -1150,8 +1174,8 @@ static grpc_error* parse_value2(grpc_chttp2_hpack_parser* p, const uint8_t* cur, /* parse the 4th byte of a varint into p->parsing.value no overflow is possible */ -static grpc_error* parse_value3(grpc_chttp2_hpack_parser* p, const uint8_t* cur, - const uint8_t* end) { +static grpc_error_handle parse_value3(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, const uint8_t* end) { if (cur == end) { p->state = parse_value3; return GRPC_ERROR_NONE; @@ -1168,8 +1192,8 @@ static grpc_error* parse_value3(grpc_chttp2_hpack_parser* p, const uint8_t* cur, /* parse the 5th byte of a varint into p->parsing.value depending on the byte, we may overflow, and care must be taken */ -static grpc_error* parse_value4(grpc_chttp2_hpack_parser* p, const uint8_t* cur, - const uint8_t* end) { +static grpc_error_handle parse_value4(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, const uint8_t* end) { uint8_t c; uint32_t cur_value; uint32_t add_value; @@ -1199,7 +1223,7 @@ static grpc_error* parse_value4(grpc_chttp2_hpack_parser* p, const uint8_t* cur, } error: - grpc_error* err = GRPC_ERROR_CREATE_FROM_COPIED_STRING( + grpc_error_handle err = GRPC_ERROR_CREATE_FROM_COPIED_STRING( absl::StrFormat( "integer overflow in hpack integer decoding: have 0x%08x, " "got byte 0x%02x on byte 5", @@ -1211,8 +1235,9 @@ error: /* parse any trailing bytes in a varint: it's possible to append an arbitrary number of 0x80's and not affect the value - a zero will terminate - and anything else will overflow */ -static grpc_error* parse_value5up(grpc_chttp2_hpack_parser* p, - const uint8_t* cur, const uint8_t* end) { +static grpc_error_handle parse_value5up(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, + const uint8_t* end) { while (cur != end && *cur == 0x80) { ++cur; } @@ -1226,7 +1251,7 @@ static grpc_error* parse_value5up(grpc_chttp2_hpack_parser* p, return parse_next(p, cur + 1, end); } - grpc_error* err = GRPC_ERROR_CREATE_FROM_COPIED_STRING( + grpc_error_handle err = GRPC_ERROR_CREATE_FROM_COPIED_STRING( absl::StrFormat( "integer overflow in hpack integer decoding: have 0x%08x, " "got byte 0x%02x sometime after byte 5", @@ -1236,8 +1261,9 @@ static grpc_error* parse_value5up(grpc_chttp2_hpack_parser* p, } /* parse a string prefix */ -static grpc_error* parse_string_prefix(grpc_chttp2_hpack_parser* p, - const uint8_t* cur, const uint8_t* end) { +static grpc_error_handle parse_string_prefix(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, + const uint8_t* end) { if (cur == end) { p->state = parse_string_prefix; return GRPC_ERROR_NONE; @@ -1269,8 +1295,8 @@ static void append_bytes(grpc_chttp2_hpack_parser_string* str, str->data.copied.length += static_cast<uint32_t>(length); } -static grpc_error* append_string(grpc_chttp2_hpack_parser* p, - const uint8_t* cur, const uint8_t* end) { +static grpc_error_handle append_string(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, const uint8_t* end) { grpc_chttp2_hpack_parser_string* str = p->parsing.str; uint32_t bits; uint8_t decoded[3]; @@ -1372,8 +1398,8 @@ static grpc_error* append_string(grpc_chttp2_hpack_parser* p, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Should never reach here"))); } -static grpc_error* finish_str(grpc_chttp2_hpack_parser* p, const uint8_t* cur, - const uint8_t* end) { +static grpc_error_handle finish_str(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, const uint8_t* end) { uint8_t decoded[2]; uint32_t bits; grpc_chttp2_hpack_parser_string* str = p->parsing.str; @@ -1391,7 +1417,7 @@ static grpc_error* finish_str(grpc_chttp2_hpack_parser* p, const uint8_t* cur, case B64_BYTE2: bits = p->base64_buffer; if (bits & 0xffff) { - grpc_error* err = GRPC_ERROR_CREATE_FROM_COPIED_STRING( + grpc_error_handle err = GRPC_ERROR_CREATE_FROM_COPIED_STRING( absl::StrFormat("trailing bits in base64 encoding: 0x%04x", bits & 0xffff) .c_str()); @@ -1403,7 +1429,7 @@ static grpc_error* finish_str(grpc_chttp2_hpack_parser* p, const uint8_t* cur, case B64_BYTE3: bits = p->base64_buffer; if (bits & 0xff) { - grpc_error* err = GRPC_ERROR_CREATE_FROM_COPIED_STRING( + grpc_error_handle err = GRPC_ERROR_CREATE_FROM_COPIED_STRING( absl::StrFormat("trailing bits in base64 encoding: 0x%02x", bits & 0xff) .c_str()); @@ -1418,13 +1444,14 @@ static grpc_error* finish_str(grpc_chttp2_hpack_parser* p, const uint8_t* cur, } /* decode a nibble from a huffman encoded stream */ -static grpc_error* huff_nibble(grpc_chttp2_hpack_parser* p, uint8_t nibble) { +static grpc_error_handle huff_nibble(grpc_chttp2_hpack_parser* p, + uint8_t nibble) { int16_t emit = emit_sub_tbl[16 * emit_tbl[p->huff_state] + nibble]; int16_t next = next_sub_tbl[16 * next_tbl[p->huff_state] + nibble]; if (emit != -1) { if (emit >= 0 && emit < 256) { uint8_t c = static_cast<uint8_t>(emit); - grpc_error* err = append_string(p, &c, (&c) + 1); + grpc_error_handle err = append_string(p, &c, (&c) + 1); if (err != GRPC_ERROR_NONE) return err; } else { assert(emit == 256); @@ -1435,10 +1462,11 @@ static grpc_error* huff_nibble(grpc_chttp2_hpack_parser* p, uint8_t nibble) { } /* decode full bytes from a huffman encoded stream */ -static grpc_error* add_huff_bytes(grpc_chttp2_hpack_parser* p, - const uint8_t* cur, const uint8_t* end) { +static grpc_error_handle add_huff_bytes(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, + const uint8_t* end) { for (; cur != end; ++cur) { - grpc_error* err = huff_nibble(p, *cur >> 4); + grpc_error_handle err = huff_nibble(p, *cur >> 4); if (err != GRPC_ERROR_NONE) return parse_error(p, cur, end, err); err = huff_nibble(p, *cur & 0xf); if (err != GRPC_ERROR_NONE) return parse_error(p, cur, end, err); @@ -1448,8 +1476,8 @@ static grpc_error* add_huff_bytes(grpc_chttp2_hpack_parser* p, /* decode some string bytes based on the current decoding mode (huffman or not) */ -static grpc_error* add_str_bytes(grpc_chttp2_hpack_parser* p, - const uint8_t* cur, const uint8_t* end) { +static grpc_error_handle add_str_bytes(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, const uint8_t* end) { if (p->huff) { return add_huff_bytes(p, cur, end); } else { @@ -1458,18 +1486,18 @@ static grpc_error* add_str_bytes(grpc_chttp2_hpack_parser* p, } /* parse a string - tries to do large chunks at a time */ -static grpc_error* parse_string(grpc_chttp2_hpack_parser* p, const uint8_t* cur, - const uint8_t* end) { +static grpc_error_handle parse_string(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, const uint8_t* end) { size_t remaining = p->strlen - p->strgot; size_t given = static_cast<size_t>(end - cur); if (remaining <= given) { - grpc_error* err = add_str_bytes(p, cur, cur + remaining); + grpc_error_handle err = add_str_bytes(p, cur, cur + remaining); if (err != GRPC_ERROR_NONE) return parse_error(p, cur, end, err); err = finish_str(p, cur + remaining, end); if (err != GRPC_ERROR_NONE) return parse_error(p, cur, end, err); return parse_next(p, cur + remaining, end); } else { - grpc_error* err = add_str_bytes(p, cur, cur + given); + grpc_error_handle err = add_str_bytes(p, cur, cur + given); if (err != GRPC_ERROR_NONE) return parse_error(p, cur, end, err); GPR_ASSERT(given <= UINT32_MAX - p->strgot); p->strgot += static_cast<uint32_t>(given); @@ -1479,10 +1507,9 @@ static grpc_error* parse_string(grpc_chttp2_hpack_parser* p, const uint8_t* cur, } /* begin parsing a string - performs setup, calls parse_string */ -static grpc_error* begin_parse_string(grpc_chttp2_hpack_parser* p, - const uint8_t* cur, const uint8_t* end, - uint8_t binary, - grpc_chttp2_hpack_parser_string* str) { +static grpc_error_handle begin_parse_string( + grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end, + uint8_t binary, grpc_chttp2_hpack_parser_string* str) { if (!p->huff && binary == NOT_BINARY && static_cast<uint32_t>(end - cur) >= p->strlen && p->current_slice_refcount != nullptr) { @@ -1518,8 +1545,9 @@ static grpc_error* begin_parse_string(grpc_chttp2_hpack_parser* p, } /* parse the key string */ -static grpc_error* parse_key_string(grpc_chttp2_hpack_parser* p, - const uint8_t* cur, const uint8_t* end) { +static grpc_error_handle parse_key_string(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, + const uint8_t* end) { return begin_parse_string(p, cur, end, NOT_BINARY, &p->key); } @@ -1554,8 +1582,8 @@ static void set_precomputed_md_idx(grpc_chttp2_hpack_parser* p, is a binary indexed header during string parsing. We'll need to revisit this metadata when we're done parsing, so we cache the metadata for this index here using set_precomputed_md_idx(). */ -static grpc_error* is_binary_indexed_header(grpc_chttp2_hpack_parser* p, - bool* is) { +static grpc_error_handle is_binary_indexed_header(grpc_chttp2_hpack_parser* p, + bool* is) { grpc_mdelem elem = grpc_chttp2_hptbl_lookup(&p->table, p->index); if (GPR_UNLIKELY(GRPC_MDISNULL(elem))) { return on_invalid_hpack_idx(p); @@ -1574,29 +1602,30 @@ static grpc_error* is_binary_indexed_header(grpc_chttp2_hpack_parser* p, } /* parse the value string */ -static grpc_error* parse_value_string(grpc_chttp2_hpack_parser* p, - const uint8_t* cur, const uint8_t* end, - bool is_binary) { +static grpc_error_handle parse_value_string(grpc_chttp2_hpack_parser* p, + const uint8_t* cur, + const uint8_t* end, + bool is_binary) { return begin_parse_string(p, cur, end, is_binary ? BINARY_BEGIN : NOT_BINARY, &p->value); } -static grpc_error* parse_value_string_with_indexed_key( +static grpc_error_handle parse_value_string_with_indexed_key( grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { bool is_binary = false; - grpc_error* err = is_binary_indexed_header(p, &is_binary); + grpc_error_handle err = is_binary_indexed_header(p, &is_binary); if (err != GRPC_ERROR_NONE) return parse_error(p, cur, end, err); return parse_value_string(p, cur, end, is_binary); } -static grpc_error* parse_value_string_with_literal_key( +static grpc_error_handle parse_value_string_with_literal_key( grpc_chttp2_hpack_parser* p, const uint8_t* cur, const uint8_t* end) { return parse_value_string(p, cur, end, is_binary_literal_header(p)); } /* "Uninitialized" header parser to save us a branch in on_hdr(). */ -static grpc_error* on_header_uninitialized(void* /*user_data*/, - grpc_mdelem md) { +static grpc_error_handle on_header_uninitialized(void* /*user_data*/, + grpc_mdelem md) { GRPC_MDELEM_UNREF(md); return GRPC_ERROR_CREATE_FROM_STATIC_STRING("on_header callback not set"); } @@ -1645,15 +1674,15 @@ void grpc_chttp2_hpack_parser_destroy(grpc_chttp2_hpack_parser* p) { gpr_free(p->value.data.copied.str); } -grpc_error* grpc_chttp2_hpack_parser_parse(grpc_chttp2_hpack_parser* p, - const grpc_slice& slice) { +grpc_error_handle grpc_chttp2_hpack_parser_parse(grpc_chttp2_hpack_parser* p, + const grpc_slice& slice) { /* max number of bytes to parse at a time... limits call stack depth on * compilers without TCO */ #define MAX_PARSE_LENGTH 1024 p->current_slice_refcount = slice.refcount; const uint8_t* start = GRPC_SLICE_START_PTR(slice); const uint8_t* end = GRPC_SLICE_END_PTR(slice); - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; while (start != end && error == GRPC_ERROR_NONE) { const uint8_t* target = start + GPR_MIN(MAX_PARSE_LENGTH, end - start); error = p->state(p, start, target); @@ -1669,7 +1698,7 @@ static const maybe_complete_func_type maybe_complete_funcs[] = { grpc_chttp2_maybe_complete_recv_initial_metadata, grpc_chttp2_maybe_complete_recv_trailing_metadata}; -static void force_client_rst_stream(void* sp, grpc_error* /*error*/) { +static void force_client_rst_stream(void* sp, grpc_error_handle /*error*/) { grpc_chttp2_stream* s = static_cast<grpc_chttp2_stream*>(sp); grpc_chttp2_transport* t = s->t; if (!s->write_closed) { @@ -1699,18 +1728,18 @@ static void parse_stream_compression_md(grpc_chttp2_transport* /*t*/, } } -grpc_error* grpc_chttp2_header_parser_parse(void* hpack_parser, - grpc_chttp2_transport* t, - grpc_chttp2_stream* s, - const grpc_slice& slice, - int is_last) { +grpc_error_handle grpc_chttp2_header_parser_parse(void* hpack_parser, + grpc_chttp2_transport* t, + grpc_chttp2_stream* s, + const grpc_slice& slice, + int is_last) { GPR_TIMER_SCOPE("grpc_chttp2_header_parser_parse", 0); grpc_chttp2_hpack_parser* parser = static_cast<grpc_chttp2_hpack_parser*>(hpack_parser); if (s != nullptr) { s->stats.incoming.header_bytes += GRPC_SLICE_LENGTH(slice); } - grpc_error* error = grpc_chttp2_hpack_parser_parse(parser, slice); + grpc_error_handle error = grpc_chttp2_hpack_parser_parse(parser, slice); if (error != GRPC_ERROR_NONE) { return error; } diff --git a/grpc/src/core/ext/transport/chttp2/transport/hpack_parser.h b/grpc/src/core/ext/transport/chttp2/transport/hpack_parser.h index 1b859c4d..71aa194a 100644 --- a/grpc/src/core/ext/transport/chttp2/transport/hpack_parser.h +++ b/grpc/src/core/ext/transport/chttp2/transport/hpack_parser.h @@ -29,7 +29,7 @@ typedef struct grpc_chttp2_hpack_parser grpc_chttp2_hpack_parser; -typedef grpc_error* (*grpc_chttp2_hpack_parser_state)( +typedef grpc_error_handle (*grpc_chttp2_hpack_parser_state)( grpc_chttp2_hpack_parser* p, const uint8_t* beg, const uint8_t* end); struct grpc_chttp2_hpack_parser_string { @@ -45,10 +45,10 @@ struct grpc_chttp2_hpack_parser_string { }; struct grpc_chttp2_hpack_parser { /* user specified callback for each header output */ - grpc_error* (*on_header)(void* user_data, grpc_mdelem md); + grpc_error_handle (*on_header)(void* user_data, grpc_mdelem md); void* on_header_user_data; - grpc_error* last_error; + grpc_error_handle last_error; /* current parse state - or a function that implements it */ grpc_chttp2_hpack_parser_state state; @@ -103,15 +103,15 @@ void grpc_chttp2_hpack_parser_destroy(grpc_chttp2_hpack_parser* p); void grpc_chttp2_hpack_parser_set_has_priority(grpc_chttp2_hpack_parser* p); -grpc_error* grpc_chttp2_hpack_parser_parse(grpc_chttp2_hpack_parser* p, - const grpc_slice& slice); +grpc_error_handle grpc_chttp2_hpack_parser_parse(grpc_chttp2_hpack_parser* p, + const grpc_slice& slice); /* wraps grpc_chttp2_hpack_parser_parse to provide a frame level parser for the transport */ -grpc_error* grpc_chttp2_header_parser_parse(void* hpack_parser, - grpc_chttp2_transport* t, - grpc_chttp2_stream* s, - const grpc_slice& slice, - int is_last); +grpc_error_handle grpc_chttp2_header_parser_parse(void* hpack_parser, + grpc_chttp2_transport* t, + grpc_chttp2_stream* s, + const grpc_slice& slice, + int is_last); #endif /* GRPC_CORE_EXT_TRANSPORT_CHTTP2_TRANSPORT_HPACK_PARSER_H */ diff --git a/grpc/src/core/ext/transport/chttp2/transport/hpack_table.cc b/grpc/src/core/ext/transport/chttp2/transport/hpack_table.cc index 78ee207c..696176b4 100644 --- a/grpc/src/core/ext/transport/chttp2/transport/hpack_table.cc +++ b/grpc/src/core/ext/transport/chttp2/transport/hpack_table.cc @@ -114,8 +114,8 @@ void grpc_chttp2_hptbl_set_max_bytes(grpc_chttp2_hptbl* tbl, tbl->max_bytes = max_bytes; } -grpc_error* grpc_chttp2_hptbl_set_current_table_size(grpc_chttp2_hptbl* tbl, - uint32_t bytes) { +grpc_error_handle grpc_chttp2_hptbl_set_current_table_size( + grpc_chttp2_hptbl* tbl, uint32_t bytes) { if (tbl->current_table_bytes == bytes) { return GRPC_ERROR_NONE; } @@ -145,7 +145,8 @@ grpc_error* grpc_chttp2_hptbl_set_current_table_size(grpc_chttp2_hptbl* tbl, return GRPC_ERROR_NONE; } -grpc_error* grpc_chttp2_hptbl_add(grpc_chttp2_hptbl* tbl, grpc_mdelem md) { +grpc_error_handle grpc_chttp2_hptbl_add(grpc_chttp2_hptbl* tbl, + grpc_mdelem md) { /* determine how many bytes of buffer this entry represents */ size_t elem_bytes = GRPC_SLICE_LENGTH(GRPC_MDKEY(md)) + GRPC_SLICE_LENGTH(GRPC_MDVALUE(md)) + diff --git a/grpc/src/core/ext/transport/chttp2/transport/hpack_table.h b/grpc/src/core/ext/transport/chttp2/transport/hpack_table.h index 34c3dced..14a77932 100644 --- a/grpc/src/core/ext/transport/chttp2/transport/hpack_table.h +++ b/grpc/src/core/ext/transport/chttp2/transport/hpack_table.h @@ -89,8 +89,8 @@ struct grpc_chttp2_hptbl { void grpc_chttp2_hptbl_destroy(grpc_chttp2_hptbl* tbl); void grpc_chttp2_hptbl_set_max_bytes(grpc_chttp2_hptbl* tbl, uint32_t max_bytes); -grpc_error* grpc_chttp2_hptbl_set_current_table_size(grpc_chttp2_hptbl* tbl, - uint32_t bytes); +grpc_error_handle grpc_chttp2_hptbl_set_current_table_size( + grpc_chttp2_hptbl* tbl, uint32_t bytes); /* lookup a table entry based on its hpack index */ grpc_mdelem grpc_chttp2_hptbl_lookup_dynamic_index(const grpc_chttp2_hptbl* tbl, @@ -117,8 +117,8 @@ inline grpc_mdelem grpc_chttp2_hptbl_lookup(const grpc_chttp2_hptbl* tbl, } } /* add a table entry to the index */ -grpc_error* grpc_chttp2_hptbl_add(grpc_chttp2_hptbl* tbl, - grpc_mdelem md) GRPC_MUST_USE_RESULT; +grpc_error_handle grpc_chttp2_hptbl_add(grpc_chttp2_hptbl* tbl, + grpc_mdelem md) GRPC_MUST_USE_RESULT; size_t grpc_chttp2_get_size_in_hpack_table(grpc_mdelem elem, bool use_true_binary_metadata); diff --git a/grpc/src/core/ext/transport/chttp2/transport/incoming_metadata.cc b/grpc/src/core/ext/transport/chttp2/transport/incoming_metadata.cc index d04630d7..361b7b7e 100644 --- a/grpc/src/core/ext/transport/chttp2/transport/incoming_metadata.cc +++ b/grpc/src/core/ext/transport/chttp2/transport/incoming_metadata.cc @@ -27,7 +27,7 @@ #include <grpc/support/alloc.h> #include <grpc/support/log.h> -grpc_error* grpc_chttp2_incoming_metadata_buffer_add( +grpc_error_handle grpc_chttp2_incoming_metadata_buffer_add( grpc_chttp2_incoming_metadata_buffer* buffer, grpc_mdelem elem) { buffer->size += GRPC_MDELEM_LENGTH(elem); grpc_linked_mdelem* storage; @@ -42,7 +42,7 @@ grpc_error* grpc_chttp2_incoming_metadata_buffer_add( return grpc_metadata_batch_link_tail(&buffer->batch, storage); } -grpc_error* grpc_chttp2_incoming_metadata_buffer_replace_or_add( +grpc_error_handle grpc_chttp2_incoming_metadata_buffer_replace_or_add( grpc_chttp2_incoming_metadata_buffer* buffer, grpc_mdelem elem) { for (grpc_linked_mdelem* l = buffer->batch.list.head; l != nullptr; l = l->next) { diff --git a/grpc/src/core/ext/transport/chttp2/transport/incoming_metadata.h b/grpc/src/core/ext/transport/chttp2/transport/incoming_metadata.h index b63caa1a..68413b06 100644 --- a/grpc/src/core/ext/transport/chttp2/transport/incoming_metadata.h +++ b/grpc/src/core/ext/transport/chttp2/transport/incoming_metadata.h @@ -46,10 +46,10 @@ struct grpc_chttp2_incoming_metadata_buffer { void grpc_chttp2_incoming_metadata_buffer_publish( grpc_chttp2_incoming_metadata_buffer* buffer, grpc_metadata_batch* batch); -grpc_error* grpc_chttp2_incoming_metadata_buffer_add( +grpc_error_handle grpc_chttp2_incoming_metadata_buffer_add( grpc_chttp2_incoming_metadata_buffer* buffer, grpc_mdelem elem) GRPC_MUST_USE_RESULT; -grpc_error* grpc_chttp2_incoming_metadata_buffer_replace_or_add( +grpc_error_handle grpc_chttp2_incoming_metadata_buffer_replace_or_add( grpc_chttp2_incoming_metadata_buffer* buffer, grpc_mdelem elem) GRPC_MUST_USE_RESULT; void grpc_chttp2_incoming_metadata_buffer_set_deadline( diff --git a/grpc/src/core/ext/transport/chttp2/transport/internal.h b/grpc/src/core/ext/transport/chttp2/transport/internal.h index 408a4251..9c7f5fce 100644 --- a/grpc/src/core/ext/transport/chttp2/transport/internal.h +++ b/grpc/src/core/ext/transport/chttp2/transport/internal.h @@ -217,8 +217,8 @@ class Chttp2IncomingByteStream : public ByteStream { void Orphan() override; bool Next(size_t max_size_hint, grpc_closure* on_complete) override; - grpc_error* Pull(grpc_slice* slice) override; - void Shutdown(grpc_error* error) override; + grpc_error_handle Pull(grpc_slice* slice) override; + void Shutdown(grpc_error_handle error) override; // TODO(roth): When I converted this class to C++, I wanted to make it // inherit from RefCounted or InternallyRefCounted instead of continuing @@ -241,17 +241,17 @@ class Chttp2IncomingByteStream : public ByteStream { } } - void PublishError(grpc_error* error); + void PublishError(grpc_error_handle error); - grpc_error* Push(const grpc_slice& slice, grpc_slice* slice_out); + grpc_error_handle Push(const grpc_slice& slice, grpc_slice* slice_out); - grpc_error* Finished(grpc_error* error, bool reset_on_error); + grpc_error_handle Finished(grpc_error_handle error, bool reset_on_error); uint32_t remaining_bytes() const { return remaining_bytes_; } private: - static void NextLocked(void* arg, grpc_error* error_ignored); - static void OrphanLocked(void* arg, grpc_error* error_ignored); + static void NextLocked(void* arg, grpc_error_handle error_ignored); + static void OrphanLocked(void* arg, grpc_error_handle error_ignored); void MaybeCreateStreamDecompressionCtx(); @@ -301,6 +301,7 @@ struct grpc_chttp2_transport { grpc_core::Combiner* combiner; grpc_closure* notify_on_receive_settings = nullptr; + grpc_closure* notify_on_close = nullptr; /** write execution state of the transport */ grpc_chttp2_write_state write_state = GRPC_CHTTP2_WRITE_STATE_IDLE; @@ -308,7 +309,7 @@ struct grpc_chttp2_transport { /** is the transport destroying itself? */ uint8_t destroying = false; /** has the upper layer closed the transport? */ - grpc_error* closed_with_error = GRPC_ERROR_NONE; + grpc_error_handle closed_with_error = GRPC_ERROR_NONE; /** is there a read request to the endpoint outstanding? */ uint8_t endpoint_reading = 1; @@ -357,7 +358,7 @@ struct grpc_chttp2_transport { /** Set to a grpc_error object if a goaway frame is received. By default, set * to GRPC_ERROR_NONE */ - grpc_error* goaway_error = GRPC_ERROR_NONE; + grpc_error_handle goaway_error = GRPC_ERROR_NONE; grpc_chttp2_sent_goaway_state sent_goaway_state = GRPC_CHTTP2_NO_GOAWAY_SEND; @@ -427,9 +428,9 @@ struct grpc_chttp2_transport { /* active parser */ void* parser_data = nullptr; grpc_chttp2_stream* incoming_stream = nullptr; - grpc_error* (*parser)(void* parser_user_data, grpc_chttp2_transport* t, - grpc_chttp2_stream* s, const grpc_slice& slice, - int is_last); + grpc_error_handle (*parser)(void* parser_user_data, grpc_chttp2_transport* t, + grpc_chttp2_stream* s, const grpc_slice& slice, + int is_last); grpc_chttp2_write_cb* write_cb_pool = nullptr; @@ -442,7 +443,7 @@ struct grpc_chttp2_transport { /* if non-NULL, close the transport with this error when writes are finished */ - grpc_error* close_transport_on_writes_finished = GRPC_ERROR_NONE; + grpc_error_handle close_transport_on_writes_finished = GRPC_ERROR_NONE; /* a list of closures to run after writes are finished */ grpc_closure_list run_after_write = GRPC_CLOSURE_LIST_INIT; @@ -580,9 +581,9 @@ struct grpc_chttp2_stream { bool eos_sent = false; /** the error that resulted in this stream being read-closed */ - grpc_error* read_closed_error = GRPC_ERROR_NONE; + grpc_error_handle read_closed_error = GRPC_ERROR_NONE; /** the error that resulted in this stream being write-closed */ - grpc_error* write_closed_error = GRPC_ERROR_NONE; + grpc_error_handle write_closed_error = GRPC_ERROR_NONE; grpc_published_metadata_method published_metadata[2] = {}; bool final_metadata_requested = false; @@ -603,13 +604,14 @@ struct grpc_chttp2_stream { * true */ grpc_slice_buffer unprocessed_incoming_frames_buffer; grpc_closure reset_byte_stream; - grpc_error* byte_stream_error = GRPC_ERROR_NONE; /* protected by t combiner */ - bool received_last_frame = false; /* protected by t combiner */ + grpc_error_handle byte_stream_error = + GRPC_ERROR_NONE; /* protected by t combiner */ + bool received_last_frame = false; /* protected by t combiner */ grpc_millis deadline = GRPC_MILLIS_INF_FUTURE; /** saw some stream level error */ - grpc_error* forced_close_error = GRPC_ERROR_NONE; + grpc_error_handle forced_close_error = GRPC_ERROR_NONE; /** how many header frames have we received? */ uint8_t header_frames_received = 0; /** parsing state for data frames */ @@ -695,12 +697,12 @@ struct grpc_chttp2_begin_write_result { }; grpc_chttp2_begin_write_result grpc_chttp2_begin_write( grpc_chttp2_transport* t); -void grpc_chttp2_end_write(grpc_chttp2_transport* t, grpc_error* error); +void grpc_chttp2_end_write(grpc_chttp2_transport* t, grpc_error_handle error); /** Process one slice of incoming data; return 1 if the connection is still viable after reading, or 0 if the connection should be torn down */ -grpc_error* grpc_chttp2_perform_read(grpc_chttp2_transport* t, - const grpc_slice& slice); +grpc_error_handle grpc_chttp2_perform_read(grpc_chttp2_transport* t, + const grpc_slice& slice); bool grpc_chttp2_list_add_writable_stream(grpc_chttp2_transport* t, grpc_chttp2_stream* s); @@ -770,7 +772,8 @@ void grpc_chttp2_parsing_become_skip_parser(grpc_chttp2_transport* t); void grpc_chttp2_complete_closure_step(grpc_chttp2_transport* t, grpc_chttp2_stream* s, grpc_closure** pclosure, - grpc_error* error, const char* desc); + grpc_error_handle error, + const char* desc); #define GRPC_HEADER_SIZE_IN_BYTES 5 #define MAX_SIZE_T (~(size_t)0) @@ -790,10 +793,11 @@ void grpc_chttp2_complete_closure_step(grpc_chttp2_transport* t, } while (0) void grpc_chttp2_fake_status(grpc_chttp2_transport* t, - grpc_chttp2_stream* stream, grpc_error* error); + grpc_chttp2_stream* stream, + grpc_error_handle error); void grpc_chttp2_mark_stream_closed(grpc_chttp2_transport* t, grpc_chttp2_stream* s, int close_reads, - int close_writes, grpc_error* error); + int close_writes, grpc_error_handle error); void grpc_chttp2_start_writing(grpc_chttp2_transport* t); #ifndef NDEBUG @@ -861,7 +865,7 @@ void grpc_chttp2_mark_stream_writable(grpc_chttp2_transport* t, grpc_chttp2_stream* s); void grpc_chttp2_cancel_stream(grpc_chttp2_transport* t, grpc_chttp2_stream* s, - grpc_error* due_to_error); + grpc_error_handle due_to_error); void grpc_chttp2_maybe_complete_recv_initial_metadata(grpc_chttp2_transport* t, grpc_chttp2_stream* s); @@ -871,14 +875,15 @@ void grpc_chttp2_maybe_complete_recv_trailing_metadata(grpc_chttp2_transport* t, grpc_chttp2_stream* s); void grpc_chttp2_fail_pending_writes(grpc_chttp2_transport* t, - grpc_chttp2_stream* s, grpc_error* error); + grpc_chttp2_stream* s, + grpc_error_handle error); /** Set the default keepalive configurations, must only be called at initialization */ void grpc_chttp2_config_default_keepalive_args(grpc_channel_args* args, bool is_client); -void grpc_chttp2_retry_initiate_ping(void* tp, grpc_error* error); +void grpc_chttp2_retry_initiate_ping(void* tp, grpc_error_handle error); void schedule_bdp_ping_locked(grpc_chttp2_transport* t); diff --git a/grpc/src/core/ext/transport/chttp2/transport/parsing.cc b/grpc/src/core/ext/transport/chttp2/transport/parsing.cc index f4b02bbf..68e7c69c 100644 --- a/grpc/src/core/ext/transport/chttp2/transport/parsing.cc +++ b/grpc/src/core/ext/transport/chttp2/transport/parsing.cc @@ -36,27 +36,29 @@ #include "src/core/lib/transport/status_conversion.h" #include "src/core/lib/transport/timeout_encoding.h" -static grpc_error* init_frame_parser(grpc_chttp2_transport* t); -static grpc_error* init_header_frame_parser(grpc_chttp2_transport* t, - int is_continuation); -static grpc_error* init_data_frame_parser(grpc_chttp2_transport* t); -static grpc_error* init_rst_stream_parser(grpc_chttp2_transport* t); -static grpc_error* init_settings_frame_parser(grpc_chttp2_transport* t); -static grpc_error* init_window_update_frame_parser(grpc_chttp2_transport* t); -static grpc_error* init_ping_parser(grpc_chttp2_transport* t); -static grpc_error* init_goaway_parser(grpc_chttp2_transport* t); -static grpc_error* init_skip_frame_parser(grpc_chttp2_transport* t, - int is_header); - -static grpc_error* parse_frame_slice(grpc_chttp2_transport* t, - const grpc_slice& slice, int is_last); - -grpc_error* grpc_chttp2_perform_read(grpc_chttp2_transport* t, - const grpc_slice& slice) { +static grpc_error_handle init_frame_parser(grpc_chttp2_transport* t); +static grpc_error_handle init_header_frame_parser(grpc_chttp2_transport* t, + int is_continuation); +static grpc_error_handle init_data_frame_parser(grpc_chttp2_transport* t); +static grpc_error_handle init_rst_stream_parser(grpc_chttp2_transport* t); +static grpc_error_handle init_settings_frame_parser(grpc_chttp2_transport* t); +static grpc_error_handle init_window_update_frame_parser( + grpc_chttp2_transport* t); +static grpc_error_handle init_ping_parser(grpc_chttp2_transport* t); +static grpc_error_handle init_goaway_parser(grpc_chttp2_transport* t); +static grpc_error_handle init_skip_frame_parser(grpc_chttp2_transport* t, + int is_header); + +static grpc_error_handle parse_frame_slice(grpc_chttp2_transport* t, + const grpc_slice& slice, + int is_last); + +grpc_error_handle grpc_chttp2_perform_read(grpc_chttp2_transport* t, + const grpc_slice& slice) { const uint8_t* beg = GRPC_SLICE_START_PTR(slice); const uint8_t* end = GRPC_SLICE_END_PTR(slice); const uint8_t* cur = beg; - grpc_error* err; + grpc_error_handle err; if (cur == end) return GRPC_ERROR_NONE; @@ -250,7 +252,7 @@ grpc_error* grpc_chttp2_perform_read(grpc_chttp2_transport* t, GPR_UNREACHABLE_CODE(return nullptr); } -static grpc_error* init_frame_parser(grpc_chttp2_transport* t) { +static grpc_error_handle init_frame_parser(grpc_chttp2_transport* t) { if (t->is_first_frame && t->incoming_frame_type != GRPC_CHTTP2_FRAME_SETTINGS) { return GRPC_ERROR_CREATE_FROM_COPIED_STRING( @@ -303,19 +305,21 @@ static grpc_error* init_frame_parser(grpc_chttp2_transport* t) { } } -static grpc_error* skip_parser(void* /*parser*/, grpc_chttp2_transport* /*t*/, - grpc_chttp2_stream* /*s*/, - const grpc_slice& /*slice*/, int /*is_last*/) { +static grpc_error_handle skip_parser(void* /*parser*/, + grpc_chttp2_transport* /*t*/, + grpc_chttp2_stream* /*s*/, + const grpc_slice& /*slice*/, + int /*is_last*/) { return GRPC_ERROR_NONE; } -static grpc_error* skip_header(void* /*tp*/, grpc_mdelem md) { +static grpc_error_handle skip_header(void* /*tp*/, grpc_mdelem md) { GRPC_MDELEM_UNREF(md); return GRPC_ERROR_NONE; } -static grpc_error* init_skip_frame_parser(grpc_chttp2_transport* t, - int is_header) { +static grpc_error_handle init_skip_frame_parser(grpc_chttp2_transport* t, + int is_header) { if (is_header) { uint8_t is_eoh = t->expect_continuation_stream_id != 0; t->parser = grpc_chttp2_header_parser_parse; @@ -334,7 +338,7 @@ void grpc_chttp2_parsing_become_skip_parser(grpc_chttp2_transport* t) { init_skip_frame_parser(t, t->parser == grpc_chttp2_header_parser_parse); } -static grpc_error* init_data_frame_parser(grpc_chttp2_transport* t) { +static grpc_error_handle init_data_frame_parser(grpc_chttp2_transport* t) { // Update BDP accounting since we have received a data frame. grpc_core::BdpEstimator* bdp_est = t->flow_control->bdp_estimator(); if (bdp_est) { @@ -347,7 +351,7 @@ static grpc_error* init_data_frame_parser(grpc_chttp2_transport* t) { } grpc_chttp2_stream* s = grpc_chttp2_parsing_lookup_stream(t, t->incoming_stream_id); - grpc_error* err = GRPC_ERROR_NONE; + grpc_error_handle err = GRPC_ERROR_NONE; grpc_core::chttp2::FlowControlAction action; if (s == nullptr) { err = t->flow_control->RecvData(t->incoming_frame_size); @@ -413,8 +417,8 @@ static void GPR_ATTRIBUTE_NOINLINE on_initial_header_log( gpr_free(value); } -static grpc_error* GPR_ATTRIBUTE_NOINLINE handle_timeout(grpc_chttp2_stream* s, - grpc_mdelem md) { +static grpc_error_handle GPR_ATTRIBUTE_NOINLINE +handle_timeout(grpc_chttp2_stream* s, grpc_mdelem md) { grpc_millis* cached_timeout = static_cast<grpc_millis*>(grpc_mdelem_get_user_data(md, free_timeout)); grpc_millis timeout; @@ -443,9 +447,11 @@ static grpc_error* GPR_ATTRIBUTE_NOINLINE handle_timeout(grpc_chttp2_stream* s, return GRPC_ERROR_NONE; } -static grpc_error* GPR_ATTRIBUTE_NOINLINE handle_metadata_size_limit_exceeded( - grpc_chttp2_transport* t, grpc_chttp2_stream* s, grpc_mdelem md, - size_t new_size, size_t metadata_size_limit) { +static grpc_error_handle GPR_ATTRIBUTE_NOINLINE +handle_metadata_size_limit_exceeded(grpc_chttp2_transport* t, + grpc_chttp2_stream* s, grpc_mdelem md, + size_t new_size, + size_t metadata_size_limit) { gpr_log(GPR_DEBUG, "received initial metadata size exceeds limit (%" PRIuPTR " vs. %" PRIuPTR @@ -463,9 +469,9 @@ static grpc_error* GPR_ATTRIBUTE_NOINLINE handle_metadata_size_limit_exceeded( return GRPC_ERROR_NONE; } -static grpc_error* GPR_ATTRIBUTE_NOINLINE +static grpc_error_handle GPR_ATTRIBUTE_NOINLINE handle_metadata_add_failure(grpc_chttp2_transport* t, grpc_chttp2_stream* s, - grpc_mdelem md, grpc_error* error) { + grpc_mdelem md, grpc_error_handle error) { grpc_chttp2_cancel_stream(t, s, error); grpc_chttp2_parsing_become_skip_parser(t); s->seen_error = true; @@ -473,7 +479,7 @@ handle_metadata_add_failure(grpc_chttp2_transport* t, grpc_chttp2_stream* s, return GRPC_ERROR_NONE; } -static grpc_error* on_initial_header(void* tp, grpc_mdelem md) { +static grpc_error_handle on_initial_header(void* tp, grpc_mdelem md) { GPR_TIMER_SCOPE("on_initial_header", 0); grpc_chttp2_transport* t = static_cast<grpc_chttp2_transport*>(tp); @@ -496,7 +502,7 @@ static grpc_error* on_initial_header(void* tp, grpc_mdelem md) { return handle_metadata_size_limit_exceeded(t, s, md, new_size, metadata_size_limit); } else { - grpc_error* error = + grpc_error_handle error = grpc_chttp2_incoming_metadata_buffer_add(&s->metadata_buffer[0], md); if (GPR_UNLIKELY(error != GRPC_ERROR_NONE)) { return handle_metadata_add_failure(t, s, md, error); @@ -506,7 +512,7 @@ static grpc_error* on_initial_header(void* tp, grpc_mdelem md) { return GRPC_ERROR_NONE; } -static grpc_error* on_trailing_header(void* tp, grpc_mdelem md) { +static grpc_error_handle on_trailing_header(void* tp, grpc_mdelem md) { GPR_TIMER_SCOPE("on_trailing_header", 0); grpc_chttp2_transport* t = static_cast<grpc_chttp2_transport*>(tp); @@ -545,7 +551,7 @@ static grpc_error* on_trailing_header(void* tp, grpc_mdelem md) { s->seen_error = true; GRPC_MDELEM_UNREF(md); } else { - grpc_error* error = + grpc_error_handle error = grpc_chttp2_incoming_metadata_buffer_add(&s->metadata_buffer[1], md); if (error != GRPC_ERROR_NONE) { grpc_chttp2_cancel_stream(t, s, error); @@ -557,8 +563,8 @@ static grpc_error* on_trailing_header(void* tp, grpc_mdelem md) { return GRPC_ERROR_NONE; } -static grpc_error* init_header_frame_parser(grpc_chttp2_transport* t, - int is_continuation) { +static grpc_error_handle init_header_frame_parser(grpc_chttp2_transport* t, + int is_continuation) { uint8_t is_eoh = (t->incoming_frame_flags & GRPC_CHTTP2_DATA_FLAG_END_HEADERS) != 0; grpc_chttp2_stream* s; @@ -595,7 +601,7 @@ static grpc_error* init_header_frame_parser(grpc_chttp2_transport* t, GRPC_CHTTP2_IF_TRACING(gpr_log( GPR_ERROR, "ignoring new grpc_chttp2_stream creation on client")); } - grpc_error* err = init_skip_frame_parser(t, 1); + grpc_error_handle err = init_skip_frame_parser(t, 1); if (t->incoming_frame_flags & GRPC_CHTTP2_FLAG_HAS_PRIORITY) { grpc_chttp2_hpack_parser_set_has_priority(&t->hpack_parser); } @@ -678,8 +684,9 @@ static grpc_error* init_header_frame_parser(grpc_chttp2_transport* t, return GRPC_ERROR_NONE; } -static grpc_error* init_window_update_frame_parser(grpc_chttp2_transport* t) { - grpc_error* err = grpc_chttp2_window_update_parser_begin_frame( +static grpc_error_handle init_window_update_frame_parser( + grpc_chttp2_transport* t) { + grpc_error_handle err = grpc_chttp2_window_update_parser_begin_frame( &t->simple.window_update, t->incoming_frame_size, t->incoming_frame_flags); if (err != GRPC_ERROR_NONE) return err; @@ -696,8 +703,8 @@ static grpc_error* init_window_update_frame_parser(grpc_chttp2_transport* t) { return GRPC_ERROR_NONE; } -static grpc_error* init_ping_parser(grpc_chttp2_transport* t) { - grpc_error* err = grpc_chttp2_ping_parser_begin_frame( +static grpc_error_handle init_ping_parser(grpc_chttp2_transport* t) { + grpc_error_handle err = grpc_chttp2_ping_parser_begin_frame( &t->simple.ping, t->incoming_frame_size, t->incoming_frame_flags); if (err != GRPC_ERROR_NONE) return err; t->parser = grpc_chttp2_ping_parser_parse; @@ -705,8 +712,8 @@ static grpc_error* init_ping_parser(grpc_chttp2_transport* t) { return GRPC_ERROR_NONE; } -static grpc_error* init_rst_stream_parser(grpc_chttp2_transport* t) { - grpc_error* err = grpc_chttp2_rst_stream_parser_begin_frame( +static grpc_error_handle init_rst_stream_parser(grpc_chttp2_transport* t) { + grpc_error_handle err = grpc_chttp2_rst_stream_parser_begin_frame( &t->simple.rst_stream, t->incoming_frame_size, t->incoming_frame_flags); if (err != GRPC_ERROR_NONE) return err; grpc_chttp2_stream* s = t->incoming_stream = @@ -720,8 +727,8 @@ static grpc_error* init_rst_stream_parser(grpc_chttp2_transport* t) { return GRPC_ERROR_NONE; } -static grpc_error* init_goaway_parser(grpc_chttp2_transport* t) { - grpc_error* err = grpc_chttp2_goaway_parser_begin_frame( +static grpc_error_handle init_goaway_parser(grpc_chttp2_transport* t) { + grpc_error_handle err = grpc_chttp2_goaway_parser_begin_frame( &t->goaway_parser, t->incoming_frame_size, t->incoming_frame_flags); if (err != GRPC_ERROR_NONE) return err; t->parser = grpc_chttp2_goaway_parser_parse; @@ -729,13 +736,13 @@ static grpc_error* init_goaway_parser(grpc_chttp2_transport* t) { return GRPC_ERROR_NONE; } -static grpc_error* init_settings_frame_parser(grpc_chttp2_transport* t) { +static grpc_error_handle init_settings_frame_parser(grpc_chttp2_transport* t) { if (t->incoming_stream_id != 0) { return GRPC_ERROR_CREATE_FROM_STATIC_STRING( "Settings frame received for grpc_chttp2_stream"); } - grpc_error* err = grpc_chttp2_settings_parser_begin_frame( + grpc_error_handle err = grpc_chttp2_settings_parser_begin_frame( &t->simple.settings, t->incoming_frame_size, t->incoming_frame_flags, t->settings[GRPC_PEER_SETTINGS]); if (err != GRPC_ERROR_NONE) { @@ -755,17 +762,17 @@ static grpc_error* init_settings_frame_parser(grpc_chttp2_transport* t) { return GRPC_ERROR_NONE; } -static grpc_error* parse_frame_slice(grpc_chttp2_transport* t, - const grpc_slice& slice, int is_last) { +static grpc_error_handle parse_frame_slice(grpc_chttp2_transport* t, + const grpc_slice& slice, + int is_last) { grpc_chttp2_stream* s = t->incoming_stream; - grpc_error* err = t->parser(t->parser_data, t, s, slice, is_last); + grpc_error_handle err = t->parser(t->parser_data, t, s, slice, is_last); intptr_t unused; if (GPR_LIKELY(err == GRPC_ERROR_NONE)) { return err; } else if (grpc_error_get_int(err, GRPC_ERROR_INT_STREAM_ID, &unused)) { if (GRPC_TRACE_FLAG_ENABLED(grpc_http_trace)) { - const char* msg = grpc_error_string(err); - gpr_log(GPR_ERROR, "%s", msg); + gpr_log(GPR_ERROR, "%s", grpc_error_std_string(err).c_str()); } grpc_chttp2_parsing_become_skip_parser(t); if (s) { diff --git a/grpc/src/core/ext/transport/chttp2/transport/writing.cc b/grpc/src/core/ext/transport/chttp2/transport/writing.cc index 317afcc5..e34856ca 100644 --- a/grpc/src/core/ext/transport/chttp2/transport/writing.cc +++ b/grpc/src/core/ext/transport/chttp2/transport/writing.cc @@ -39,7 +39,7 @@ static void add_to_write_list(grpc_chttp2_write_cb** list, } static void finish_write_cb(grpc_chttp2_transport* t, grpc_chttp2_stream* s, - grpc_chttp2_write_cb* cb, grpc_error* error) { + grpc_chttp2_write_cb* cb, grpc_error_handle error) { grpc_chttp2_complete_closure_step(t, s, &cb->closure, error, "finish_write_cb"); cb->next = t->write_cb_pool; @@ -75,6 +75,10 @@ static void maybe_initiate_ping(grpc_chttp2_transport* t) { } return; } + // InvalidateNow to avoid getting stuck re-initializing the ping timer + // in a loop while draining the currently-held combiner. Also see + // https://github.com/grpc/grpc/issues/26079. + grpc_core::ExecCtx::Get()->InvalidateNow(); grpc_millis now = grpc_core::ExecCtx::Get()->Now(); grpc_millis next_allowed_ping_interval = @@ -134,7 +138,7 @@ static void maybe_initiate_ping(grpc_chttp2_transport* t) { static bool update_list(grpc_chttp2_transport* t, grpc_chttp2_stream* s, int64_t send_bytes, grpc_chttp2_write_cb** list, - int64_t* ctr, grpc_error* error) { + int64_t* ctr, grpc_error_handle error) { bool sched_any = false; grpc_chttp2_write_cb* cb = *list; *list = nullptr; @@ -678,7 +682,7 @@ grpc_chttp2_begin_write_result grpc_chttp2_begin_write( return ctx.Result(); } -void grpc_chttp2_end_write(grpc_chttp2_transport* t, grpc_error* error) { +void grpc_chttp2_end_write(grpc_chttp2_transport* t, grpc_error_handle error) { GPR_TIMER_SCOPE("grpc_chttp2_end_write", 0); grpc_chttp2_stream* s; diff --git a/grpc/src/core/ext/transport/cronet/BUILD b/grpc/src/core/ext/transport/cronet/BUILD index 51865d3b..9c5848b2 100644 --- a/grpc/src/core/ext/transport/cronet/BUILD +++ b/grpc/src/core/ext/transport/cronet/BUILD @@ -33,7 +33,7 @@ grpc_cc_library( name = "grpc_transport_cronet_client_secure", srcs = [ "client/secure/cronet_channel_create.cc", - "transport/cronet_api_dummy.cc", + "transport/cronet_api_phony.cc", "transport/cronet_status.cc", "transport/cronet_status.h", "transport/cronet_transport.cc", diff --git a/grpc/src/core/ext/transport/cronet/transport/cronet_api_dummy.cc b/grpc/src/core/ext/transport/cronet/transport/cronet_api_phony.cc index 1a6bded6..3063d06f 100644 --- a/grpc/src/core/ext/transport/cronet/transport/cronet_api_dummy.cc +++ b/grpc/src/core/ext/transport/cronet/transport/cronet_api_phony.cc @@ -30,53 +30,57 @@ library, so we can build it in all environments */ #ifdef GRPC_COMPILE_WITH_CRONET /* link with the real CRONET library in the build system */ #else -/* Dummy implementation of cronet API just to test for build-ability */ +/* Phony implementation of cronet API just to test for build-ability */ bidirectional_stream* bidirectional_stream_create( - stream_engine* engine, void* annotation, - bidirectional_stream_callback* callback) { + stream_engine* /*engine*/, void* /*annotation*/, + bidirectional_stream_callback* /*callback*/) { GPR_ASSERT(0); return nullptr; } -int bidirectional_stream_destroy(bidirectional_stream* stream) { +int bidirectional_stream_destroy(bidirectional_stream* /*stream*/) { GPR_ASSERT(0); return 0; } -int bidirectional_stream_start(bidirectional_stream* stream, const char* url, - int priority, const char* method, - const bidirectional_stream_header_array* headers, - bool end_of_stream) { +int bidirectional_stream_start( + bidirectional_stream* /*stream*/, const char* /*url*/, int /*priority*/, + const char* /*method*/, + const bidirectional_stream_header_array* /*headers*/, + bool /*end_of_stream*/) { GPR_ASSERT(0); return 0; } -int bidirectional_stream_read(bidirectional_stream* stream, char* buffer, - int capacity) { +int bidirectional_stream_read(bidirectional_stream* /*stream*/, + char* /*buffer*/, int /*capacity*/) { GPR_ASSERT(0); return 0; } -int bidirectional_stream_write(bidirectional_stream* stream, const char* buffer, - int count, bool end_of_stream) { +int bidirectional_stream_write(bidirectional_stream* /*stream*/, + const char* /*buffer*/, int /*count*/, + bool /*end_of_stream*/) { GPR_ASSERT(0); return 0; } -void bidirectional_stream_cancel(bidirectional_stream* stream) { +void bidirectional_stream_cancel(bidirectional_stream* /*stream*/) { GPR_ASSERT(0); } -void bidirectional_stream_disable_auto_flush(bidirectional_stream* stream, - bool disable_auto_flush) { +void bidirectional_stream_disable_auto_flush(bidirectional_stream* /*stream*/, + bool /*disable_auto_flush*/) { GPR_ASSERT(0); } void bidirectional_stream_delay_request_headers_until_flush( - bidirectional_stream* stream, bool delay_headers_until_flush) { + bidirectional_stream* /*stream*/, bool /*delay_headers_until_flush*/) { GPR_ASSERT(0); } -void bidirectional_stream_flush(bidirectional_stream* stream) { GPR_ASSERT(0); } +void bidirectional_stream_flush(bidirectional_stream* /*stream*/) { + GPR_ASSERT(0); +} #endif /* GRPC_COMPILE_WITH_CRONET */ diff --git a/grpc/src/core/ext/transport/cronet/transport/cronet_status.cc b/grpc/src/core/ext/transport/cronet/transport/cronet_status.cc index f904aee2..9c047b3a 100644 --- a/grpc/src/core/ext/transport/cronet/transport/cronet_status.cc +++ b/grpc/src/core/ext/transport/cronet/transport/cronet_status.cc @@ -491,3 +491,37 @@ const char* cronet_net_error_as_string(cronet_net_error_code net_error) { } return "UNAVAILABLE."; } + +grpc_status_code cronet_net_error_to_grpc_error( + cronet_net_error_code net_error) { + switch (net_error) { + case OK: + return GRPC_STATUS_OK; + case CRONET_NET_ERROR_ABORTED: + return GRPC_STATUS_ABORTED; + case CRONET_NET_ERROR_ACCESS_DENIED: + case CRONET_NET_ERROR_NETWORK_ACCESS_DENIED: + return GRPC_STATUS_PERMISSION_DENIED; + case CRONET_NET_ERROR_SSL_CLIENT_AUTH_CERT_NEEDED: + case CRONET_NET_ERROR_PROXY_AUTH_UNSUPPORTED: + case CRONET_NET_ERROR_BAD_SSL_CLIENT_AUTH_CERT: + case CRONET_NET_ERROR_PROXY_AUTH_REQUESTED: + case CRONET_NET_ERROR_SSL_CLIENT_AUTH_PRIVATE_KEY_ACCESS_DENIED: + case CRONET_NET_ERROR_SSL_CLIENT_AUTH_CERT_NO_PRIVATE_KEY: + case CRONET_NET_ERROR_SSL_CLIENT_AUTH_SIGNATURE_FAILED: + case CRONET_NET_ERROR_CLIENT_AUTH_CERT_TYPE_UNSUPPORTED: + case CRONET_NET_ERROR_SSL_CLIENT_AUTH_CERT_BAD_FORMAT: + case CRONET_NET_ERROR_SSL_CLIENT_AUTH_NO_COMMON_ALGORITHMS: + case CRONET_NET_ERROR_CERT_AUTHORITY_INVALID: + case CRONET_NET_ERROR_UNEXPECTED_PROXY_AUTH: + case CRONET_NET_ERROR_MALFORMED_IDENTITY: + case CRONET_NET_ERROR_INVALID_AUTH_CREDENTIALS: + case CRONET_NET_ERROR_UNSUPPORTED_AUTH_SCHEME: + case CRONET_NET_ERROR_MISSING_AUTH_CREDENTIALS: + return GRPC_STATUS_UNAUTHENTICATED; + default: + return GRPC_STATUS_UNAVAILABLE; + } + + return GRPC_STATUS_UNAVAILABLE; +} diff --git a/grpc/src/core/ext/transport/cronet/transport/cronet_status.h b/grpc/src/core/ext/transport/cronet/transport/cronet_status.h index d6d1ed8f..ee1262a0 100644 --- a/grpc/src/core/ext/transport/cronet/transport/cronet_status.h +++ b/grpc/src/core/ext/transport/cronet/transport/cronet_status.h @@ -21,6 +21,8 @@ #include <grpc/impl/codegen/port_platform.h> +#include <grpc/status.h> + enum cronet_net_error_code { // // Ranges: @@ -1037,5 +1039,7 @@ enum cronet_net_error_code { }; const char* cronet_net_error_as_string(cronet_net_error_code net_error); +grpc_status_code cronet_net_error_to_grpc_error( + cronet_net_error_code net_error); #endif /* GRPC_CORE_EXT_TRANSPORT_CRONET_TRANSPORT_CRONET_STATUS_H */ diff --git a/grpc/src/core/ext/transport/cronet/transport/cronet_transport.cc b/grpc/src/core/ext/transport/cronet/transport/cronet_transport.cc index b98b6a17..061b2e09 100644 --- a/grpc/src/core/ext/transport/cronet/transport/cronet_transport.cc +++ b/grpc/src/core/ext/transport/cronet/transport/cronet_transport.cc @@ -165,7 +165,7 @@ struct op_state { /* User requested RECV_TRAILING_METADATA */ bool pending_recv_trailing_metadata = false; cronet_net_error_code net_error = OK; - grpc_error* cancel_error = GRPC_ERROR_NONE; + grpc_error_handle cancel_error = GRPC_ERROR_NONE; /* data structure for storing data coming from server */ struct read_state rs; /* data structure for storing data going to the server */ @@ -306,13 +306,13 @@ static void read_grpc_header(stream_obj* s) { s->state.rs.remaining_bytes); } -static grpc_error* make_error_with_desc(int error_code, - int cronet_internal_error_code, - const char* desc) { +static grpc_error_handle make_error_with_desc(int error_code, + int cronet_internal_error_code, + const char* desc) { std::string error_message = absl::StrFormat("Cronet error code:%d, Cronet error detail:%s", cronet_internal_error_code, desc); - grpc_error* error = + grpc_error_handle error = GRPC_ERROR_CREATE_FROM_COPIED_STRING(error_message.c_str()); error = grpc_error_set_int(error, GRPC_ERROR_INT_GRPC_STATUS, error_code); return error; @@ -1200,7 +1200,7 @@ static enum e_op_result execute_stream_op(struct op_and_state* oas) { stream_state->state_op_done[OP_RECV_MESSAGE] = true; oas->state.state_op_done[OP_RECV_MESSAGE] = true; result = ACTION_TAKEN_NO_CALLBACK; - } else if (stream_state->rs.read_stream_closed == true) { + } else if (stream_state->rs.read_stream_closed) { /* No more data will be received */ CRONET_LOG(GPR_DEBUG, "read stream closed"); grpc_core::ExecCtx::Run( @@ -1217,7 +1217,7 @@ static enum e_op_result execute_stream_op(struct op_and_state* oas) { stream_state->state_op_done[OP_RECV_MESSAGE] = true; oas->state.state_op_done[OP_RECV_MESSAGE] = true; result = ACTION_TAKEN_NO_CALLBACK; - } else if (stream_state->rs.length_field_received == false) { + } else if (!stream_state->rs.length_field_received) { if (stream_state->rs.received_bytes == GRPC_HEADER_SIZE_IN_BYTES && stream_state->rs.remaining_bytes == 0) { /* Start a read operation for data */ @@ -1317,13 +1317,15 @@ static enum e_op_result execute_stream_op(struct op_and_state* oas) { op_can_be_run(stream_op, s, &oas->state, OP_RECV_TRAILING_METADATA)) { CRONET_LOG(GPR_DEBUG, "running: %p OP_RECV_TRAILING_METADATA", oas); - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; if (stream_state->state_op_done[OP_CANCEL_ERROR]) { error = GRPC_ERROR_REF(stream_state->cancel_error); } else if (stream_state->state_callback_received[OP_FAILED]) { + grpc_status_code grpc_error_code = + cronet_net_error_to_grpc_error(stream_state->net_error); const char* desc = cronet_net_error_as_string(stream_state->net_error); - error = make_error_with_desc(GRPC_STATUS_UNAVAILABLE, - stream_state->net_error, desc); + error = + make_error_with_desc(grpc_error_code, stream_state->net_error, desc); } else if (oas->s->state.rs.trailing_metadata_valid) { grpc_chttp2_incoming_metadata_buffer_publish( &oas->s->state.rs.trailing_metadata, @@ -1362,10 +1364,12 @@ static enum e_op_result execute_stream_op(struct op_and_state* oas) { if (stream_op->on_complete) { const char* error_message = cronet_net_error_as_string(stream_state->net_error); + grpc_status_code grpc_error_code = + cronet_net_error_to_grpc_error(stream_state->net_error); grpc_core::ExecCtx::Run( DEBUG_LOCATION, stream_op->on_complete, - make_error_with_desc(GRPC_STATUS_UNAVAILABLE, - stream_state->net_error, error_message)); + make_error_with_desc(grpc_error_code, stream_state->net_error, + error_message)); } } else { /* All actions in this stream_op are complete. Call the on_complete @@ -1420,19 +1424,20 @@ inline stream_obj::~stream_obj() { } static int init_stream(grpc_transport* gt, grpc_stream* gs, - grpc_stream_refcount* refcount, const void* server_data, - grpc_core::Arena* arena) { + grpc_stream_refcount* refcount, + const void* /*server_data*/, grpc_core::Arena* arena) { new (gs) stream_obj(gt, gs, refcount, arena); return 0; } -static void set_pollset_do_nothing(grpc_transport* gt, grpc_stream* gs, - grpc_pollset* pollset) {} +static void set_pollset_do_nothing(grpc_transport* /*gt*/, grpc_stream* /*gs*/, + grpc_pollset* /*pollset*/) {} -static void set_pollset_set_do_nothing(grpc_transport* gt, grpc_stream* gs, - grpc_pollset_set* pollset_set) {} +static void set_pollset_set_do_nothing(grpc_transport* /*gt*/, + grpc_stream* /*gs*/, + grpc_pollset_set* /*pollset_set*/) {} -static void perform_stream_op(grpc_transport* gt, grpc_stream* gs, +static void perform_stream_op(grpc_transport* /*gt*/, grpc_stream* gs, grpc_transport_stream_op_batch* op) { CRONET_LOG(GPR_DEBUG, "perform_stream_op"); if (op->send_initial_metadata && @@ -1466,7 +1471,7 @@ static void perform_stream_op(grpc_transport* gt, grpc_stream* gs, execute_from_storage(s); } -static void destroy_stream(grpc_transport* gt, grpc_stream* gs, +static void destroy_stream(grpc_transport* /*gt*/, grpc_stream* gs, grpc_closure* then_schedule_closure) { stream_obj* s = reinterpret_cast<stream_obj*>(gs); s->~stream_obj(); @@ -1474,11 +1479,11 @@ static void destroy_stream(grpc_transport* gt, grpc_stream* gs, GRPC_ERROR_NONE); } -static void destroy_transport(grpc_transport* gt) {} +static void destroy_transport(grpc_transport* /*gt*/) {} -static grpc_endpoint* get_endpoint(grpc_transport* gt) { return nullptr; } +static grpc_endpoint* get_endpoint(grpc_transport* /*gt*/) { return nullptr; } -static void perform_op(grpc_transport* gt, grpc_transport_op* op) {} +static void perform_op(grpc_transport* /*gt*/, grpc_transport_op* /*op*/) {} static const grpc_transport_vtable grpc_cronet_vtable = { sizeof(stream_obj), @@ -1494,7 +1499,7 @@ static const grpc_transport_vtable grpc_cronet_vtable = { grpc_transport* grpc_create_cronet_transport(void* engine, const char* target, const grpc_channel_args* args, - void* reserved) { + void* /*reserved*/) { grpc_cronet_transport* ct = static_cast<grpc_cronet_transport*>( gpr_malloc(sizeof(grpc_cronet_transport))); if (!ct) { diff --git a/grpc/src/core/ext/transport/inproc/inproc_transport.cc b/grpc/src/core/ext/transport/inproc/inproc_transport.cc index 213c142b..0c21db7f 100644 --- a/grpc/src/core/ext/transport/inproc/inproc_transport.cc +++ b/grpc/src/core/ext/transport/inproc/inproc_transport.cc @@ -50,15 +50,15 @@ grpc_slice g_fake_auth_key; grpc_slice g_fake_auth_value; struct inproc_stream; -bool cancel_stream_locked(inproc_stream* s, grpc_error* error); -void maybe_process_ops_locked(inproc_stream* s, grpc_error* error); -void op_state_machine_locked(inproc_stream* s, grpc_error* error); +bool cancel_stream_locked(inproc_stream* s, grpc_error_handle error); +void maybe_process_ops_locked(inproc_stream* s, grpc_error_handle error); +void op_state_machine_locked(inproc_stream* s, grpc_error_handle error); void log_metadata(const grpc_metadata_batch* md_batch, bool is_client, bool is_initial); -grpc_error* fill_in_metadata(inproc_stream* s, - const grpc_metadata_batch* metadata, - uint32_t flags, grpc_metadata_batch* out_md, - uint32_t* outflags, bool* markfilled); +grpc_error_handle fill_in_metadata(inproc_stream* s, + const grpc_metadata_batch* metadata, + uint32_t flags, grpc_metadata_batch* out_md, + uint32_t* outflags, bool* markfilled); struct shared_mu { shared_mu() { @@ -239,7 +239,7 @@ struct inproc_stream { grpc_millis write_buffer_deadline = GRPC_MILLIS_INF_FUTURE; grpc_metadata_batch write_buffer_trailing_md; bool write_buffer_trailing_md_filled = false; - grpc_error* write_buffer_cancel_error = GRPC_ERROR_NONE; + grpc_error_handle write_buffer_cancel_error = GRPC_ERROR_NONE; struct inproc_stream* other_side; bool other_side_closed = false; // won't talk anymore @@ -270,8 +270,8 @@ struct inproc_stream { bool closed = false; - grpc_error* cancel_self_error = GRPC_ERROR_NONE; - grpc_error* cancel_other_error = GRPC_ERROR_NONE; + grpc_error_handle cancel_self_error = GRPC_ERROR_NONE; + grpc_error_handle cancel_other_error = GRPC_ERROR_NONE; grpc_millis deadline = GRPC_MILLIS_INF_FUTURE; @@ -293,10 +293,10 @@ void log_metadata(const grpc_metadata_batch* md_batch, bool is_client, } } -grpc_error* fill_in_metadata(inproc_stream* s, - const grpc_metadata_batch* metadata, - uint32_t flags, grpc_metadata_batch* out_md, - uint32_t* outflags, bool* markfilled) { +grpc_error_handle fill_in_metadata(inproc_stream* s, + const grpc_metadata_batch* metadata, + uint32_t flags, grpc_metadata_batch* out_md, + uint32_t* outflags, bool* markfilled) { if (GRPC_TRACE_FLAG_ENABLED(grpc_inproc_trace)) { log_metadata(metadata, s->t->is_client, outflags != nullptr); } @@ -307,7 +307,7 @@ grpc_error* fill_in_metadata(inproc_stream* s, if (markfilled != nullptr) { *markfilled = true; } - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; for (grpc_linked_mdelem* elem = metadata->list.head; (elem != nullptr) && (error == GRPC_ERROR_NONE); elem = elem->next) { grpc_linked_mdelem* nelem = @@ -374,7 +374,7 @@ void close_other_side_locked(inproc_stream* s, const char* reason) { // this stream_op_batch is only one of the pending operations for this // stream. This is called when one of the pending operations for the stream // is done and about to be NULLed out -void complete_if_batch_end_locked(inproc_stream* s, grpc_error* error, +void complete_if_batch_end_locked(inproc_stream* s, grpc_error_handle error, grpc_transport_stream_op_batch* op, const char* msg) { int is_sm = static_cast<int>(op == s->send_message_op); @@ -394,14 +394,14 @@ void complete_if_batch_end_locked(inproc_stream* s, grpc_error* error, } } -void maybe_process_ops_locked(inproc_stream* s, grpc_error* error) { +void maybe_process_ops_locked(inproc_stream* s, grpc_error_handle error) { if (s && (error != GRPC_ERROR_NONE || s->ops_needed)) { s->ops_needed = false; op_state_machine_locked(s, error); } } -void fail_helper_locked(inproc_stream* s, grpc_error* error) { +void fail_helper_locked(inproc_stream* s, grpc_error_handle error) { INPROC_LOG(GPR_INFO, "op_state_machine %p fail_helper", s); // If we're failing this side, we need to make sure that // we also send or have already sent trailing metadata @@ -431,7 +431,7 @@ void fail_helper_locked(inproc_stream* s, grpc_error* error) { } } if (s->recv_initial_md_op) { - grpc_error* err; + grpc_error_handle err; if (!s->t->is_client) { // If this is a server, provide initial metadata with a path and authority // since it expects that as well as no error yet @@ -550,7 +550,7 @@ void message_transfer_locked(inproc_stream* sender, inproc_stream* receiver) { GPR_ASSERT( sender->send_message_op->payload->send_message.send_message->Next( SIZE_MAX, &unused)); - grpc_error* error = + grpc_error_handle error = sender->send_message_op->payload->send_message.send_message->Pull( &message_slice); if (error != GRPC_ERROR_NONE) { @@ -583,13 +583,13 @@ void message_transfer_locked(inproc_stream* sender, inproc_stream* receiver) { sender->send_message_op = nullptr; } -void op_state_machine_locked(inproc_stream* s, grpc_error* error) { +void op_state_machine_locked(inproc_stream* s, grpc_error_handle error) { // This function gets called when we have contents in the unprocessed reads // Get what we want based on our ops wanted // Schedule our appropriate closures // and then return to ops_needed state if still needed - grpc_error* new_err = GRPC_ERROR_NONE; + grpc_error_handle new_err = GRPC_ERROR_NONE; bool needs_close = false; @@ -887,9 +887,10 @@ done: GRPC_ERROR_UNREF(new_err); } -bool cancel_stream_locked(inproc_stream* s, grpc_error* error) { +bool cancel_stream_locked(inproc_stream* s, grpc_error_handle error) { bool ret = false; // was the cancel accepted - INPROC_LOG(GPR_INFO, "cancel_stream %p with %s", s, grpc_error_string(error)); + INPROC_LOG(GPR_INFO, "cancel_stream %p with %s", s, + grpc_error_std_string(error).c_str()); if (s->cancel_self_error == GRPC_ERROR_NONE) { ret = true; s->cancel_self_error = GRPC_ERROR_REF(error); @@ -943,7 +944,7 @@ bool cancel_stream_locked(inproc_stream* s, grpc_error* error) { return ret; } -void do_nothing(void* /*arg*/, grpc_error* /*error*/) {} +void do_nothing(void* /*arg*/, grpc_error_handle /*error*/) {} void perform_stream_op(grpc_transport* gt, grpc_stream* gs, grpc_transport_stream_op_batch* op) { @@ -962,7 +963,7 @@ void perform_stream_op(grpc_transport* gt, grpc_stream* gs, s->t->is_client, false); } } - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; grpc_closure* on_complete = op->on_complete; // TODO(roth): This is a hack needed because we use data inside of the // closure itself to do the barrier calculation (i.e., to ensure that @@ -1293,7 +1294,7 @@ grpc_channel* grpc_inproc_channel_create(grpc_server* server, client_args); // TODO(ncteisen): design and support channelz GetSocket for inproc. - grpc_error* error = server->core_server->SetupTransport( + grpc_error_handle error = server->core_server->SetupTransport( server_transport, nullptr, server_args, nullptr); grpc_channel* channel = nullptr; if (error == GRPC_ERROR_NONE) { @@ -1303,7 +1304,7 @@ grpc_channel* grpc_inproc_channel_create(grpc_server* server, if (error != GRPC_ERROR_NONE) { GPR_ASSERT(!channel); gpr_log(GPR_ERROR, "Failed to create client channel: %s", - grpc_error_string(error)); + grpc_error_std_string(error).c_str()); intptr_t integer; grpc_status_code status = GRPC_STATUS_INTERNAL; if (grpc_error_get_int(error, GRPC_ERROR_INT_GRPC_STATUS, &integer)) { @@ -1318,7 +1319,7 @@ grpc_channel* grpc_inproc_channel_create(grpc_server* server, } else { GPR_ASSERT(!channel); gpr_log(GPR_ERROR, "Failed to create server channel: %s", - grpc_error_string(error)); + grpc_error_std_string(error).c_str()); intptr_t integer; grpc_status_code status = GRPC_STATUS_INTERNAL; if (grpc_error_get_int(error, GRPC_ERROR_INT_GRPC_STATUS, &integer)) { diff --git a/grpc/src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.c b/grpc/src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.c new file mode 100644 index 00000000..d230ccb2 --- /dev/null +++ b/grpc/src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.c @@ -0,0 +1,406 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * envoy/admin/v3/config_dump.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#include <stddef.h> +#include "upb/msg.h" +#include "envoy/admin/v3/config_dump.upb.h" +#include "envoy/config/bootstrap/v3/bootstrap.upb.h" +#include "google/protobuf/any.upb.h" +#include "google/protobuf/timestamp.upb.h" +#include "udpa/annotations/status.upb.h" +#include "udpa/annotations/versioning.upb.h" + +#include "upb/port_def.inc" + +static const upb_msglayout *const envoy_admin_v3_ConfigDump_submsgs[1] = { + &google_protobuf_Any_msginit, +}; + +static const upb_msglayout_field envoy_admin_v3_ConfigDump__fields[1] = { + {1, UPB_SIZE(0, 0), 0, 0, 11, 3}, +}; + +const upb_msglayout envoy_admin_v3_ConfigDump_msginit = { + &envoy_admin_v3_ConfigDump_submsgs[0], + &envoy_admin_v3_ConfigDump__fields[0], + UPB_SIZE(8, 8), 1, false, 255, +}; + +static const upb_msglayout *const envoy_admin_v3_UpdateFailureState_submsgs[2] = { + &google_protobuf_Any_msginit, + &google_protobuf_Timestamp_msginit, +}; + +static const upb_msglayout_field envoy_admin_v3_UpdateFailureState__fields[4] = { + {1, UPB_SIZE(20, 40), 1, 0, 11, 1}, + {2, UPB_SIZE(24, 48), 2, 1, 11, 1}, + {3, UPB_SIZE(4, 8), 0, 0, 9, 1}, + {4, UPB_SIZE(12, 24), 0, 0, 9, 1}, +}; + +const upb_msglayout envoy_admin_v3_UpdateFailureState_msginit = { + &envoy_admin_v3_UpdateFailureState_submsgs[0], + &envoy_admin_v3_UpdateFailureState__fields[0], + UPB_SIZE(32, 64), 4, false, 255, +}; + +static const upb_msglayout *const envoy_admin_v3_BootstrapConfigDump_submsgs[2] = { + &envoy_config_bootstrap_v3_Bootstrap_msginit, + &google_protobuf_Timestamp_msginit, +}; + +static const upb_msglayout_field envoy_admin_v3_BootstrapConfigDump__fields[2] = { + {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, + {2, UPB_SIZE(8, 16), 2, 1, 11, 1}, +}; + +const upb_msglayout envoy_admin_v3_BootstrapConfigDump_msginit = { + &envoy_admin_v3_BootstrapConfigDump_submsgs[0], + &envoy_admin_v3_BootstrapConfigDump__fields[0], + UPB_SIZE(16, 24), 2, false, 255, +}; + +static const upb_msglayout *const envoy_admin_v3_ListenersConfigDump_submsgs[2] = { + &envoy_admin_v3_ListenersConfigDump_DynamicListener_msginit, + &envoy_admin_v3_ListenersConfigDump_StaticListener_msginit, +}; + +static const upb_msglayout_field envoy_admin_v3_ListenersConfigDump__fields[3] = { + {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, + {2, UPB_SIZE(8, 16), 0, 1, 11, 3}, + {3, UPB_SIZE(12, 24), 0, 0, 11, 3}, +}; + +const upb_msglayout envoy_admin_v3_ListenersConfigDump_msginit = { + &envoy_admin_v3_ListenersConfigDump_submsgs[0], + &envoy_admin_v3_ListenersConfigDump__fields[0], + UPB_SIZE(16, 32), 3, false, 255, +}; + +static const upb_msglayout *const envoy_admin_v3_ListenersConfigDump_StaticListener_submsgs[2] = { + &google_protobuf_Any_msginit, + &google_protobuf_Timestamp_msginit, +}; + +static const upb_msglayout_field envoy_admin_v3_ListenersConfigDump_StaticListener__fields[2] = { + {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, + {2, UPB_SIZE(8, 16), 2, 1, 11, 1}, +}; + +const upb_msglayout envoy_admin_v3_ListenersConfigDump_StaticListener_msginit = { + &envoy_admin_v3_ListenersConfigDump_StaticListener_submsgs[0], + &envoy_admin_v3_ListenersConfigDump_StaticListener__fields[0], + UPB_SIZE(16, 24), 2, false, 255, +}; + +static const upb_msglayout *const envoy_admin_v3_ListenersConfigDump_DynamicListenerState_submsgs[2] = { + &google_protobuf_Any_msginit, + &google_protobuf_Timestamp_msginit, +}; + +static const upb_msglayout_field envoy_admin_v3_ListenersConfigDump_DynamicListenerState__fields[3] = { + {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, + {2, UPB_SIZE(12, 24), 1, 0, 11, 1}, + {3, UPB_SIZE(16, 32), 2, 1, 11, 1}, +}; + +const upb_msglayout envoy_admin_v3_ListenersConfigDump_DynamicListenerState_msginit = { + &envoy_admin_v3_ListenersConfigDump_DynamicListenerState_submsgs[0], + &envoy_admin_v3_ListenersConfigDump_DynamicListenerState__fields[0], + UPB_SIZE(24, 48), 3, false, 255, +}; + +static const upb_msglayout *const envoy_admin_v3_ListenersConfigDump_DynamicListener_submsgs[2] = { + &envoy_admin_v3_ListenersConfigDump_DynamicListenerState_msginit, + &envoy_admin_v3_UpdateFailureState_msginit, +}; + +static const upb_msglayout_field envoy_admin_v3_ListenersConfigDump_DynamicListener__fields[6] = { + {1, UPB_SIZE(8, 8), 0, 0, 9, 1}, + {2, UPB_SIZE(16, 24), 1, 0, 11, 1}, + {3, UPB_SIZE(20, 32), 2, 0, 11, 1}, + {4, UPB_SIZE(24, 40), 3, 0, 11, 1}, + {5, UPB_SIZE(28, 48), 4, 1, 11, 1}, + {6, UPB_SIZE(4, 4), 0, 0, 14, 1}, +}; + +const upb_msglayout envoy_admin_v3_ListenersConfigDump_DynamicListener_msginit = { + &envoy_admin_v3_ListenersConfigDump_DynamicListener_submsgs[0], + &envoy_admin_v3_ListenersConfigDump_DynamicListener__fields[0], + UPB_SIZE(32, 64), 6, false, 255, +}; + +static const upb_msglayout *const envoy_admin_v3_ClustersConfigDump_submsgs[2] = { + &envoy_admin_v3_ClustersConfigDump_DynamicCluster_msginit, + &envoy_admin_v3_ClustersConfigDump_StaticCluster_msginit, +}; + +static const upb_msglayout_field envoy_admin_v3_ClustersConfigDump__fields[4] = { + {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, + {2, UPB_SIZE(8, 16), 0, 1, 11, 3}, + {3, UPB_SIZE(12, 24), 0, 0, 11, 3}, + {4, UPB_SIZE(16, 32), 0, 0, 11, 3}, +}; + +const upb_msglayout envoy_admin_v3_ClustersConfigDump_msginit = { + &envoy_admin_v3_ClustersConfigDump_submsgs[0], + &envoy_admin_v3_ClustersConfigDump__fields[0], + UPB_SIZE(24, 48), 4, false, 255, +}; + +static const upb_msglayout *const envoy_admin_v3_ClustersConfigDump_StaticCluster_submsgs[2] = { + &google_protobuf_Any_msginit, + &google_protobuf_Timestamp_msginit, +}; + +static const upb_msglayout_field envoy_admin_v3_ClustersConfigDump_StaticCluster__fields[2] = { + {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, + {2, UPB_SIZE(8, 16), 2, 1, 11, 1}, +}; + +const upb_msglayout envoy_admin_v3_ClustersConfigDump_StaticCluster_msginit = { + &envoy_admin_v3_ClustersConfigDump_StaticCluster_submsgs[0], + &envoy_admin_v3_ClustersConfigDump_StaticCluster__fields[0], + UPB_SIZE(16, 24), 2, false, 255, +}; + +static const upb_msglayout *const envoy_admin_v3_ClustersConfigDump_DynamicCluster_submsgs[3] = { + &envoy_admin_v3_UpdateFailureState_msginit, + &google_protobuf_Any_msginit, + &google_protobuf_Timestamp_msginit, +}; + +static const upb_msglayout_field envoy_admin_v3_ClustersConfigDump_DynamicCluster__fields[5] = { + {1, UPB_SIZE(8, 8), 0, 0, 9, 1}, + {2, UPB_SIZE(16, 24), 1, 1, 11, 1}, + {3, UPB_SIZE(20, 32), 2, 2, 11, 1}, + {4, UPB_SIZE(24, 40), 3, 0, 11, 1}, + {5, UPB_SIZE(4, 4), 0, 0, 14, 1}, +}; + +const upb_msglayout envoy_admin_v3_ClustersConfigDump_DynamicCluster_msginit = { + &envoy_admin_v3_ClustersConfigDump_DynamicCluster_submsgs[0], + &envoy_admin_v3_ClustersConfigDump_DynamicCluster__fields[0], + UPB_SIZE(32, 48), 5, false, 255, +}; + +static const upb_msglayout *const envoy_admin_v3_RoutesConfigDump_submsgs[2] = { + &envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_msginit, + &envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_msginit, +}; + +static const upb_msglayout_field envoy_admin_v3_RoutesConfigDump__fields[2] = { + {2, UPB_SIZE(0, 0), 0, 1, 11, 3}, + {3, UPB_SIZE(4, 8), 0, 0, 11, 3}, +}; + +const upb_msglayout envoy_admin_v3_RoutesConfigDump_msginit = { + &envoy_admin_v3_RoutesConfigDump_submsgs[0], + &envoy_admin_v3_RoutesConfigDump__fields[0], + UPB_SIZE(8, 16), 2, false, 255, +}; + +static const upb_msglayout *const envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_submsgs[2] = { + &google_protobuf_Any_msginit, + &google_protobuf_Timestamp_msginit, +}; + +static const upb_msglayout_field envoy_admin_v3_RoutesConfigDump_StaticRouteConfig__fields[2] = { + {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, + {2, UPB_SIZE(8, 16), 2, 1, 11, 1}, +}; + +const upb_msglayout envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_msginit = { + &envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_submsgs[0], + &envoy_admin_v3_RoutesConfigDump_StaticRouteConfig__fields[0], + UPB_SIZE(16, 24), 2, false, 255, +}; + +static const upb_msglayout *const envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_submsgs[3] = { + &envoy_admin_v3_UpdateFailureState_msginit, + &google_protobuf_Any_msginit, + &google_protobuf_Timestamp_msginit, +}; + +static const upb_msglayout_field envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig__fields[5] = { + {1, UPB_SIZE(8, 8), 0, 0, 9, 1}, + {2, UPB_SIZE(16, 24), 1, 1, 11, 1}, + {3, UPB_SIZE(20, 32), 2, 2, 11, 1}, + {4, UPB_SIZE(24, 40), 3, 0, 11, 1}, + {5, UPB_SIZE(4, 4), 0, 0, 14, 1}, +}; + +const upb_msglayout envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_msginit = { + &envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_submsgs[0], + &envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig__fields[0], + UPB_SIZE(32, 48), 5, false, 255, +}; + +static const upb_msglayout *const envoy_admin_v3_ScopedRoutesConfigDump_submsgs[2] = { + &envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_msginit, + &envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_msginit, +}; + +static const upb_msglayout_field envoy_admin_v3_ScopedRoutesConfigDump__fields[2] = { + {1, UPB_SIZE(0, 0), 0, 1, 11, 3}, + {2, UPB_SIZE(4, 8), 0, 0, 11, 3}, +}; + +const upb_msglayout envoy_admin_v3_ScopedRoutesConfigDump_msginit = { + &envoy_admin_v3_ScopedRoutesConfigDump_submsgs[0], + &envoy_admin_v3_ScopedRoutesConfigDump__fields[0], + UPB_SIZE(8, 16), 2, false, 255, +}; + +static const upb_msglayout *const envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_submsgs[2] = { + &google_protobuf_Any_msginit, + &google_protobuf_Timestamp_msginit, +}; + +static const upb_msglayout_field envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs__fields[3] = { + {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, + {2, UPB_SIZE(16, 32), 0, 0, 11, 3}, + {3, UPB_SIZE(12, 24), 1, 1, 11, 1}, +}; + +const upb_msglayout envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_msginit = { + &envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_submsgs[0], + &envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs__fields[0], + UPB_SIZE(24, 48), 3, false, 255, +}; + +static const upb_msglayout *const envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_submsgs[3] = { + &envoy_admin_v3_UpdateFailureState_msginit, + &google_protobuf_Any_msginit, + &google_protobuf_Timestamp_msginit, +}; + +static const upb_msglayout_field envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs__fields[6] = { + {1, UPB_SIZE(8, 8), 0, 0, 9, 1}, + {2, UPB_SIZE(16, 24), 0, 0, 9, 1}, + {3, UPB_SIZE(32, 56), 0, 1, 11, 3}, + {4, UPB_SIZE(24, 40), 1, 2, 11, 1}, + {5, UPB_SIZE(28, 48), 2, 0, 11, 1}, + {6, UPB_SIZE(4, 4), 0, 0, 14, 1}, +}; + +const upb_msglayout envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_msginit = { + &envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_submsgs[0], + &envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs__fields[0], + UPB_SIZE(40, 64), 6, false, 255, +}; + +static const upb_msglayout *const envoy_admin_v3_SecretsConfigDump_submsgs[2] = { + &envoy_admin_v3_SecretsConfigDump_DynamicSecret_msginit, + &envoy_admin_v3_SecretsConfigDump_StaticSecret_msginit, +}; + +static const upb_msglayout_field envoy_admin_v3_SecretsConfigDump__fields[3] = { + {1, UPB_SIZE(0, 0), 0, 1, 11, 3}, + {2, UPB_SIZE(4, 8), 0, 0, 11, 3}, + {3, UPB_SIZE(8, 16), 0, 0, 11, 3}, +}; + +const upb_msglayout envoy_admin_v3_SecretsConfigDump_msginit = { + &envoy_admin_v3_SecretsConfigDump_submsgs[0], + &envoy_admin_v3_SecretsConfigDump__fields[0], + UPB_SIZE(16, 24), 3, false, 255, +}; + +static const upb_msglayout *const envoy_admin_v3_SecretsConfigDump_DynamicSecret_submsgs[3] = { + &envoy_admin_v3_UpdateFailureState_msginit, + &google_protobuf_Any_msginit, + &google_protobuf_Timestamp_msginit, +}; + +static const upb_msglayout_field envoy_admin_v3_SecretsConfigDump_DynamicSecret__fields[6] = { + {1, UPB_SIZE(8, 8), 0, 0, 9, 1}, + {2, UPB_SIZE(16, 24), 0, 0, 9, 1}, + {3, UPB_SIZE(24, 40), 1, 2, 11, 1}, + {4, UPB_SIZE(28, 48), 2, 1, 11, 1}, + {5, UPB_SIZE(32, 56), 3, 0, 11, 1}, + {6, UPB_SIZE(4, 4), 0, 0, 14, 1}, +}; + +const upb_msglayout envoy_admin_v3_SecretsConfigDump_DynamicSecret_msginit = { + &envoy_admin_v3_SecretsConfigDump_DynamicSecret_submsgs[0], + &envoy_admin_v3_SecretsConfigDump_DynamicSecret__fields[0], + UPB_SIZE(40, 64), 6, false, 255, +}; + +static const upb_msglayout *const envoy_admin_v3_SecretsConfigDump_StaticSecret_submsgs[2] = { + &google_protobuf_Any_msginit, + &google_protobuf_Timestamp_msginit, +}; + +static const upb_msglayout_field envoy_admin_v3_SecretsConfigDump_StaticSecret__fields[3] = { + {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, + {2, UPB_SIZE(12, 24), 1, 1, 11, 1}, + {3, UPB_SIZE(16, 32), 2, 0, 11, 1}, +}; + +const upb_msglayout envoy_admin_v3_SecretsConfigDump_StaticSecret_msginit = { + &envoy_admin_v3_SecretsConfigDump_StaticSecret_submsgs[0], + &envoy_admin_v3_SecretsConfigDump_StaticSecret__fields[0], + UPB_SIZE(24, 48), 3, false, 255, +}; + +static const upb_msglayout *const envoy_admin_v3_EndpointsConfigDump_submsgs[2] = { + &envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_msginit, + &envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_msginit, +}; + +static const upb_msglayout_field envoy_admin_v3_EndpointsConfigDump__fields[2] = { + {2, UPB_SIZE(0, 0), 0, 1, 11, 3}, + {3, UPB_SIZE(4, 8), 0, 0, 11, 3}, +}; + +const upb_msglayout envoy_admin_v3_EndpointsConfigDump_msginit = { + &envoy_admin_v3_EndpointsConfigDump_submsgs[0], + &envoy_admin_v3_EndpointsConfigDump__fields[0], + UPB_SIZE(8, 16), 2, false, 255, +}; + +static const upb_msglayout *const envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_submsgs[2] = { + &google_protobuf_Any_msginit, + &google_protobuf_Timestamp_msginit, +}; + +static const upb_msglayout_field envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig__fields[2] = { + {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, + {2, UPB_SIZE(8, 16), 2, 1, 11, 1}, +}; + +const upb_msglayout envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_msginit = { + &envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_submsgs[0], + &envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig__fields[0], + UPB_SIZE(16, 24), 2, false, 255, +}; + +static const upb_msglayout *const envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_submsgs[3] = { + &envoy_admin_v3_UpdateFailureState_msginit, + &google_protobuf_Any_msginit, + &google_protobuf_Timestamp_msginit, +}; + +static const upb_msglayout_field envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig__fields[5] = { + {1, UPB_SIZE(8, 8), 0, 0, 9, 1}, + {2, UPB_SIZE(16, 24), 1, 1, 11, 1}, + {3, UPB_SIZE(20, 32), 2, 2, 11, 1}, + {4, UPB_SIZE(24, 40), 3, 0, 11, 1}, + {5, UPB_SIZE(4, 4), 0, 0, 14, 1}, +}; + +const upb_msglayout envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_msginit = { + &envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_submsgs[0], + &envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig__fields[0], + UPB_SIZE(32, 48), 5, false, 255, +}; + +#include "upb/port_undef.inc" + diff --git a/grpc/src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.h b/grpc/src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.h new file mode 100644 index 00000000..6f117c66 --- /dev/null +++ b/grpc/src/core/ext/upb-generated/envoy/admin/v3/config_dump.upb.h @@ -0,0 +1,1459 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * envoy/admin/v3/config_dump.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#ifndef ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPB_H_ +#define ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPB_H_ + +#include "upb/msg.h" +#include "upb/decode.h" +#include "upb/decode_fast.h" +#include "upb/encode.h" + +#include "upb/port_def.inc" + +#ifdef __cplusplus +extern "C" { +#endif + +struct envoy_admin_v3_ConfigDump; +struct envoy_admin_v3_UpdateFailureState; +struct envoy_admin_v3_BootstrapConfigDump; +struct envoy_admin_v3_ListenersConfigDump; +struct envoy_admin_v3_ListenersConfigDump_StaticListener; +struct envoy_admin_v3_ListenersConfigDump_DynamicListenerState; +struct envoy_admin_v3_ListenersConfigDump_DynamicListener; +struct envoy_admin_v3_ClustersConfigDump; +struct envoy_admin_v3_ClustersConfigDump_StaticCluster; +struct envoy_admin_v3_ClustersConfigDump_DynamicCluster; +struct envoy_admin_v3_RoutesConfigDump; +struct envoy_admin_v3_RoutesConfigDump_StaticRouteConfig; +struct envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig; +struct envoy_admin_v3_ScopedRoutesConfigDump; +struct envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs; +struct envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs; +struct envoy_admin_v3_SecretsConfigDump; +struct envoy_admin_v3_SecretsConfigDump_DynamicSecret; +struct envoy_admin_v3_SecretsConfigDump_StaticSecret; +struct envoy_admin_v3_EndpointsConfigDump; +struct envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig; +struct envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig; +typedef struct envoy_admin_v3_ConfigDump envoy_admin_v3_ConfigDump; +typedef struct envoy_admin_v3_UpdateFailureState envoy_admin_v3_UpdateFailureState; +typedef struct envoy_admin_v3_BootstrapConfigDump envoy_admin_v3_BootstrapConfigDump; +typedef struct envoy_admin_v3_ListenersConfigDump envoy_admin_v3_ListenersConfigDump; +typedef struct envoy_admin_v3_ListenersConfigDump_StaticListener envoy_admin_v3_ListenersConfigDump_StaticListener; +typedef struct envoy_admin_v3_ListenersConfigDump_DynamicListenerState envoy_admin_v3_ListenersConfigDump_DynamicListenerState; +typedef struct envoy_admin_v3_ListenersConfigDump_DynamicListener envoy_admin_v3_ListenersConfigDump_DynamicListener; +typedef struct envoy_admin_v3_ClustersConfigDump envoy_admin_v3_ClustersConfigDump; +typedef struct envoy_admin_v3_ClustersConfigDump_StaticCluster envoy_admin_v3_ClustersConfigDump_StaticCluster; +typedef struct envoy_admin_v3_ClustersConfigDump_DynamicCluster envoy_admin_v3_ClustersConfigDump_DynamicCluster; +typedef struct envoy_admin_v3_RoutesConfigDump envoy_admin_v3_RoutesConfigDump; +typedef struct envoy_admin_v3_RoutesConfigDump_StaticRouteConfig envoy_admin_v3_RoutesConfigDump_StaticRouteConfig; +typedef struct envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig; +typedef struct envoy_admin_v3_ScopedRoutesConfigDump envoy_admin_v3_ScopedRoutesConfigDump; +typedef struct envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs; +typedef struct envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs; +typedef struct envoy_admin_v3_SecretsConfigDump envoy_admin_v3_SecretsConfigDump; +typedef struct envoy_admin_v3_SecretsConfigDump_DynamicSecret envoy_admin_v3_SecretsConfigDump_DynamicSecret; +typedef struct envoy_admin_v3_SecretsConfigDump_StaticSecret envoy_admin_v3_SecretsConfigDump_StaticSecret; +typedef struct envoy_admin_v3_EndpointsConfigDump envoy_admin_v3_EndpointsConfigDump; +typedef struct envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig; +typedef struct envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig; +extern const upb_msglayout envoy_admin_v3_ConfigDump_msginit; +extern const upb_msglayout envoy_admin_v3_UpdateFailureState_msginit; +extern const upb_msglayout envoy_admin_v3_BootstrapConfigDump_msginit; +extern const upb_msglayout envoy_admin_v3_ListenersConfigDump_msginit; +extern const upb_msglayout envoy_admin_v3_ListenersConfigDump_StaticListener_msginit; +extern const upb_msglayout envoy_admin_v3_ListenersConfigDump_DynamicListenerState_msginit; +extern const upb_msglayout envoy_admin_v3_ListenersConfigDump_DynamicListener_msginit; +extern const upb_msglayout envoy_admin_v3_ClustersConfigDump_msginit; +extern const upb_msglayout envoy_admin_v3_ClustersConfigDump_StaticCluster_msginit; +extern const upb_msglayout envoy_admin_v3_ClustersConfigDump_DynamicCluster_msginit; +extern const upb_msglayout envoy_admin_v3_RoutesConfigDump_msginit; +extern const upb_msglayout envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_msginit; +extern const upb_msglayout envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_msginit; +extern const upb_msglayout envoy_admin_v3_ScopedRoutesConfigDump_msginit; +extern const upb_msglayout envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_msginit; +extern const upb_msglayout envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_msginit; +extern const upb_msglayout envoy_admin_v3_SecretsConfigDump_msginit; +extern const upb_msglayout envoy_admin_v3_SecretsConfigDump_DynamicSecret_msginit; +extern const upb_msglayout envoy_admin_v3_SecretsConfigDump_StaticSecret_msginit; +extern const upb_msglayout envoy_admin_v3_EndpointsConfigDump_msginit; +extern const upb_msglayout envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_msginit; +extern const upb_msglayout envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_msginit; +struct envoy_config_bootstrap_v3_Bootstrap; +struct google_protobuf_Any; +struct google_protobuf_Timestamp; +extern const upb_msglayout envoy_config_bootstrap_v3_Bootstrap_msginit; +extern const upb_msglayout google_protobuf_Any_msginit; +extern const upb_msglayout google_protobuf_Timestamp_msginit; + +typedef enum { + envoy_admin_v3_UNKNOWN = 0, + envoy_admin_v3_REQUESTED = 1, + envoy_admin_v3_DOES_NOT_EXIST = 2, + envoy_admin_v3_ACKED = 3, + envoy_admin_v3_NACKED = 4 +} envoy_admin_v3_ClientResourceStatus; + + +/* envoy.admin.v3.ConfigDump */ + +UPB_INLINE envoy_admin_v3_ConfigDump *envoy_admin_v3_ConfigDump_new(upb_arena *arena) { + return (envoy_admin_v3_ConfigDump *)_upb_msg_new(&envoy_admin_v3_ConfigDump_msginit, arena); +} +UPB_INLINE envoy_admin_v3_ConfigDump *envoy_admin_v3_ConfigDump_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_admin_v3_ConfigDump *ret = envoy_admin_v3_ConfigDump_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_admin_v3_ConfigDump_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_admin_v3_ConfigDump *envoy_admin_v3_ConfigDump_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_admin_v3_ConfigDump *ret = envoy_admin_v3_ConfigDump_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_admin_v3_ConfigDump_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_admin_v3_ConfigDump_serialize(const envoy_admin_v3_ConfigDump *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_admin_v3_ConfigDump_msginit, arena, len); +} + +UPB_INLINE bool envoy_admin_v3_ConfigDump_has_configs(const envoy_admin_v3_ConfigDump *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(0, 0)); } +UPB_INLINE const struct google_protobuf_Any* const* envoy_admin_v3_ConfigDump_configs(const envoy_admin_v3_ConfigDump *msg, size_t *len) { return (const struct google_protobuf_Any* const*)_upb_array_accessor(msg, UPB_SIZE(0, 0), len); } + +UPB_INLINE struct google_protobuf_Any** envoy_admin_v3_ConfigDump_mutable_configs(envoy_admin_v3_ConfigDump *msg, size_t *len) { + return (struct google_protobuf_Any**)_upb_array_mutable_accessor(msg, UPB_SIZE(0, 0), len); +} +UPB_INLINE struct google_protobuf_Any** envoy_admin_v3_ConfigDump_resize_configs(envoy_admin_v3_ConfigDump *msg, size_t len, upb_arena *arena) { + return (struct google_protobuf_Any**)_upb_array_resize_accessor2(msg, UPB_SIZE(0, 0), len, UPB_SIZE(2, 3), arena); +} +UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_ConfigDump_add_configs(envoy_admin_v3_ConfigDump *msg, upb_arena *arena) { + struct google_protobuf_Any* sub = (struct google_protobuf_Any*)_upb_msg_new(&google_protobuf_Any_msginit, arena); + bool ok = _upb_array_append_accessor2( + msg, UPB_SIZE(0, 0), UPB_SIZE(2, 3), &sub, arena); + if (!ok) return NULL; + return sub; +} + +/* envoy.admin.v3.UpdateFailureState */ + +UPB_INLINE envoy_admin_v3_UpdateFailureState *envoy_admin_v3_UpdateFailureState_new(upb_arena *arena) { + return (envoy_admin_v3_UpdateFailureState *)_upb_msg_new(&envoy_admin_v3_UpdateFailureState_msginit, arena); +} +UPB_INLINE envoy_admin_v3_UpdateFailureState *envoy_admin_v3_UpdateFailureState_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_admin_v3_UpdateFailureState *ret = envoy_admin_v3_UpdateFailureState_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_admin_v3_UpdateFailureState_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_admin_v3_UpdateFailureState *envoy_admin_v3_UpdateFailureState_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_admin_v3_UpdateFailureState *ret = envoy_admin_v3_UpdateFailureState_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_admin_v3_UpdateFailureState_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_admin_v3_UpdateFailureState_serialize(const envoy_admin_v3_UpdateFailureState *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_admin_v3_UpdateFailureState_msginit, arena, len); +} + +UPB_INLINE bool envoy_admin_v3_UpdateFailureState_has_failed_configuration(const envoy_admin_v3_UpdateFailureState *msg) { return _upb_hasbit(msg, 1); } +UPB_INLINE const struct google_protobuf_Any* envoy_admin_v3_UpdateFailureState_failed_configuration(const envoy_admin_v3_UpdateFailureState *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(20, 40), const struct google_protobuf_Any*); } +UPB_INLINE bool envoy_admin_v3_UpdateFailureState_has_last_update_attempt(const envoy_admin_v3_UpdateFailureState *msg) { return _upb_hasbit(msg, 2); } +UPB_INLINE const struct google_protobuf_Timestamp* envoy_admin_v3_UpdateFailureState_last_update_attempt(const envoy_admin_v3_UpdateFailureState *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(24, 48), const struct google_protobuf_Timestamp*); } +UPB_INLINE upb_strview envoy_admin_v3_UpdateFailureState_details(const envoy_admin_v3_UpdateFailureState *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview); } +UPB_INLINE upb_strview envoy_admin_v3_UpdateFailureState_version_info(const envoy_admin_v3_UpdateFailureState *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(12, 24), upb_strview); } + +UPB_INLINE void envoy_admin_v3_UpdateFailureState_set_failed_configuration(envoy_admin_v3_UpdateFailureState *msg, struct google_protobuf_Any* value) { + _upb_sethas(msg, 1); + *UPB_PTR_AT(msg, UPB_SIZE(20, 40), struct google_protobuf_Any*) = value; +} +UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_UpdateFailureState_mutable_failed_configuration(envoy_admin_v3_UpdateFailureState *msg, upb_arena *arena) { + struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_admin_v3_UpdateFailureState_failed_configuration(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Any*)_upb_msg_new(&google_protobuf_Any_msginit, arena); + if (!sub) return NULL; + envoy_admin_v3_UpdateFailureState_set_failed_configuration(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_admin_v3_UpdateFailureState_set_last_update_attempt(envoy_admin_v3_UpdateFailureState *msg, struct google_protobuf_Timestamp* value) { + _upb_sethas(msg, 2); + *UPB_PTR_AT(msg, UPB_SIZE(24, 48), struct google_protobuf_Timestamp*) = value; +} +UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_UpdateFailureState_mutable_last_update_attempt(envoy_admin_v3_UpdateFailureState *msg, upb_arena *arena) { + struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_UpdateFailureState_last_update_attempt(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Timestamp*)_upb_msg_new(&google_protobuf_Timestamp_msginit, arena); + if (!sub) return NULL; + envoy_admin_v3_UpdateFailureState_set_last_update_attempt(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_admin_v3_UpdateFailureState_set_details(envoy_admin_v3_UpdateFailureState *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview) = value; +} +UPB_INLINE void envoy_admin_v3_UpdateFailureState_set_version_info(envoy_admin_v3_UpdateFailureState *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(12, 24), upb_strview) = value; +} + +/* envoy.admin.v3.BootstrapConfigDump */ + +UPB_INLINE envoy_admin_v3_BootstrapConfigDump *envoy_admin_v3_BootstrapConfigDump_new(upb_arena *arena) { + return (envoy_admin_v3_BootstrapConfigDump *)_upb_msg_new(&envoy_admin_v3_BootstrapConfigDump_msginit, arena); +} +UPB_INLINE envoy_admin_v3_BootstrapConfigDump *envoy_admin_v3_BootstrapConfigDump_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_admin_v3_BootstrapConfigDump *ret = envoy_admin_v3_BootstrapConfigDump_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_admin_v3_BootstrapConfigDump_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_admin_v3_BootstrapConfigDump *envoy_admin_v3_BootstrapConfigDump_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_admin_v3_BootstrapConfigDump *ret = envoy_admin_v3_BootstrapConfigDump_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_admin_v3_BootstrapConfigDump_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_admin_v3_BootstrapConfigDump_serialize(const envoy_admin_v3_BootstrapConfigDump *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_admin_v3_BootstrapConfigDump_msginit, arena, len); +} + +UPB_INLINE bool envoy_admin_v3_BootstrapConfigDump_has_bootstrap(const envoy_admin_v3_BootstrapConfigDump *msg) { return _upb_hasbit(msg, 1); } +UPB_INLINE const struct envoy_config_bootstrap_v3_Bootstrap* envoy_admin_v3_BootstrapConfigDump_bootstrap(const envoy_admin_v3_BootstrapConfigDump *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), const struct envoy_config_bootstrap_v3_Bootstrap*); } +UPB_INLINE bool envoy_admin_v3_BootstrapConfigDump_has_last_updated(const envoy_admin_v3_BootstrapConfigDump *msg) { return _upb_hasbit(msg, 2); } +UPB_INLINE const struct google_protobuf_Timestamp* envoy_admin_v3_BootstrapConfigDump_last_updated(const envoy_admin_v3_BootstrapConfigDump *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(8, 16), const struct google_protobuf_Timestamp*); } + +UPB_INLINE void envoy_admin_v3_BootstrapConfigDump_set_bootstrap(envoy_admin_v3_BootstrapConfigDump *msg, struct envoy_config_bootstrap_v3_Bootstrap* value) { + _upb_sethas(msg, 1); + *UPB_PTR_AT(msg, UPB_SIZE(4, 8), struct envoy_config_bootstrap_v3_Bootstrap*) = value; +} +UPB_INLINE struct envoy_config_bootstrap_v3_Bootstrap* envoy_admin_v3_BootstrapConfigDump_mutable_bootstrap(envoy_admin_v3_BootstrapConfigDump *msg, upb_arena *arena) { + struct envoy_config_bootstrap_v3_Bootstrap* sub = (struct envoy_config_bootstrap_v3_Bootstrap*)envoy_admin_v3_BootstrapConfigDump_bootstrap(msg); + if (sub == NULL) { + sub = (struct envoy_config_bootstrap_v3_Bootstrap*)_upb_msg_new(&envoy_config_bootstrap_v3_Bootstrap_msginit, arena); + if (!sub) return NULL; + envoy_admin_v3_BootstrapConfigDump_set_bootstrap(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_admin_v3_BootstrapConfigDump_set_last_updated(envoy_admin_v3_BootstrapConfigDump *msg, struct google_protobuf_Timestamp* value) { + _upb_sethas(msg, 2); + *UPB_PTR_AT(msg, UPB_SIZE(8, 16), struct google_protobuf_Timestamp*) = value; +} +UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_BootstrapConfigDump_mutable_last_updated(envoy_admin_v3_BootstrapConfigDump *msg, upb_arena *arena) { + struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_BootstrapConfigDump_last_updated(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Timestamp*)_upb_msg_new(&google_protobuf_Timestamp_msginit, arena); + if (!sub) return NULL; + envoy_admin_v3_BootstrapConfigDump_set_last_updated(msg, sub); + } + return sub; +} + +/* envoy.admin.v3.ListenersConfigDump */ + +UPB_INLINE envoy_admin_v3_ListenersConfigDump *envoy_admin_v3_ListenersConfigDump_new(upb_arena *arena) { + return (envoy_admin_v3_ListenersConfigDump *)_upb_msg_new(&envoy_admin_v3_ListenersConfigDump_msginit, arena); +} +UPB_INLINE envoy_admin_v3_ListenersConfigDump *envoy_admin_v3_ListenersConfigDump_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_admin_v3_ListenersConfigDump *ret = envoy_admin_v3_ListenersConfigDump_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_admin_v3_ListenersConfigDump_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_admin_v3_ListenersConfigDump *envoy_admin_v3_ListenersConfigDump_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_admin_v3_ListenersConfigDump *ret = envoy_admin_v3_ListenersConfigDump_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_admin_v3_ListenersConfigDump_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_admin_v3_ListenersConfigDump_serialize(const envoy_admin_v3_ListenersConfigDump *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_admin_v3_ListenersConfigDump_msginit, arena, len); +} + +UPB_INLINE upb_strview envoy_admin_v3_ListenersConfigDump_version_info(const envoy_admin_v3_ListenersConfigDump *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(0, 0), upb_strview); } +UPB_INLINE bool envoy_admin_v3_ListenersConfigDump_has_static_listeners(const envoy_admin_v3_ListenersConfigDump *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(8, 16)); } +UPB_INLINE const envoy_admin_v3_ListenersConfigDump_StaticListener* const* envoy_admin_v3_ListenersConfigDump_static_listeners(const envoy_admin_v3_ListenersConfigDump *msg, size_t *len) { return (const envoy_admin_v3_ListenersConfigDump_StaticListener* const*)_upb_array_accessor(msg, UPB_SIZE(8, 16), len); } +UPB_INLINE bool envoy_admin_v3_ListenersConfigDump_has_dynamic_listeners(const envoy_admin_v3_ListenersConfigDump *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(12, 24)); } +UPB_INLINE const envoy_admin_v3_ListenersConfigDump_DynamicListener* const* envoy_admin_v3_ListenersConfigDump_dynamic_listeners(const envoy_admin_v3_ListenersConfigDump *msg, size_t *len) { return (const envoy_admin_v3_ListenersConfigDump_DynamicListener* const*)_upb_array_accessor(msg, UPB_SIZE(12, 24), len); } + +UPB_INLINE void envoy_admin_v3_ListenersConfigDump_set_version_info(envoy_admin_v3_ListenersConfigDump *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(0, 0), upb_strview) = value; +} +UPB_INLINE envoy_admin_v3_ListenersConfigDump_StaticListener** envoy_admin_v3_ListenersConfigDump_mutable_static_listeners(envoy_admin_v3_ListenersConfigDump *msg, size_t *len) { + return (envoy_admin_v3_ListenersConfigDump_StaticListener**)_upb_array_mutable_accessor(msg, UPB_SIZE(8, 16), len); +} +UPB_INLINE envoy_admin_v3_ListenersConfigDump_StaticListener** envoy_admin_v3_ListenersConfigDump_resize_static_listeners(envoy_admin_v3_ListenersConfigDump *msg, size_t len, upb_arena *arena) { + return (envoy_admin_v3_ListenersConfigDump_StaticListener**)_upb_array_resize_accessor2(msg, UPB_SIZE(8, 16), len, UPB_SIZE(2, 3), arena); +} +UPB_INLINE struct envoy_admin_v3_ListenersConfigDump_StaticListener* envoy_admin_v3_ListenersConfigDump_add_static_listeners(envoy_admin_v3_ListenersConfigDump *msg, upb_arena *arena) { + struct envoy_admin_v3_ListenersConfigDump_StaticListener* sub = (struct envoy_admin_v3_ListenersConfigDump_StaticListener*)_upb_msg_new(&envoy_admin_v3_ListenersConfigDump_StaticListener_msginit, arena); + bool ok = _upb_array_append_accessor2( + msg, UPB_SIZE(8, 16), UPB_SIZE(2, 3), &sub, arena); + if (!ok) return NULL; + return sub; +} +UPB_INLINE envoy_admin_v3_ListenersConfigDump_DynamicListener** envoy_admin_v3_ListenersConfigDump_mutable_dynamic_listeners(envoy_admin_v3_ListenersConfigDump *msg, size_t *len) { + return (envoy_admin_v3_ListenersConfigDump_DynamicListener**)_upb_array_mutable_accessor(msg, UPB_SIZE(12, 24), len); +} +UPB_INLINE envoy_admin_v3_ListenersConfigDump_DynamicListener** envoy_admin_v3_ListenersConfigDump_resize_dynamic_listeners(envoy_admin_v3_ListenersConfigDump *msg, size_t len, upb_arena *arena) { + return (envoy_admin_v3_ListenersConfigDump_DynamicListener**)_upb_array_resize_accessor2(msg, UPB_SIZE(12, 24), len, UPB_SIZE(2, 3), arena); +} +UPB_INLINE struct envoy_admin_v3_ListenersConfigDump_DynamicListener* envoy_admin_v3_ListenersConfigDump_add_dynamic_listeners(envoy_admin_v3_ListenersConfigDump *msg, upb_arena *arena) { + struct envoy_admin_v3_ListenersConfigDump_DynamicListener* sub = (struct envoy_admin_v3_ListenersConfigDump_DynamicListener*)_upb_msg_new(&envoy_admin_v3_ListenersConfigDump_DynamicListener_msginit, arena); + bool ok = _upb_array_append_accessor2( + msg, UPB_SIZE(12, 24), UPB_SIZE(2, 3), &sub, arena); + if (!ok) return NULL; + return sub; +} + +/* envoy.admin.v3.ListenersConfigDump.StaticListener */ + +UPB_INLINE envoy_admin_v3_ListenersConfigDump_StaticListener *envoy_admin_v3_ListenersConfigDump_StaticListener_new(upb_arena *arena) { + return (envoy_admin_v3_ListenersConfigDump_StaticListener *)_upb_msg_new(&envoy_admin_v3_ListenersConfigDump_StaticListener_msginit, arena); +} +UPB_INLINE envoy_admin_v3_ListenersConfigDump_StaticListener *envoy_admin_v3_ListenersConfigDump_StaticListener_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_admin_v3_ListenersConfigDump_StaticListener *ret = envoy_admin_v3_ListenersConfigDump_StaticListener_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_admin_v3_ListenersConfigDump_StaticListener_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_admin_v3_ListenersConfigDump_StaticListener *envoy_admin_v3_ListenersConfigDump_StaticListener_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_admin_v3_ListenersConfigDump_StaticListener *ret = envoy_admin_v3_ListenersConfigDump_StaticListener_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_admin_v3_ListenersConfigDump_StaticListener_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_admin_v3_ListenersConfigDump_StaticListener_serialize(const envoy_admin_v3_ListenersConfigDump_StaticListener *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_admin_v3_ListenersConfigDump_StaticListener_msginit, arena, len); +} + +UPB_INLINE bool envoy_admin_v3_ListenersConfigDump_StaticListener_has_listener(const envoy_admin_v3_ListenersConfigDump_StaticListener *msg) { return _upb_hasbit(msg, 1); } +UPB_INLINE const struct google_protobuf_Any* envoy_admin_v3_ListenersConfigDump_StaticListener_listener(const envoy_admin_v3_ListenersConfigDump_StaticListener *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), const struct google_protobuf_Any*); } +UPB_INLINE bool envoy_admin_v3_ListenersConfigDump_StaticListener_has_last_updated(const envoy_admin_v3_ListenersConfigDump_StaticListener *msg) { return _upb_hasbit(msg, 2); } +UPB_INLINE const struct google_protobuf_Timestamp* envoy_admin_v3_ListenersConfigDump_StaticListener_last_updated(const envoy_admin_v3_ListenersConfigDump_StaticListener *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(8, 16), const struct google_protobuf_Timestamp*); } + +UPB_INLINE void envoy_admin_v3_ListenersConfigDump_StaticListener_set_listener(envoy_admin_v3_ListenersConfigDump_StaticListener *msg, struct google_protobuf_Any* value) { + _upb_sethas(msg, 1); + *UPB_PTR_AT(msg, UPB_SIZE(4, 8), struct google_protobuf_Any*) = value; +} +UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_ListenersConfigDump_StaticListener_mutable_listener(envoy_admin_v3_ListenersConfigDump_StaticListener *msg, upb_arena *arena) { + struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_admin_v3_ListenersConfigDump_StaticListener_listener(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Any*)_upb_msg_new(&google_protobuf_Any_msginit, arena); + if (!sub) return NULL; + envoy_admin_v3_ListenersConfigDump_StaticListener_set_listener(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_admin_v3_ListenersConfigDump_StaticListener_set_last_updated(envoy_admin_v3_ListenersConfigDump_StaticListener *msg, struct google_protobuf_Timestamp* value) { + _upb_sethas(msg, 2); + *UPB_PTR_AT(msg, UPB_SIZE(8, 16), struct google_protobuf_Timestamp*) = value; +} +UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_ListenersConfigDump_StaticListener_mutable_last_updated(envoy_admin_v3_ListenersConfigDump_StaticListener *msg, upb_arena *arena) { + struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_ListenersConfigDump_StaticListener_last_updated(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Timestamp*)_upb_msg_new(&google_protobuf_Timestamp_msginit, arena); + if (!sub) return NULL; + envoy_admin_v3_ListenersConfigDump_StaticListener_set_last_updated(msg, sub); + } + return sub; +} + +/* envoy.admin.v3.ListenersConfigDump.DynamicListenerState */ + +UPB_INLINE envoy_admin_v3_ListenersConfigDump_DynamicListenerState *envoy_admin_v3_ListenersConfigDump_DynamicListenerState_new(upb_arena *arena) { + return (envoy_admin_v3_ListenersConfigDump_DynamicListenerState *)_upb_msg_new(&envoy_admin_v3_ListenersConfigDump_DynamicListenerState_msginit, arena); +} +UPB_INLINE envoy_admin_v3_ListenersConfigDump_DynamicListenerState *envoy_admin_v3_ListenersConfigDump_DynamicListenerState_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_admin_v3_ListenersConfigDump_DynamicListenerState *ret = envoy_admin_v3_ListenersConfigDump_DynamicListenerState_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_admin_v3_ListenersConfigDump_DynamicListenerState_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_admin_v3_ListenersConfigDump_DynamicListenerState *envoy_admin_v3_ListenersConfigDump_DynamicListenerState_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_admin_v3_ListenersConfigDump_DynamicListenerState *ret = envoy_admin_v3_ListenersConfigDump_DynamicListenerState_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_admin_v3_ListenersConfigDump_DynamicListenerState_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_admin_v3_ListenersConfigDump_DynamicListenerState_serialize(const envoy_admin_v3_ListenersConfigDump_DynamicListenerState *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_admin_v3_ListenersConfigDump_DynamicListenerState_msginit, arena, len); +} + +UPB_INLINE upb_strview envoy_admin_v3_ListenersConfigDump_DynamicListenerState_version_info(const envoy_admin_v3_ListenersConfigDump_DynamicListenerState *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview); } +UPB_INLINE bool envoy_admin_v3_ListenersConfigDump_DynamicListenerState_has_listener(const envoy_admin_v3_ListenersConfigDump_DynamicListenerState *msg) { return _upb_hasbit(msg, 1); } +UPB_INLINE const struct google_protobuf_Any* envoy_admin_v3_ListenersConfigDump_DynamicListenerState_listener(const envoy_admin_v3_ListenersConfigDump_DynamicListenerState *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(12, 24), const struct google_protobuf_Any*); } +UPB_INLINE bool envoy_admin_v3_ListenersConfigDump_DynamicListenerState_has_last_updated(const envoy_admin_v3_ListenersConfigDump_DynamicListenerState *msg) { return _upb_hasbit(msg, 2); } +UPB_INLINE const struct google_protobuf_Timestamp* envoy_admin_v3_ListenersConfigDump_DynamicListenerState_last_updated(const envoy_admin_v3_ListenersConfigDump_DynamicListenerState *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(16, 32), const struct google_protobuf_Timestamp*); } + +UPB_INLINE void envoy_admin_v3_ListenersConfigDump_DynamicListenerState_set_version_info(envoy_admin_v3_ListenersConfigDump_DynamicListenerState *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview) = value; +} +UPB_INLINE void envoy_admin_v3_ListenersConfigDump_DynamicListenerState_set_listener(envoy_admin_v3_ListenersConfigDump_DynamicListenerState *msg, struct google_protobuf_Any* value) { + _upb_sethas(msg, 1); + *UPB_PTR_AT(msg, UPB_SIZE(12, 24), struct google_protobuf_Any*) = value; +} +UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_ListenersConfigDump_DynamicListenerState_mutable_listener(envoy_admin_v3_ListenersConfigDump_DynamicListenerState *msg, upb_arena *arena) { + struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_admin_v3_ListenersConfigDump_DynamicListenerState_listener(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Any*)_upb_msg_new(&google_protobuf_Any_msginit, arena); + if (!sub) return NULL; + envoy_admin_v3_ListenersConfigDump_DynamicListenerState_set_listener(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_admin_v3_ListenersConfigDump_DynamicListenerState_set_last_updated(envoy_admin_v3_ListenersConfigDump_DynamicListenerState *msg, struct google_protobuf_Timestamp* value) { + _upb_sethas(msg, 2); + *UPB_PTR_AT(msg, UPB_SIZE(16, 32), struct google_protobuf_Timestamp*) = value; +} +UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_ListenersConfigDump_DynamicListenerState_mutable_last_updated(envoy_admin_v3_ListenersConfigDump_DynamicListenerState *msg, upb_arena *arena) { + struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_ListenersConfigDump_DynamicListenerState_last_updated(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Timestamp*)_upb_msg_new(&google_protobuf_Timestamp_msginit, arena); + if (!sub) return NULL; + envoy_admin_v3_ListenersConfigDump_DynamicListenerState_set_last_updated(msg, sub); + } + return sub; +} + +/* envoy.admin.v3.ListenersConfigDump.DynamicListener */ + +UPB_INLINE envoy_admin_v3_ListenersConfigDump_DynamicListener *envoy_admin_v3_ListenersConfigDump_DynamicListener_new(upb_arena *arena) { + return (envoy_admin_v3_ListenersConfigDump_DynamicListener *)_upb_msg_new(&envoy_admin_v3_ListenersConfigDump_DynamicListener_msginit, arena); +} +UPB_INLINE envoy_admin_v3_ListenersConfigDump_DynamicListener *envoy_admin_v3_ListenersConfigDump_DynamicListener_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_admin_v3_ListenersConfigDump_DynamicListener *ret = envoy_admin_v3_ListenersConfigDump_DynamicListener_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_admin_v3_ListenersConfigDump_DynamicListener_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_admin_v3_ListenersConfigDump_DynamicListener *envoy_admin_v3_ListenersConfigDump_DynamicListener_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_admin_v3_ListenersConfigDump_DynamicListener *ret = envoy_admin_v3_ListenersConfigDump_DynamicListener_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_admin_v3_ListenersConfigDump_DynamicListener_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_admin_v3_ListenersConfigDump_DynamicListener_serialize(const envoy_admin_v3_ListenersConfigDump_DynamicListener *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_admin_v3_ListenersConfigDump_DynamicListener_msginit, arena, len); +} + +UPB_INLINE upb_strview envoy_admin_v3_ListenersConfigDump_DynamicListener_name(const envoy_admin_v3_ListenersConfigDump_DynamicListener *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(8, 8), upb_strview); } +UPB_INLINE bool envoy_admin_v3_ListenersConfigDump_DynamicListener_has_active_state(const envoy_admin_v3_ListenersConfigDump_DynamicListener *msg) { return _upb_hasbit(msg, 1); } +UPB_INLINE const envoy_admin_v3_ListenersConfigDump_DynamicListenerState* envoy_admin_v3_ListenersConfigDump_DynamicListener_active_state(const envoy_admin_v3_ListenersConfigDump_DynamicListener *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(16, 24), const envoy_admin_v3_ListenersConfigDump_DynamicListenerState*); } +UPB_INLINE bool envoy_admin_v3_ListenersConfigDump_DynamicListener_has_warming_state(const envoy_admin_v3_ListenersConfigDump_DynamicListener *msg) { return _upb_hasbit(msg, 2); } +UPB_INLINE const envoy_admin_v3_ListenersConfigDump_DynamicListenerState* envoy_admin_v3_ListenersConfigDump_DynamicListener_warming_state(const envoy_admin_v3_ListenersConfigDump_DynamicListener *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(20, 32), const envoy_admin_v3_ListenersConfigDump_DynamicListenerState*); } +UPB_INLINE bool envoy_admin_v3_ListenersConfigDump_DynamicListener_has_draining_state(const envoy_admin_v3_ListenersConfigDump_DynamicListener *msg) { return _upb_hasbit(msg, 3); } +UPB_INLINE const envoy_admin_v3_ListenersConfigDump_DynamicListenerState* envoy_admin_v3_ListenersConfigDump_DynamicListener_draining_state(const envoy_admin_v3_ListenersConfigDump_DynamicListener *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(24, 40), const envoy_admin_v3_ListenersConfigDump_DynamicListenerState*); } +UPB_INLINE bool envoy_admin_v3_ListenersConfigDump_DynamicListener_has_error_state(const envoy_admin_v3_ListenersConfigDump_DynamicListener *msg) { return _upb_hasbit(msg, 4); } +UPB_INLINE const envoy_admin_v3_UpdateFailureState* envoy_admin_v3_ListenersConfigDump_DynamicListener_error_state(const envoy_admin_v3_ListenersConfigDump_DynamicListener *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(28, 48), const envoy_admin_v3_UpdateFailureState*); } +UPB_INLINE int32_t envoy_admin_v3_ListenersConfigDump_DynamicListener_client_status(const envoy_admin_v3_ListenersConfigDump_DynamicListener *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t); } + +UPB_INLINE void envoy_admin_v3_ListenersConfigDump_DynamicListener_set_name(envoy_admin_v3_ListenersConfigDump_DynamicListener *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(8, 8), upb_strview) = value; +} +UPB_INLINE void envoy_admin_v3_ListenersConfigDump_DynamicListener_set_active_state(envoy_admin_v3_ListenersConfigDump_DynamicListener *msg, envoy_admin_v3_ListenersConfigDump_DynamicListenerState* value) { + _upb_sethas(msg, 1); + *UPB_PTR_AT(msg, UPB_SIZE(16, 24), envoy_admin_v3_ListenersConfigDump_DynamicListenerState*) = value; +} +UPB_INLINE struct envoy_admin_v3_ListenersConfigDump_DynamicListenerState* envoy_admin_v3_ListenersConfigDump_DynamicListener_mutable_active_state(envoy_admin_v3_ListenersConfigDump_DynamicListener *msg, upb_arena *arena) { + struct envoy_admin_v3_ListenersConfigDump_DynamicListenerState* sub = (struct envoy_admin_v3_ListenersConfigDump_DynamicListenerState*)envoy_admin_v3_ListenersConfigDump_DynamicListener_active_state(msg); + if (sub == NULL) { + sub = (struct envoy_admin_v3_ListenersConfigDump_DynamicListenerState*)_upb_msg_new(&envoy_admin_v3_ListenersConfigDump_DynamicListenerState_msginit, arena); + if (!sub) return NULL; + envoy_admin_v3_ListenersConfigDump_DynamicListener_set_active_state(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_admin_v3_ListenersConfigDump_DynamicListener_set_warming_state(envoy_admin_v3_ListenersConfigDump_DynamicListener *msg, envoy_admin_v3_ListenersConfigDump_DynamicListenerState* value) { + _upb_sethas(msg, 2); + *UPB_PTR_AT(msg, UPB_SIZE(20, 32), envoy_admin_v3_ListenersConfigDump_DynamicListenerState*) = value; +} +UPB_INLINE struct envoy_admin_v3_ListenersConfigDump_DynamicListenerState* envoy_admin_v3_ListenersConfigDump_DynamicListener_mutable_warming_state(envoy_admin_v3_ListenersConfigDump_DynamicListener *msg, upb_arena *arena) { + struct envoy_admin_v3_ListenersConfigDump_DynamicListenerState* sub = (struct envoy_admin_v3_ListenersConfigDump_DynamicListenerState*)envoy_admin_v3_ListenersConfigDump_DynamicListener_warming_state(msg); + if (sub == NULL) { + sub = (struct envoy_admin_v3_ListenersConfigDump_DynamicListenerState*)_upb_msg_new(&envoy_admin_v3_ListenersConfigDump_DynamicListenerState_msginit, arena); + if (!sub) return NULL; + envoy_admin_v3_ListenersConfigDump_DynamicListener_set_warming_state(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_admin_v3_ListenersConfigDump_DynamicListener_set_draining_state(envoy_admin_v3_ListenersConfigDump_DynamicListener *msg, envoy_admin_v3_ListenersConfigDump_DynamicListenerState* value) { + _upb_sethas(msg, 3); + *UPB_PTR_AT(msg, UPB_SIZE(24, 40), envoy_admin_v3_ListenersConfigDump_DynamicListenerState*) = value; +} +UPB_INLINE struct envoy_admin_v3_ListenersConfigDump_DynamicListenerState* envoy_admin_v3_ListenersConfigDump_DynamicListener_mutable_draining_state(envoy_admin_v3_ListenersConfigDump_DynamicListener *msg, upb_arena *arena) { + struct envoy_admin_v3_ListenersConfigDump_DynamicListenerState* sub = (struct envoy_admin_v3_ListenersConfigDump_DynamicListenerState*)envoy_admin_v3_ListenersConfigDump_DynamicListener_draining_state(msg); + if (sub == NULL) { + sub = (struct envoy_admin_v3_ListenersConfigDump_DynamicListenerState*)_upb_msg_new(&envoy_admin_v3_ListenersConfigDump_DynamicListenerState_msginit, arena); + if (!sub) return NULL; + envoy_admin_v3_ListenersConfigDump_DynamicListener_set_draining_state(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_admin_v3_ListenersConfigDump_DynamicListener_set_error_state(envoy_admin_v3_ListenersConfigDump_DynamicListener *msg, envoy_admin_v3_UpdateFailureState* value) { + _upb_sethas(msg, 4); + *UPB_PTR_AT(msg, UPB_SIZE(28, 48), envoy_admin_v3_UpdateFailureState*) = value; +} +UPB_INLINE struct envoy_admin_v3_UpdateFailureState* envoy_admin_v3_ListenersConfigDump_DynamicListener_mutable_error_state(envoy_admin_v3_ListenersConfigDump_DynamicListener *msg, upb_arena *arena) { + struct envoy_admin_v3_UpdateFailureState* sub = (struct envoy_admin_v3_UpdateFailureState*)envoy_admin_v3_ListenersConfigDump_DynamicListener_error_state(msg); + if (sub == NULL) { + sub = (struct envoy_admin_v3_UpdateFailureState*)_upb_msg_new(&envoy_admin_v3_UpdateFailureState_msginit, arena); + if (!sub) return NULL; + envoy_admin_v3_ListenersConfigDump_DynamicListener_set_error_state(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_admin_v3_ListenersConfigDump_DynamicListener_set_client_status(envoy_admin_v3_ListenersConfigDump_DynamicListener *msg, int32_t value) { + *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t) = value; +} + +/* envoy.admin.v3.ClustersConfigDump */ + +UPB_INLINE envoy_admin_v3_ClustersConfigDump *envoy_admin_v3_ClustersConfigDump_new(upb_arena *arena) { + return (envoy_admin_v3_ClustersConfigDump *)_upb_msg_new(&envoy_admin_v3_ClustersConfigDump_msginit, arena); +} +UPB_INLINE envoy_admin_v3_ClustersConfigDump *envoy_admin_v3_ClustersConfigDump_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_admin_v3_ClustersConfigDump *ret = envoy_admin_v3_ClustersConfigDump_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_admin_v3_ClustersConfigDump_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_admin_v3_ClustersConfigDump *envoy_admin_v3_ClustersConfigDump_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_admin_v3_ClustersConfigDump *ret = envoy_admin_v3_ClustersConfigDump_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_admin_v3_ClustersConfigDump_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_admin_v3_ClustersConfigDump_serialize(const envoy_admin_v3_ClustersConfigDump *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_admin_v3_ClustersConfigDump_msginit, arena, len); +} + +UPB_INLINE upb_strview envoy_admin_v3_ClustersConfigDump_version_info(const envoy_admin_v3_ClustersConfigDump *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(0, 0), upb_strview); } +UPB_INLINE bool envoy_admin_v3_ClustersConfigDump_has_static_clusters(const envoy_admin_v3_ClustersConfigDump *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(8, 16)); } +UPB_INLINE const envoy_admin_v3_ClustersConfigDump_StaticCluster* const* envoy_admin_v3_ClustersConfigDump_static_clusters(const envoy_admin_v3_ClustersConfigDump *msg, size_t *len) { return (const envoy_admin_v3_ClustersConfigDump_StaticCluster* const*)_upb_array_accessor(msg, UPB_SIZE(8, 16), len); } +UPB_INLINE bool envoy_admin_v3_ClustersConfigDump_has_dynamic_active_clusters(const envoy_admin_v3_ClustersConfigDump *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(12, 24)); } +UPB_INLINE const envoy_admin_v3_ClustersConfigDump_DynamicCluster* const* envoy_admin_v3_ClustersConfigDump_dynamic_active_clusters(const envoy_admin_v3_ClustersConfigDump *msg, size_t *len) { return (const envoy_admin_v3_ClustersConfigDump_DynamicCluster* const*)_upb_array_accessor(msg, UPB_SIZE(12, 24), len); } +UPB_INLINE bool envoy_admin_v3_ClustersConfigDump_has_dynamic_warming_clusters(const envoy_admin_v3_ClustersConfigDump *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(16, 32)); } +UPB_INLINE const envoy_admin_v3_ClustersConfigDump_DynamicCluster* const* envoy_admin_v3_ClustersConfigDump_dynamic_warming_clusters(const envoy_admin_v3_ClustersConfigDump *msg, size_t *len) { return (const envoy_admin_v3_ClustersConfigDump_DynamicCluster* const*)_upb_array_accessor(msg, UPB_SIZE(16, 32), len); } + +UPB_INLINE void envoy_admin_v3_ClustersConfigDump_set_version_info(envoy_admin_v3_ClustersConfigDump *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(0, 0), upb_strview) = value; +} +UPB_INLINE envoy_admin_v3_ClustersConfigDump_StaticCluster** envoy_admin_v3_ClustersConfigDump_mutable_static_clusters(envoy_admin_v3_ClustersConfigDump *msg, size_t *len) { + return (envoy_admin_v3_ClustersConfigDump_StaticCluster**)_upb_array_mutable_accessor(msg, UPB_SIZE(8, 16), len); +} +UPB_INLINE envoy_admin_v3_ClustersConfigDump_StaticCluster** envoy_admin_v3_ClustersConfigDump_resize_static_clusters(envoy_admin_v3_ClustersConfigDump *msg, size_t len, upb_arena *arena) { + return (envoy_admin_v3_ClustersConfigDump_StaticCluster**)_upb_array_resize_accessor2(msg, UPB_SIZE(8, 16), len, UPB_SIZE(2, 3), arena); +} +UPB_INLINE struct envoy_admin_v3_ClustersConfigDump_StaticCluster* envoy_admin_v3_ClustersConfigDump_add_static_clusters(envoy_admin_v3_ClustersConfigDump *msg, upb_arena *arena) { + struct envoy_admin_v3_ClustersConfigDump_StaticCluster* sub = (struct envoy_admin_v3_ClustersConfigDump_StaticCluster*)_upb_msg_new(&envoy_admin_v3_ClustersConfigDump_StaticCluster_msginit, arena); + bool ok = _upb_array_append_accessor2( + msg, UPB_SIZE(8, 16), UPB_SIZE(2, 3), &sub, arena); + if (!ok) return NULL; + return sub; +} +UPB_INLINE envoy_admin_v3_ClustersConfigDump_DynamicCluster** envoy_admin_v3_ClustersConfigDump_mutable_dynamic_active_clusters(envoy_admin_v3_ClustersConfigDump *msg, size_t *len) { + return (envoy_admin_v3_ClustersConfigDump_DynamicCluster**)_upb_array_mutable_accessor(msg, UPB_SIZE(12, 24), len); +} +UPB_INLINE envoy_admin_v3_ClustersConfigDump_DynamicCluster** envoy_admin_v3_ClustersConfigDump_resize_dynamic_active_clusters(envoy_admin_v3_ClustersConfigDump *msg, size_t len, upb_arena *arena) { + return (envoy_admin_v3_ClustersConfigDump_DynamicCluster**)_upb_array_resize_accessor2(msg, UPB_SIZE(12, 24), len, UPB_SIZE(2, 3), arena); +} +UPB_INLINE struct envoy_admin_v3_ClustersConfigDump_DynamicCluster* envoy_admin_v3_ClustersConfigDump_add_dynamic_active_clusters(envoy_admin_v3_ClustersConfigDump *msg, upb_arena *arena) { + struct envoy_admin_v3_ClustersConfigDump_DynamicCluster* sub = (struct envoy_admin_v3_ClustersConfigDump_DynamicCluster*)_upb_msg_new(&envoy_admin_v3_ClustersConfigDump_DynamicCluster_msginit, arena); + bool ok = _upb_array_append_accessor2( + msg, UPB_SIZE(12, 24), UPB_SIZE(2, 3), &sub, arena); + if (!ok) return NULL; + return sub; +} +UPB_INLINE envoy_admin_v3_ClustersConfigDump_DynamicCluster** envoy_admin_v3_ClustersConfigDump_mutable_dynamic_warming_clusters(envoy_admin_v3_ClustersConfigDump *msg, size_t *len) { + return (envoy_admin_v3_ClustersConfigDump_DynamicCluster**)_upb_array_mutable_accessor(msg, UPB_SIZE(16, 32), len); +} +UPB_INLINE envoy_admin_v3_ClustersConfigDump_DynamicCluster** envoy_admin_v3_ClustersConfigDump_resize_dynamic_warming_clusters(envoy_admin_v3_ClustersConfigDump *msg, size_t len, upb_arena *arena) { + return (envoy_admin_v3_ClustersConfigDump_DynamicCluster**)_upb_array_resize_accessor2(msg, UPB_SIZE(16, 32), len, UPB_SIZE(2, 3), arena); +} +UPB_INLINE struct envoy_admin_v3_ClustersConfigDump_DynamicCluster* envoy_admin_v3_ClustersConfigDump_add_dynamic_warming_clusters(envoy_admin_v3_ClustersConfigDump *msg, upb_arena *arena) { + struct envoy_admin_v3_ClustersConfigDump_DynamicCluster* sub = (struct envoy_admin_v3_ClustersConfigDump_DynamicCluster*)_upb_msg_new(&envoy_admin_v3_ClustersConfigDump_DynamicCluster_msginit, arena); + bool ok = _upb_array_append_accessor2( + msg, UPB_SIZE(16, 32), UPB_SIZE(2, 3), &sub, arena); + if (!ok) return NULL; + return sub; +} + +/* envoy.admin.v3.ClustersConfigDump.StaticCluster */ + +UPB_INLINE envoy_admin_v3_ClustersConfigDump_StaticCluster *envoy_admin_v3_ClustersConfigDump_StaticCluster_new(upb_arena *arena) { + return (envoy_admin_v3_ClustersConfigDump_StaticCluster *)_upb_msg_new(&envoy_admin_v3_ClustersConfigDump_StaticCluster_msginit, arena); +} +UPB_INLINE envoy_admin_v3_ClustersConfigDump_StaticCluster *envoy_admin_v3_ClustersConfigDump_StaticCluster_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_admin_v3_ClustersConfigDump_StaticCluster *ret = envoy_admin_v3_ClustersConfigDump_StaticCluster_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_admin_v3_ClustersConfigDump_StaticCluster_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_admin_v3_ClustersConfigDump_StaticCluster *envoy_admin_v3_ClustersConfigDump_StaticCluster_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_admin_v3_ClustersConfigDump_StaticCluster *ret = envoy_admin_v3_ClustersConfigDump_StaticCluster_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_admin_v3_ClustersConfigDump_StaticCluster_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_admin_v3_ClustersConfigDump_StaticCluster_serialize(const envoy_admin_v3_ClustersConfigDump_StaticCluster *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_admin_v3_ClustersConfigDump_StaticCluster_msginit, arena, len); +} + +UPB_INLINE bool envoy_admin_v3_ClustersConfigDump_StaticCluster_has_cluster(const envoy_admin_v3_ClustersConfigDump_StaticCluster *msg) { return _upb_hasbit(msg, 1); } +UPB_INLINE const struct google_protobuf_Any* envoy_admin_v3_ClustersConfigDump_StaticCluster_cluster(const envoy_admin_v3_ClustersConfigDump_StaticCluster *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), const struct google_protobuf_Any*); } +UPB_INLINE bool envoy_admin_v3_ClustersConfigDump_StaticCluster_has_last_updated(const envoy_admin_v3_ClustersConfigDump_StaticCluster *msg) { return _upb_hasbit(msg, 2); } +UPB_INLINE const struct google_protobuf_Timestamp* envoy_admin_v3_ClustersConfigDump_StaticCluster_last_updated(const envoy_admin_v3_ClustersConfigDump_StaticCluster *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(8, 16), const struct google_protobuf_Timestamp*); } + +UPB_INLINE void envoy_admin_v3_ClustersConfigDump_StaticCluster_set_cluster(envoy_admin_v3_ClustersConfigDump_StaticCluster *msg, struct google_protobuf_Any* value) { + _upb_sethas(msg, 1); + *UPB_PTR_AT(msg, UPB_SIZE(4, 8), struct google_protobuf_Any*) = value; +} +UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_ClustersConfigDump_StaticCluster_mutable_cluster(envoy_admin_v3_ClustersConfigDump_StaticCluster *msg, upb_arena *arena) { + struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_admin_v3_ClustersConfigDump_StaticCluster_cluster(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Any*)_upb_msg_new(&google_protobuf_Any_msginit, arena); + if (!sub) return NULL; + envoy_admin_v3_ClustersConfigDump_StaticCluster_set_cluster(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_admin_v3_ClustersConfigDump_StaticCluster_set_last_updated(envoy_admin_v3_ClustersConfigDump_StaticCluster *msg, struct google_protobuf_Timestamp* value) { + _upb_sethas(msg, 2); + *UPB_PTR_AT(msg, UPB_SIZE(8, 16), struct google_protobuf_Timestamp*) = value; +} +UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_ClustersConfigDump_StaticCluster_mutable_last_updated(envoy_admin_v3_ClustersConfigDump_StaticCluster *msg, upb_arena *arena) { + struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_ClustersConfigDump_StaticCluster_last_updated(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Timestamp*)_upb_msg_new(&google_protobuf_Timestamp_msginit, arena); + if (!sub) return NULL; + envoy_admin_v3_ClustersConfigDump_StaticCluster_set_last_updated(msg, sub); + } + return sub; +} + +/* envoy.admin.v3.ClustersConfigDump.DynamicCluster */ + +UPB_INLINE envoy_admin_v3_ClustersConfigDump_DynamicCluster *envoy_admin_v3_ClustersConfigDump_DynamicCluster_new(upb_arena *arena) { + return (envoy_admin_v3_ClustersConfigDump_DynamicCluster *)_upb_msg_new(&envoy_admin_v3_ClustersConfigDump_DynamicCluster_msginit, arena); +} +UPB_INLINE envoy_admin_v3_ClustersConfigDump_DynamicCluster *envoy_admin_v3_ClustersConfigDump_DynamicCluster_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_admin_v3_ClustersConfigDump_DynamicCluster *ret = envoy_admin_v3_ClustersConfigDump_DynamicCluster_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_admin_v3_ClustersConfigDump_DynamicCluster_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_admin_v3_ClustersConfigDump_DynamicCluster *envoy_admin_v3_ClustersConfigDump_DynamicCluster_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_admin_v3_ClustersConfigDump_DynamicCluster *ret = envoy_admin_v3_ClustersConfigDump_DynamicCluster_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_admin_v3_ClustersConfigDump_DynamicCluster_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_admin_v3_ClustersConfigDump_DynamicCluster_serialize(const envoy_admin_v3_ClustersConfigDump_DynamicCluster *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_admin_v3_ClustersConfigDump_DynamicCluster_msginit, arena, len); +} + +UPB_INLINE upb_strview envoy_admin_v3_ClustersConfigDump_DynamicCluster_version_info(const envoy_admin_v3_ClustersConfigDump_DynamicCluster *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(8, 8), upb_strview); } +UPB_INLINE bool envoy_admin_v3_ClustersConfigDump_DynamicCluster_has_cluster(const envoy_admin_v3_ClustersConfigDump_DynamicCluster *msg) { return _upb_hasbit(msg, 1); } +UPB_INLINE const struct google_protobuf_Any* envoy_admin_v3_ClustersConfigDump_DynamicCluster_cluster(const envoy_admin_v3_ClustersConfigDump_DynamicCluster *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(16, 24), const struct google_protobuf_Any*); } +UPB_INLINE bool envoy_admin_v3_ClustersConfigDump_DynamicCluster_has_last_updated(const envoy_admin_v3_ClustersConfigDump_DynamicCluster *msg) { return _upb_hasbit(msg, 2); } +UPB_INLINE const struct google_protobuf_Timestamp* envoy_admin_v3_ClustersConfigDump_DynamicCluster_last_updated(const envoy_admin_v3_ClustersConfigDump_DynamicCluster *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(20, 32), const struct google_protobuf_Timestamp*); } +UPB_INLINE bool envoy_admin_v3_ClustersConfigDump_DynamicCluster_has_error_state(const envoy_admin_v3_ClustersConfigDump_DynamicCluster *msg) { return _upb_hasbit(msg, 3); } +UPB_INLINE const envoy_admin_v3_UpdateFailureState* envoy_admin_v3_ClustersConfigDump_DynamicCluster_error_state(const envoy_admin_v3_ClustersConfigDump_DynamicCluster *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(24, 40), const envoy_admin_v3_UpdateFailureState*); } +UPB_INLINE int32_t envoy_admin_v3_ClustersConfigDump_DynamicCluster_client_status(const envoy_admin_v3_ClustersConfigDump_DynamicCluster *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t); } + +UPB_INLINE void envoy_admin_v3_ClustersConfigDump_DynamicCluster_set_version_info(envoy_admin_v3_ClustersConfigDump_DynamicCluster *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(8, 8), upb_strview) = value; +} +UPB_INLINE void envoy_admin_v3_ClustersConfigDump_DynamicCluster_set_cluster(envoy_admin_v3_ClustersConfigDump_DynamicCluster *msg, struct google_protobuf_Any* value) { + _upb_sethas(msg, 1); + *UPB_PTR_AT(msg, UPB_SIZE(16, 24), struct google_protobuf_Any*) = value; +} +UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_ClustersConfigDump_DynamicCluster_mutable_cluster(envoy_admin_v3_ClustersConfigDump_DynamicCluster *msg, upb_arena *arena) { + struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_admin_v3_ClustersConfigDump_DynamicCluster_cluster(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Any*)_upb_msg_new(&google_protobuf_Any_msginit, arena); + if (!sub) return NULL; + envoy_admin_v3_ClustersConfigDump_DynamicCluster_set_cluster(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_admin_v3_ClustersConfigDump_DynamicCluster_set_last_updated(envoy_admin_v3_ClustersConfigDump_DynamicCluster *msg, struct google_protobuf_Timestamp* value) { + _upb_sethas(msg, 2); + *UPB_PTR_AT(msg, UPB_SIZE(20, 32), struct google_protobuf_Timestamp*) = value; +} +UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_ClustersConfigDump_DynamicCluster_mutable_last_updated(envoy_admin_v3_ClustersConfigDump_DynamicCluster *msg, upb_arena *arena) { + struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_ClustersConfigDump_DynamicCluster_last_updated(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Timestamp*)_upb_msg_new(&google_protobuf_Timestamp_msginit, arena); + if (!sub) return NULL; + envoy_admin_v3_ClustersConfigDump_DynamicCluster_set_last_updated(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_admin_v3_ClustersConfigDump_DynamicCluster_set_error_state(envoy_admin_v3_ClustersConfigDump_DynamicCluster *msg, envoy_admin_v3_UpdateFailureState* value) { + _upb_sethas(msg, 3); + *UPB_PTR_AT(msg, UPB_SIZE(24, 40), envoy_admin_v3_UpdateFailureState*) = value; +} +UPB_INLINE struct envoy_admin_v3_UpdateFailureState* envoy_admin_v3_ClustersConfigDump_DynamicCluster_mutable_error_state(envoy_admin_v3_ClustersConfigDump_DynamicCluster *msg, upb_arena *arena) { + struct envoy_admin_v3_UpdateFailureState* sub = (struct envoy_admin_v3_UpdateFailureState*)envoy_admin_v3_ClustersConfigDump_DynamicCluster_error_state(msg); + if (sub == NULL) { + sub = (struct envoy_admin_v3_UpdateFailureState*)_upb_msg_new(&envoy_admin_v3_UpdateFailureState_msginit, arena); + if (!sub) return NULL; + envoy_admin_v3_ClustersConfigDump_DynamicCluster_set_error_state(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_admin_v3_ClustersConfigDump_DynamicCluster_set_client_status(envoy_admin_v3_ClustersConfigDump_DynamicCluster *msg, int32_t value) { + *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t) = value; +} + +/* envoy.admin.v3.RoutesConfigDump */ + +UPB_INLINE envoy_admin_v3_RoutesConfigDump *envoy_admin_v3_RoutesConfigDump_new(upb_arena *arena) { + return (envoy_admin_v3_RoutesConfigDump *)_upb_msg_new(&envoy_admin_v3_RoutesConfigDump_msginit, arena); +} +UPB_INLINE envoy_admin_v3_RoutesConfigDump *envoy_admin_v3_RoutesConfigDump_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_admin_v3_RoutesConfigDump *ret = envoy_admin_v3_RoutesConfigDump_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_admin_v3_RoutesConfigDump_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_admin_v3_RoutesConfigDump *envoy_admin_v3_RoutesConfigDump_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_admin_v3_RoutesConfigDump *ret = envoy_admin_v3_RoutesConfigDump_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_admin_v3_RoutesConfigDump_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_admin_v3_RoutesConfigDump_serialize(const envoy_admin_v3_RoutesConfigDump *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_admin_v3_RoutesConfigDump_msginit, arena, len); +} + +UPB_INLINE bool envoy_admin_v3_RoutesConfigDump_has_static_route_configs(const envoy_admin_v3_RoutesConfigDump *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(0, 0)); } +UPB_INLINE const envoy_admin_v3_RoutesConfigDump_StaticRouteConfig* const* envoy_admin_v3_RoutesConfigDump_static_route_configs(const envoy_admin_v3_RoutesConfigDump *msg, size_t *len) { return (const envoy_admin_v3_RoutesConfigDump_StaticRouteConfig* const*)_upb_array_accessor(msg, UPB_SIZE(0, 0), len); } +UPB_INLINE bool envoy_admin_v3_RoutesConfigDump_has_dynamic_route_configs(const envoy_admin_v3_RoutesConfigDump *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(4, 8)); } +UPB_INLINE const envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig* const* envoy_admin_v3_RoutesConfigDump_dynamic_route_configs(const envoy_admin_v3_RoutesConfigDump *msg, size_t *len) { return (const envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig* const*)_upb_array_accessor(msg, UPB_SIZE(4, 8), len); } + +UPB_INLINE envoy_admin_v3_RoutesConfigDump_StaticRouteConfig** envoy_admin_v3_RoutesConfigDump_mutable_static_route_configs(envoy_admin_v3_RoutesConfigDump *msg, size_t *len) { + return (envoy_admin_v3_RoutesConfigDump_StaticRouteConfig**)_upb_array_mutable_accessor(msg, UPB_SIZE(0, 0), len); +} +UPB_INLINE envoy_admin_v3_RoutesConfigDump_StaticRouteConfig** envoy_admin_v3_RoutesConfigDump_resize_static_route_configs(envoy_admin_v3_RoutesConfigDump *msg, size_t len, upb_arena *arena) { + return (envoy_admin_v3_RoutesConfigDump_StaticRouteConfig**)_upb_array_resize_accessor2(msg, UPB_SIZE(0, 0), len, UPB_SIZE(2, 3), arena); +} +UPB_INLINE struct envoy_admin_v3_RoutesConfigDump_StaticRouteConfig* envoy_admin_v3_RoutesConfigDump_add_static_route_configs(envoy_admin_v3_RoutesConfigDump *msg, upb_arena *arena) { + struct envoy_admin_v3_RoutesConfigDump_StaticRouteConfig* sub = (struct envoy_admin_v3_RoutesConfigDump_StaticRouteConfig*)_upb_msg_new(&envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_msginit, arena); + bool ok = _upb_array_append_accessor2( + msg, UPB_SIZE(0, 0), UPB_SIZE(2, 3), &sub, arena); + if (!ok) return NULL; + return sub; +} +UPB_INLINE envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig** envoy_admin_v3_RoutesConfigDump_mutable_dynamic_route_configs(envoy_admin_v3_RoutesConfigDump *msg, size_t *len) { + return (envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig**)_upb_array_mutable_accessor(msg, UPB_SIZE(4, 8), len); +} +UPB_INLINE envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig** envoy_admin_v3_RoutesConfigDump_resize_dynamic_route_configs(envoy_admin_v3_RoutesConfigDump *msg, size_t len, upb_arena *arena) { + return (envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig**)_upb_array_resize_accessor2(msg, UPB_SIZE(4, 8), len, UPB_SIZE(2, 3), arena); +} +UPB_INLINE struct envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig* envoy_admin_v3_RoutesConfigDump_add_dynamic_route_configs(envoy_admin_v3_RoutesConfigDump *msg, upb_arena *arena) { + struct envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig* sub = (struct envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig*)_upb_msg_new(&envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_msginit, arena); + bool ok = _upb_array_append_accessor2( + msg, UPB_SIZE(4, 8), UPB_SIZE(2, 3), &sub, arena); + if (!ok) return NULL; + return sub; +} + +/* envoy.admin.v3.RoutesConfigDump.StaticRouteConfig */ + +UPB_INLINE envoy_admin_v3_RoutesConfigDump_StaticRouteConfig *envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_new(upb_arena *arena) { + return (envoy_admin_v3_RoutesConfigDump_StaticRouteConfig *)_upb_msg_new(&envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_msginit, arena); +} +UPB_INLINE envoy_admin_v3_RoutesConfigDump_StaticRouteConfig *envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_admin_v3_RoutesConfigDump_StaticRouteConfig *ret = envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_admin_v3_RoutesConfigDump_StaticRouteConfig *envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_admin_v3_RoutesConfigDump_StaticRouteConfig *ret = envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_serialize(const envoy_admin_v3_RoutesConfigDump_StaticRouteConfig *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_msginit, arena, len); +} + +UPB_INLINE bool envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_has_route_config(const envoy_admin_v3_RoutesConfigDump_StaticRouteConfig *msg) { return _upb_hasbit(msg, 1); } +UPB_INLINE const struct google_protobuf_Any* envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_route_config(const envoy_admin_v3_RoutesConfigDump_StaticRouteConfig *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), const struct google_protobuf_Any*); } +UPB_INLINE bool envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_has_last_updated(const envoy_admin_v3_RoutesConfigDump_StaticRouteConfig *msg) { return _upb_hasbit(msg, 2); } +UPB_INLINE const struct google_protobuf_Timestamp* envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_last_updated(const envoy_admin_v3_RoutesConfigDump_StaticRouteConfig *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(8, 16), const struct google_protobuf_Timestamp*); } + +UPB_INLINE void envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_set_route_config(envoy_admin_v3_RoutesConfigDump_StaticRouteConfig *msg, struct google_protobuf_Any* value) { + _upb_sethas(msg, 1); + *UPB_PTR_AT(msg, UPB_SIZE(4, 8), struct google_protobuf_Any*) = value; +} +UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_mutable_route_config(envoy_admin_v3_RoutesConfigDump_StaticRouteConfig *msg, upb_arena *arena) { + struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_route_config(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Any*)_upb_msg_new(&google_protobuf_Any_msginit, arena); + if (!sub) return NULL; + envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_set_route_config(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_set_last_updated(envoy_admin_v3_RoutesConfigDump_StaticRouteConfig *msg, struct google_protobuf_Timestamp* value) { + _upb_sethas(msg, 2); + *UPB_PTR_AT(msg, UPB_SIZE(8, 16), struct google_protobuf_Timestamp*) = value; +} +UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_mutable_last_updated(envoy_admin_v3_RoutesConfigDump_StaticRouteConfig *msg, upb_arena *arena) { + struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_last_updated(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Timestamp*)_upb_msg_new(&google_protobuf_Timestamp_msginit, arena); + if (!sub) return NULL; + envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_set_last_updated(msg, sub); + } + return sub; +} + +/* envoy.admin.v3.RoutesConfigDump.DynamicRouteConfig */ + +UPB_INLINE envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig *envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_new(upb_arena *arena) { + return (envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig *)_upb_msg_new(&envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_msginit, arena); +} +UPB_INLINE envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig *envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig *ret = envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig *envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig *ret = envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_serialize(const envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_msginit, arena, len); +} + +UPB_INLINE upb_strview envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_version_info(const envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(8, 8), upb_strview); } +UPB_INLINE bool envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_has_route_config(const envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig *msg) { return _upb_hasbit(msg, 1); } +UPB_INLINE const struct google_protobuf_Any* envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_route_config(const envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(16, 24), const struct google_protobuf_Any*); } +UPB_INLINE bool envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_has_last_updated(const envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig *msg) { return _upb_hasbit(msg, 2); } +UPB_INLINE const struct google_protobuf_Timestamp* envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_last_updated(const envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(20, 32), const struct google_protobuf_Timestamp*); } +UPB_INLINE bool envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_has_error_state(const envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig *msg) { return _upb_hasbit(msg, 3); } +UPB_INLINE const envoy_admin_v3_UpdateFailureState* envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_error_state(const envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(24, 40), const envoy_admin_v3_UpdateFailureState*); } +UPB_INLINE int32_t envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_client_status(const envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t); } + +UPB_INLINE void envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_set_version_info(envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(8, 8), upb_strview) = value; +} +UPB_INLINE void envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_set_route_config(envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig *msg, struct google_protobuf_Any* value) { + _upb_sethas(msg, 1); + *UPB_PTR_AT(msg, UPB_SIZE(16, 24), struct google_protobuf_Any*) = value; +} +UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_mutable_route_config(envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig *msg, upb_arena *arena) { + struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_route_config(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Any*)_upb_msg_new(&google_protobuf_Any_msginit, arena); + if (!sub) return NULL; + envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_set_route_config(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_set_last_updated(envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig *msg, struct google_protobuf_Timestamp* value) { + _upb_sethas(msg, 2); + *UPB_PTR_AT(msg, UPB_SIZE(20, 32), struct google_protobuf_Timestamp*) = value; +} +UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_mutable_last_updated(envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig *msg, upb_arena *arena) { + struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_last_updated(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Timestamp*)_upb_msg_new(&google_protobuf_Timestamp_msginit, arena); + if (!sub) return NULL; + envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_set_last_updated(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_set_error_state(envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig *msg, envoy_admin_v3_UpdateFailureState* value) { + _upb_sethas(msg, 3); + *UPB_PTR_AT(msg, UPB_SIZE(24, 40), envoy_admin_v3_UpdateFailureState*) = value; +} +UPB_INLINE struct envoy_admin_v3_UpdateFailureState* envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_mutable_error_state(envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig *msg, upb_arena *arena) { + struct envoy_admin_v3_UpdateFailureState* sub = (struct envoy_admin_v3_UpdateFailureState*)envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_error_state(msg); + if (sub == NULL) { + sub = (struct envoy_admin_v3_UpdateFailureState*)_upb_msg_new(&envoy_admin_v3_UpdateFailureState_msginit, arena); + if (!sub) return NULL; + envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_set_error_state(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_set_client_status(envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig *msg, int32_t value) { + *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t) = value; +} + +/* envoy.admin.v3.ScopedRoutesConfigDump */ + +UPB_INLINE envoy_admin_v3_ScopedRoutesConfigDump *envoy_admin_v3_ScopedRoutesConfigDump_new(upb_arena *arena) { + return (envoy_admin_v3_ScopedRoutesConfigDump *)_upb_msg_new(&envoy_admin_v3_ScopedRoutesConfigDump_msginit, arena); +} +UPB_INLINE envoy_admin_v3_ScopedRoutesConfigDump *envoy_admin_v3_ScopedRoutesConfigDump_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_admin_v3_ScopedRoutesConfigDump *ret = envoy_admin_v3_ScopedRoutesConfigDump_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_admin_v3_ScopedRoutesConfigDump_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_admin_v3_ScopedRoutesConfigDump *envoy_admin_v3_ScopedRoutesConfigDump_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_admin_v3_ScopedRoutesConfigDump *ret = envoy_admin_v3_ScopedRoutesConfigDump_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_admin_v3_ScopedRoutesConfigDump_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_admin_v3_ScopedRoutesConfigDump_serialize(const envoy_admin_v3_ScopedRoutesConfigDump *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_admin_v3_ScopedRoutesConfigDump_msginit, arena, len); +} + +UPB_INLINE bool envoy_admin_v3_ScopedRoutesConfigDump_has_inline_scoped_route_configs(const envoy_admin_v3_ScopedRoutesConfigDump *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(0, 0)); } +UPB_INLINE const envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs* const* envoy_admin_v3_ScopedRoutesConfigDump_inline_scoped_route_configs(const envoy_admin_v3_ScopedRoutesConfigDump *msg, size_t *len) { return (const envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs* const*)_upb_array_accessor(msg, UPB_SIZE(0, 0), len); } +UPB_INLINE bool envoy_admin_v3_ScopedRoutesConfigDump_has_dynamic_scoped_route_configs(const envoy_admin_v3_ScopedRoutesConfigDump *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(4, 8)); } +UPB_INLINE const envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs* const* envoy_admin_v3_ScopedRoutesConfigDump_dynamic_scoped_route_configs(const envoy_admin_v3_ScopedRoutesConfigDump *msg, size_t *len) { return (const envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs* const*)_upb_array_accessor(msg, UPB_SIZE(4, 8), len); } + +UPB_INLINE envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs** envoy_admin_v3_ScopedRoutesConfigDump_mutable_inline_scoped_route_configs(envoy_admin_v3_ScopedRoutesConfigDump *msg, size_t *len) { + return (envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs**)_upb_array_mutable_accessor(msg, UPB_SIZE(0, 0), len); +} +UPB_INLINE envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs** envoy_admin_v3_ScopedRoutesConfigDump_resize_inline_scoped_route_configs(envoy_admin_v3_ScopedRoutesConfigDump *msg, size_t len, upb_arena *arena) { + return (envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs**)_upb_array_resize_accessor2(msg, UPB_SIZE(0, 0), len, UPB_SIZE(2, 3), arena); +} +UPB_INLINE struct envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs* envoy_admin_v3_ScopedRoutesConfigDump_add_inline_scoped_route_configs(envoy_admin_v3_ScopedRoutesConfigDump *msg, upb_arena *arena) { + struct envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs* sub = (struct envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs*)_upb_msg_new(&envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_msginit, arena); + bool ok = _upb_array_append_accessor2( + msg, UPB_SIZE(0, 0), UPB_SIZE(2, 3), &sub, arena); + if (!ok) return NULL; + return sub; +} +UPB_INLINE envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs** envoy_admin_v3_ScopedRoutesConfigDump_mutable_dynamic_scoped_route_configs(envoy_admin_v3_ScopedRoutesConfigDump *msg, size_t *len) { + return (envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs**)_upb_array_mutable_accessor(msg, UPB_SIZE(4, 8), len); +} +UPB_INLINE envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs** envoy_admin_v3_ScopedRoutesConfigDump_resize_dynamic_scoped_route_configs(envoy_admin_v3_ScopedRoutesConfigDump *msg, size_t len, upb_arena *arena) { + return (envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs**)_upb_array_resize_accessor2(msg, UPB_SIZE(4, 8), len, UPB_SIZE(2, 3), arena); +} +UPB_INLINE struct envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs* envoy_admin_v3_ScopedRoutesConfigDump_add_dynamic_scoped_route_configs(envoy_admin_v3_ScopedRoutesConfigDump *msg, upb_arena *arena) { + struct envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs* sub = (struct envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs*)_upb_msg_new(&envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_msginit, arena); + bool ok = _upb_array_append_accessor2( + msg, UPB_SIZE(4, 8), UPB_SIZE(2, 3), &sub, arena); + if (!ok) return NULL; + return sub; +} + +/* envoy.admin.v3.ScopedRoutesConfigDump.InlineScopedRouteConfigs */ + +UPB_INLINE envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs *envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_new(upb_arena *arena) { + return (envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs *)_upb_msg_new(&envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_msginit, arena); +} +UPB_INLINE envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs *envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs *ret = envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs *envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs *ret = envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_serialize(const envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_msginit, arena, len); +} + +UPB_INLINE upb_strview envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_name(const envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview); } +UPB_INLINE bool envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_has_scoped_route_configs(const envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(16, 32)); } +UPB_INLINE const struct google_protobuf_Any* const* envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_scoped_route_configs(const envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs *msg, size_t *len) { return (const struct google_protobuf_Any* const*)_upb_array_accessor(msg, UPB_SIZE(16, 32), len); } +UPB_INLINE bool envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_has_last_updated(const envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs *msg) { return _upb_hasbit(msg, 1); } +UPB_INLINE const struct google_protobuf_Timestamp* envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_last_updated(const envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(12, 24), const struct google_protobuf_Timestamp*); } + +UPB_INLINE void envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_set_name(envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview) = value; +} +UPB_INLINE struct google_protobuf_Any** envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_mutable_scoped_route_configs(envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs *msg, size_t *len) { + return (struct google_protobuf_Any**)_upb_array_mutable_accessor(msg, UPB_SIZE(16, 32), len); +} +UPB_INLINE struct google_protobuf_Any** envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_resize_scoped_route_configs(envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs *msg, size_t len, upb_arena *arena) { + return (struct google_protobuf_Any**)_upb_array_resize_accessor2(msg, UPB_SIZE(16, 32), len, UPB_SIZE(2, 3), arena); +} +UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_add_scoped_route_configs(envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs *msg, upb_arena *arena) { + struct google_protobuf_Any* sub = (struct google_protobuf_Any*)_upb_msg_new(&google_protobuf_Any_msginit, arena); + bool ok = _upb_array_append_accessor2( + msg, UPB_SIZE(16, 32), UPB_SIZE(2, 3), &sub, arena); + if (!ok) return NULL; + return sub; +} +UPB_INLINE void envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_set_last_updated(envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs *msg, struct google_protobuf_Timestamp* value) { + _upb_sethas(msg, 1); + *UPB_PTR_AT(msg, UPB_SIZE(12, 24), struct google_protobuf_Timestamp*) = value; +} +UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_mutable_last_updated(envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs *msg, upb_arena *arena) { + struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_last_updated(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Timestamp*)_upb_msg_new(&google_protobuf_Timestamp_msginit, arena); + if (!sub) return NULL; + envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_set_last_updated(msg, sub); + } + return sub; +} + +/* envoy.admin.v3.ScopedRoutesConfigDump.DynamicScopedRouteConfigs */ + +UPB_INLINE envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs *envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_new(upb_arena *arena) { + return (envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs *)_upb_msg_new(&envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_msginit, arena); +} +UPB_INLINE envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs *envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs *ret = envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs *envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs *ret = envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_serialize(const envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_msginit, arena, len); +} + +UPB_INLINE upb_strview envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_name(const envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(8, 8), upb_strview); } +UPB_INLINE upb_strview envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_version_info(const envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(16, 24), upb_strview); } +UPB_INLINE bool envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_has_scoped_route_configs(const envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(32, 56)); } +UPB_INLINE const struct google_protobuf_Any* const* envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_scoped_route_configs(const envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs *msg, size_t *len) { return (const struct google_protobuf_Any* const*)_upb_array_accessor(msg, UPB_SIZE(32, 56), len); } +UPB_INLINE bool envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_has_last_updated(const envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs *msg) { return _upb_hasbit(msg, 1); } +UPB_INLINE const struct google_protobuf_Timestamp* envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_last_updated(const envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(24, 40), const struct google_protobuf_Timestamp*); } +UPB_INLINE bool envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_has_error_state(const envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs *msg) { return _upb_hasbit(msg, 2); } +UPB_INLINE const envoy_admin_v3_UpdateFailureState* envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_error_state(const envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(28, 48), const envoy_admin_v3_UpdateFailureState*); } +UPB_INLINE int32_t envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_client_status(const envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t); } + +UPB_INLINE void envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_set_name(envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(8, 8), upb_strview) = value; +} +UPB_INLINE void envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_set_version_info(envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(16, 24), upb_strview) = value; +} +UPB_INLINE struct google_protobuf_Any** envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_mutable_scoped_route_configs(envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs *msg, size_t *len) { + return (struct google_protobuf_Any**)_upb_array_mutable_accessor(msg, UPB_SIZE(32, 56), len); +} +UPB_INLINE struct google_protobuf_Any** envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_resize_scoped_route_configs(envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs *msg, size_t len, upb_arena *arena) { + return (struct google_protobuf_Any**)_upb_array_resize_accessor2(msg, UPB_SIZE(32, 56), len, UPB_SIZE(2, 3), arena); +} +UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_add_scoped_route_configs(envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs *msg, upb_arena *arena) { + struct google_protobuf_Any* sub = (struct google_protobuf_Any*)_upb_msg_new(&google_protobuf_Any_msginit, arena); + bool ok = _upb_array_append_accessor2( + msg, UPB_SIZE(32, 56), UPB_SIZE(2, 3), &sub, arena); + if (!ok) return NULL; + return sub; +} +UPB_INLINE void envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_set_last_updated(envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs *msg, struct google_protobuf_Timestamp* value) { + _upb_sethas(msg, 1); + *UPB_PTR_AT(msg, UPB_SIZE(24, 40), struct google_protobuf_Timestamp*) = value; +} +UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_mutable_last_updated(envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs *msg, upb_arena *arena) { + struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_last_updated(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Timestamp*)_upb_msg_new(&google_protobuf_Timestamp_msginit, arena); + if (!sub) return NULL; + envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_set_last_updated(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_set_error_state(envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs *msg, envoy_admin_v3_UpdateFailureState* value) { + _upb_sethas(msg, 2); + *UPB_PTR_AT(msg, UPB_SIZE(28, 48), envoy_admin_v3_UpdateFailureState*) = value; +} +UPB_INLINE struct envoy_admin_v3_UpdateFailureState* envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_mutable_error_state(envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs *msg, upb_arena *arena) { + struct envoy_admin_v3_UpdateFailureState* sub = (struct envoy_admin_v3_UpdateFailureState*)envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_error_state(msg); + if (sub == NULL) { + sub = (struct envoy_admin_v3_UpdateFailureState*)_upb_msg_new(&envoy_admin_v3_UpdateFailureState_msginit, arena); + if (!sub) return NULL; + envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_set_error_state(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_set_client_status(envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs *msg, int32_t value) { + *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t) = value; +} + +/* envoy.admin.v3.SecretsConfigDump */ + +UPB_INLINE envoy_admin_v3_SecretsConfigDump *envoy_admin_v3_SecretsConfigDump_new(upb_arena *arena) { + return (envoy_admin_v3_SecretsConfigDump *)_upb_msg_new(&envoy_admin_v3_SecretsConfigDump_msginit, arena); +} +UPB_INLINE envoy_admin_v3_SecretsConfigDump *envoy_admin_v3_SecretsConfigDump_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_admin_v3_SecretsConfigDump *ret = envoy_admin_v3_SecretsConfigDump_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_admin_v3_SecretsConfigDump_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_admin_v3_SecretsConfigDump *envoy_admin_v3_SecretsConfigDump_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_admin_v3_SecretsConfigDump *ret = envoy_admin_v3_SecretsConfigDump_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_admin_v3_SecretsConfigDump_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_admin_v3_SecretsConfigDump_serialize(const envoy_admin_v3_SecretsConfigDump *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_admin_v3_SecretsConfigDump_msginit, arena, len); +} + +UPB_INLINE bool envoy_admin_v3_SecretsConfigDump_has_static_secrets(const envoy_admin_v3_SecretsConfigDump *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(0, 0)); } +UPB_INLINE const envoy_admin_v3_SecretsConfigDump_StaticSecret* const* envoy_admin_v3_SecretsConfigDump_static_secrets(const envoy_admin_v3_SecretsConfigDump *msg, size_t *len) { return (const envoy_admin_v3_SecretsConfigDump_StaticSecret* const*)_upb_array_accessor(msg, UPB_SIZE(0, 0), len); } +UPB_INLINE bool envoy_admin_v3_SecretsConfigDump_has_dynamic_active_secrets(const envoy_admin_v3_SecretsConfigDump *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(4, 8)); } +UPB_INLINE const envoy_admin_v3_SecretsConfigDump_DynamicSecret* const* envoy_admin_v3_SecretsConfigDump_dynamic_active_secrets(const envoy_admin_v3_SecretsConfigDump *msg, size_t *len) { return (const envoy_admin_v3_SecretsConfigDump_DynamicSecret* const*)_upb_array_accessor(msg, UPB_SIZE(4, 8), len); } +UPB_INLINE bool envoy_admin_v3_SecretsConfigDump_has_dynamic_warming_secrets(const envoy_admin_v3_SecretsConfigDump *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(8, 16)); } +UPB_INLINE const envoy_admin_v3_SecretsConfigDump_DynamicSecret* const* envoy_admin_v3_SecretsConfigDump_dynamic_warming_secrets(const envoy_admin_v3_SecretsConfigDump *msg, size_t *len) { return (const envoy_admin_v3_SecretsConfigDump_DynamicSecret* const*)_upb_array_accessor(msg, UPB_SIZE(8, 16), len); } + +UPB_INLINE envoy_admin_v3_SecretsConfigDump_StaticSecret** envoy_admin_v3_SecretsConfigDump_mutable_static_secrets(envoy_admin_v3_SecretsConfigDump *msg, size_t *len) { + return (envoy_admin_v3_SecretsConfigDump_StaticSecret**)_upb_array_mutable_accessor(msg, UPB_SIZE(0, 0), len); +} +UPB_INLINE envoy_admin_v3_SecretsConfigDump_StaticSecret** envoy_admin_v3_SecretsConfigDump_resize_static_secrets(envoy_admin_v3_SecretsConfigDump *msg, size_t len, upb_arena *arena) { + return (envoy_admin_v3_SecretsConfigDump_StaticSecret**)_upb_array_resize_accessor2(msg, UPB_SIZE(0, 0), len, UPB_SIZE(2, 3), arena); +} +UPB_INLINE struct envoy_admin_v3_SecretsConfigDump_StaticSecret* envoy_admin_v3_SecretsConfigDump_add_static_secrets(envoy_admin_v3_SecretsConfigDump *msg, upb_arena *arena) { + struct envoy_admin_v3_SecretsConfigDump_StaticSecret* sub = (struct envoy_admin_v3_SecretsConfigDump_StaticSecret*)_upb_msg_new(&envoy_admin_v3_SecretsConfigDump_StaticSecret_msginit, arena); + bool ok = _upb_array_append_accessor2( + msg, UPB_SIZE(0, 0), UPB_SIZE(2, 3), &sub, arena); + if (!ok) return NULL; + return sub; +} +UPB_INLINE envoy_admin_v3_SecretsConfigDump_DynamicSecret** envoy_admin_v3_SecretsConfigDump_mutable_dynamic_active_secrets(envoy_admin_v3_SecretsConfigDump *msg, size_t *len) { + return (envoy_admin_v3_SecretsConfigDump_DynamicSecret**)_upb_array_mutable_accessor(msg, UPB_SIZE(4, 8), len); +} +UPB_INLINE envoy_admin_v3_SecretsConfigDump_DynamicSecret** envoy_admin_v3_SecretsConfigDump_resize_dynamic_active_secrets(envoy_admin_v3_SecretsConfigDump *msg, size_t len, upb_arena *arena) { + return (envoy_admin_v3_SecretsConfigDump_DynamicSecret**)_upb_array_resize_accessor2(msg, UPB_SIZE(4, 8), len, UPB_SIZE(2, 3), arena); +} +UPB_INLINE struct envoy_admin_v3_SecretsConfigDump_DynamicSecret* envoy_admin_v3_SecretsConfigDump_add_dynamic_active_secrets(envoy_admin_v3_SecretsConfigDump *msg, upb_arena *arena) { + struct envoy_admin_v3_SecretsConfigDump_DynamicSecret* sub = (struct envoy_admin_v3_SecretsConfigDump_DynamicSecret*)_upb_msg_new(&envoy_admin_v3_SecretsConfigDump_DynamicSecret_msginit, arena); + bool ok = _upb_array_append_accessor2( + msg, UPB_SIZE(4, 8), UPB_SIZE(2, 3), &sub, arena); + if (!ok) return NULL; + return sub; +} +UPB_INLINE envoy_admin_v3_SecretsConfigDump_DynamicSecret** envoy_admin_v3_SecretsConfigDump_mutable_dynamic_warming_secrets(envoy_admin_v3_SecretsConfigDump *msg, size_t *len) { + return (envoy_admin_v3_SecretsConfigDump_DynamicSecret**)_upb_array_mutable_accessor(msg, UPB_SIZE(8, 16), len); +} +UPB_INLINE envoy_admin_v3_SecretsConfigDump_DynamicSecret** envoy_admin_v3_SecretsConfigDump_resize_dynamic_warming_secrets(envoy_admin_v3_SecretsConfigDump *msg, size_t len, upb_arena *arena) { + return (envoy_admin_v3_SecretsConfigDump_DynamicSecret**)_upb_array_resize_accessor2(msg, UPB_SIZE(8, 16), len, UPB_SIZE(2, 3), arena); +} +UPB_INLINE struct envoy_admin_v3_SecretsConfigDump_DynamicSecret* envoy_admin_v3_SecretsConfigDump_add_dynamic_warming_secrets(envoy_admin_v3_SecretsConfigDump *msg, upb_arena *arena) { + struct envoy_admin_v3_SecretsConfigDump_DynamicSecret* sub = (struct envoy_admin_v3_SecretsConfigDump_DynamicSecret*)_upb_msg_new(&envoy_admin_v3_SecretsConfigDump_DynamicSecret_msginit, arena); + bool ok = _upb_array_append_accessor2( + msg, UPB_SIZE(8, 16), UPB_SIZE(2, 3), &sub, arena); + if (!ok) return NULL; + return sub; +} + +/* envoy.admin.v3.SecretsConfigDump.DynamicSecret */ + +UPB_INLINE envoy_admin_v3_SecretsConfigDump_DynamicSecret *envoy_admin_v3_SecretsConfigDump_DynamicSecret_new(upb_arena *arena) { + return (envoy_admin_v3_SecretsConfigDump_DynamicSecret *)_upb_msg_new(&envoy_admin_v3_SecretsConfigDump_DynamicSecret_msginit, arena); +} +UPB_INLINE envoy_admin_v3_SecretsConfigDump_DynamicSecret *envoy_admin_v3_SecretsConfigDump_DynamicSecret_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_admin_v3_SecretsConfigDump_DynamicSecret *ret = envoy_admin_v3_SecretsConfigDump_DynamicSecret_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_admin_v3_SecretsConfigDump_DynamicSecret_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_admin_v3_SecretsConfigDump_DynamicSecret *envoy_admin_v3_SecretsConfigDump_DynamicSecret_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_admin_v3_SecretsConfigDump_DynamicSecret *ret = envoy_admin_v3_SecretsConfigDump_DynamicSecret_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_admin_v3_SecretsConfigDump_DynamicSecret_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_admin_v3_SecretsConfigDump_DynamicSecret_serialize(const envoy_admin_v3_SecretsConfigDump_DynamicSecret *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_admin_v3_SecretsConfigDump_DynamicSecret_msginit, arena, len); +} + +UPB_INLINE upb_strview envoy_admin_v3_SecretsConfigDump_DynamicSecret_name(const envoy_admin_v3_SecretsConfigDump_DynamicSecret *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(8, 8), upb_strview); } +UPB_INLINE upb_strview envoy_admin_v3_SecretsConfigDump_DynamicSecret_version_info(const envoy_admin_v3_SecretsConfigDump_DynamicSecret *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(16, 24), upb_strview); } +UPB_INLINE bool envoy_admin_v3_SecretsConfigDump_DynamicSecret_has_last_updated(const envoy_admin_v3_SecretsConfigDump_DynamicSecret *msg) { return _upb_hasbit(msg, 1); } +UPB_INLINE const struct google_protobuf_Timestamp* envoy_admin_v3_SecretsConfigDump_DynamicSecret_last_updated(const envoy_admin_v3_SecretsConfigDump_DynamicSecret *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(24, 40), const struct google_protobuf_Timestamp*); } +UPB_INLINE bool envoy_admin_v3_SecretsConfigDump_DynamicSecret_has_secret(const envoy_admin_v3_SecretsConfigDump_DynamicSecret *msg) { return _upb_hasbit(msg, 2); } +UPB_INLINE const struct google_protobuf_Any* envoy_admin_v3_SecretsConfigDump_DynamicSecret_secret(const envoy_admin_v3_SecretsConfigDump_DynamicSecret *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(28, 48), const struct google_protobuf_Any*); } +UPB_INLINE bool envoy_admin_v3_SecretsConfigDump_DynamicSecret_has_error_state(const envoy_admin_v3_SecretsConfigDump_DynamicSecret *msg) { return _upb_hasbit(msg, 3); } +UPB_INLINE const envoy_admin_v3_UpdateFailureState* envoy_admin_v3_SecretsConfigDump_DynamicSecret_error_state(const envoy_admin_v3_SecretsConfigDump_DynamicSecret *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(32, 56), const envoy_admin_v3_UpdateFailureState*); } +UPB_INLINE int32_t envoy_admin_v3_SecretsConfigDump_DynamicSecret_client_status(const envoy_admin_v3_SecretsConfigDump_DynamicSecret *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t); } + +UPB_INLINE void envoy_admin_v3_SecretsConfigDump_DynamicSecret_set_name(envoy_admin_v3_SecretsConfigDump_DynamicSecret *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(8, 8), upb_strview) = value; +} +UPB_INLINE void envoy_admin_v3_SecretsConfigDump_DynamicSecret_set_version_info(envoy_admin_v3_SecretsConfigDump_DynamicSecret *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(16, 24), upb_strview) = value; +} +UPB_INLINE void envoy_admin_v3_SecretsConfigDump_DynamicSecret_set_last_updated(envoy_admin_v3_SecretsConfigDump_DynamicSecret *msg, struct google_protobuf_Timestamp* value) { + _upb_sethas(msg, 1); + *UPB_PTR_AT(msg, UPB_SIZE(24, 40), struct google_protobuf_Timestamp*) = value; +} +UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_SecretsConfigDump_DynamicSecret_mutable_last_updated(envoy_admin_v3_SecretsConfigDump_DynamicSecret *msg, upb_arena *arena) { + struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_SecretsConfigDump_DynamicSecret_last_updated(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Timestamp*)_upb_msg_new(&google_protobuf_Timestamp_msginit, arena); + if (!sub) return NULL; + envoy_admin_v3_SecretsConfigDump_DynamicSecret_set_last_updated(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_admin_v3_SecretsConfigDump_DynamicSecret_set_secret(envoy_admin_v3_SecretsConfigDump_DynamicSecret *msg, struct google_protobuf_Any* value) { + _upb_sethas(msg, 2); + *UPB_PTR_AT(msg, UPB_SIZE(28, 48), struct google_protobuf_Any*) = value; +} +UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_SecretsConfigDump_DynamicSecret_mutable_secret(envoy_admin_v3_SecretsConfigDump_DynamicSecret *msg, upb_arena *arena) { + struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_admin_v3_SecretsConfigDump_DynamicSecret_secret(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Any*)_upb_msg_new(&google_protobuf_Any_msginit, arena); + if (!sub) return NULL; + envoy_admin_v3_SecretsConfigDump_DynamicSecret_set_secret(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_admin_v3_SecretsConfigDump_DynamicSecret_set_error_state(envoy_admin_v3_SecretsConfigDump_DynamicSecret *msg, envoy_admin_v3_UpdateFailureState* value) { + _upb_sethas(msg, 3); + *UPB_PTR_AT(msg, UPB_SIZE(32, 56), envoy_admin_v3_UpdateFailureState*) = value; +} +UPB_INLINE struct envoy_admin_v3_UpdateFailureState* envoy_admin_v3_SecretsConfigDump_DynamicSecret_mutable_error_state(envoy_admin_v3_SecretsConfigDump_DynamicSecret *msg, upb_arena *arena) { + struct envoy_admin_v3_UpdateFailureState* sub = (struct envoy_admin_v3_UpdateFailureState*)envoy_admin_v3_SecretsConfigDump_DynamicSecret_error_state(msg); + if (sub == NULL) { + sub = (struct envoy_admin_v3_UpdateFailureState*)_upb_msg_new(&envoy_admin_v3_UpdateFailureState_msginit, arena); + if (!sub) return NULL; + envoy_admin_v3_SecretsConfigDump_DynamicSecret_set_error_state(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_admin_v3_SecretsConfigDump_DynamicSecret_set_client_status(envoy_admin_v3_SecretsConfigDump_DynamicSecret *msg, int32_t value) { + *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t) = value; +} + +/* envoy.admin.v3.SecretsConfigDump.StaticSecret */ + +UPB_INLINE envoy_admin_v3_SecretsConfigDump_StaticSecret *envoy_admin_v3_SecretsConfigDump_StaticSecret_new(upb_arena *arena) { + return (envoy_admin_v3_SecretsConfigDump_StaticSecret *)_upb_msg_new(&envoy_admin_v3_SecretsConfigDump_StaticSecret_msginit, arena); +} +UPB_INLINE envoy_admin_v3_SecretsConfigDump_StaticSecret *envoy_admin_v3_SecretsConfigDump_StaticSecret_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_admin_v3_SecretsConfigDump_StaticSecret *ret = envoy_admin_v3_SecretsConfigDump_StaticSecret_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_admin_v3_SecretsConfigDump_StaticSecret_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_admin_v3_SecretsConfigDump_StaticSecret *envoy_admin_v3_SecretsConfigDump_StaticSecret_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_admin_v3_SecretsConfigDump_StaticSecret *ret = envoy_admin_v3_SecretsConfigDump_StaticSecret_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_admin_v3_SecretsConfigDump_StaticSecret_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_admin_v3_SecretsConfigDump_StaticSecret_serialize(const envoy_admin_v3_SecretsConfigDump_StaticSecret *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_admin_v3_SecretsConfigDump_StaticSecret_msginit, arena, len); +} + +UPB_INLINE upb_strview envoy_admin_v3_SecretsConfigDump_StaticSecret_name(const envoy_admin_v3_SecretsConfigDump_StaticSecret *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview); } +UPB_INLINE bool envoy_admin_v3_SecretsConfigDump_StaticSecret_has_last_updated(const envoy_admin_v3_SecretsConfigDump_StaticSecret *msg) { return _upb_hasbit(msg, 1); } +UPB_INLINE const struct google_protobuf_Timestamp* envoy_admin_v3_SecretsConfigDump_StaticSecret_last_updated(const envoy_admin_v3_SecretsConfigDump_StaticSecret *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(12, 24), const struct google_protobuf_Timestamp*); } +UPB_INLINE bool envoy_admin_v3_SecretsConfigDump_StaticSecret_has_secret(const envoy_admin_v3_SecretsConfigDump_StaticSecret *msg) { return _upb_hasbit(msg, 2); } +UPB_INLINE const struct google_protobuf_Any* envoy_admin_v3_SecretsConfigDump_StaticSecret_secret(const envoy_admin_v3_SecretsConfigDump_StaticSecret *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(16, 32), const struct google_protobuf_Any*); } + +UPB_INLINE void envoy_admin_v3_SecretsConfigDump_StaticSecret_set_name(envoy_admin_v3_SecretsConfigDump_StaticSecret *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview) = value; +} +UPB_INLINE void envoy_admin_v3_SecretsConfigDump_StaticSecret_set_last_updated(envoy_admin_v3_SecretsConfigDump_StaticSecret *msg, struct google_protobuf_Timestamp* value) { + _upb_sethas(msg, 1); + *UPB_PTR_AT(msg, UPB_SIZE(12, 24), struct google_protobuf_Timestamp*) = value; +} +UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_SecretsConfigDump_StaticSecret_mutable_last_updated(envoy_admin_v3_SecretsConfigDump_StaticSecret *msg, upb_arena *arena) { + struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_SecretsConfigDump_StaticSecret_last_updated(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Timestamp*)_upb_msg_new(&google_protobuf_Timestamp_msginit, arena); + if (!sub) return NULL; + envoy_admin_v3_SecretsConfigDump_StaticSecret_set_last_updated(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_admin_v3_SecretsConfigDump_StaticSecret_set_secret(envoy_admin_v3_SecretsConfigDump_StaticSecret *msg, struct google_protobuf_Any* value) { + _upb_sethas(msg, 2); + *UPB_PTR_AT(msg, UPB_SIZE(16, 32), struct google_protobuf_Any*) = value; +} +UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_SecretsConfigDump_StaticSecret_mutable_secret(envoy_admin_v3_SecretsConfigDump_StaticSecret *msg, upb_arena *arena) { + struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_admin_v3_SecretsConfigDump_StaticSecret_secret(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Any*)_upb_msg_new(&google_protobuf_Any_msginit, arena); + if (!sub) return NULL; + envoy_admin_v3_SecretsConfigDump_StaticSecret_set_secret(msg, sub); + } + return sub; +} + +/* envoy.admin.v3.EndpointsConfigDump */ + +UPB_INLINE envoy_admin_v3_EndpointsConfigDump *envoy_admin_v3_EndpointsConfigDump_new(upb_arena *arena) { + return (envoy_admin_v3_EndpointsConfigDump *)_upb_msg_new(&envoy_admin_v3_EndpointsConfigDump_msginit, arena); +} +UPB_INLINE envoy_admin_v3_EndpointsConfigDump *envoy_admin_v3_EndpointsConfigDump_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_admin_v3_EndpointsConfigDump *ret = envoy_admin_v3_EndpointsConfigDump_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_admin_v3_EndpointsConfigDump_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_admin_v3_EndpointsConfigDump *envoy_admin_v3_EndpointsConfigDump_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_admin_v3_EndpointsConfigDump *ret = envoy_admin_v3_EndpointsConfigDump_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_admin_v3_EndpointsConfigDump_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_admin_v3_EndpointsConfigDump_serialize(const envoy_admin_v3_EndpointsConfigDump *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_admin_v3_EndpointsConfigDump_msginit, arena, len); +} + +UPB_INLINE bool envoy_admin_v3_EndpointsConfigDump_has_static_endpoint_configs(const envoy_admin_v3_EndpointsConfigDump *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(0, 0)); } +UPB_INLINE const envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig* const* envoy_admin_v3_EndpointsConfigDump_static_endpoint_configs(const envoy_admin_v3_EndpointsConfigDump *msg, size_t *len) { return (const envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig* const*)_upb_array_accessor(msg, UPB_SIZE(0, 0), len); } +UPB_INLINE bool envoy_admin_v3_EndpointsConfigDump_has_dynamic_endpoint_configs(const envoy_admin_v3_EndpointsConfigDump *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(4, 8)); } +UPB_INLINE const envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig* const* envoy_admin_v3_EndpointsConfigDump_dynamic_endpoint_configs(const envoy_admin_v3_EndpointsConfigDump *msg, size_t *len) { return (const envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig* const*)_upb_array_accessor(msg, UPB_SIZE(4, 8), len); } + +UPB_INLINE envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig** envoy_admin_v3_EndpointsConfigDump_mutable_static_endpoint_configs(envoy_admin_v3_EndpointsConfigDump *msg, size_t *len) { + return (envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig**)_upb_array_mutable_accessor(msg, UPB_SIZE(0, 0), len); +} +UPB_INLINE envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig** envoy_admin_v3_EndpointsConfigDump_resize_static_endpoint_configs(envoy_admin_v3_EndpointsConfigDump *msg, size_t len, upb_arena *arena) { + return (envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig**)_upb_array_resize_accessor2(msg, UPB_SIZE(0, 0), len, UPB_SIZE(2, 3), arena); +} +UPB_INLINE struct envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig* envoy_admin_v3_EndpointsConfigDump_add_static_endpoint_configs(envoy_admin_v3_EndpointsConfigDump *msg, upb_arena *arena) { + struct envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig* sub = (struct envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig*)_upb_msg_new(&envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_msginit, arena); + bool ok = _upb_array_append_accessor2( + msg, UPB_SIZE(0, 0), UPB_SIZE(2, 3), &sub, arena); + if (!ok) return NULL; + return sub; +} +UPB_INLINE envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig** envoy_admin_v3_EndpointsConfigDump_mutable_dynamic_endpoint_configs(envoy_admin_v3_EndpointsConfigDump *msg, size_t *len) { + return (envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig**)_upb_array_mutable_accessor(msg, UPB_SIZE(4, 8), len); +} +UPB_INLINE envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig** envoy_admin_v3_EndpointsConfigDump_resize_dynamic_endpoint_configs(envoy_admin_v3_EndpointsConfigDump *msg, size_t len, upb_arena *arena) { + return (envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig**)_upb_array_resize_accessor2(msg, UPB_SIZE(4, 8), len, UPB_SIZE(2, 3), arena); +} +UPB_INLINE struct envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig* envoy_admin_v3_EndpointsConfigDump_add_dynamic_endpoint_configs(envoy_admin_v3_EndpointsConfigDump *msg, upb_arena *arena) { + struct envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig* sub = (struct envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig*)_upb_msg_new(&envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_msginit, arena); + bool ok = _upb_array_append_accessor2( + msg, UPB_SIZE(4, 8), UPB_SIZE(2, 3), &sub, arena); + if (!ok) return NULL; + return sub; +} + +/* envoy.admin.v3.EndpointsConfigDump.StaticEndpointConfig */ + +UPB_INLINE envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig *envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_new(upb_arena *arena) { + return (envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig *)_upb_msg_new(&envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_msginit, arena); +} +UPB_INLINE envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig *envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig *ret = envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig *envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig *ret = envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_serialize(const envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_msginit, arena, len); +} + +UPB_INLINE bool envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_has_endpoint_config(const envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig *msg) { return _upb_hasbit(msg, 1); } +UPB_INLINE const struct google_protobuf_Any* envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_endpoint_config(const envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), const struct google_protobuf_Any*); } +UPB_INLINE bool envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_has_last_updated(const envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig *msg) { return _upb_hasbit(msg, 2); } +UPB_INLINE const struct google_protobuf_Timestamp* envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_last_updated(const envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(8, 16), const struct google_protobuf_Timestamp*); } + +UPB_INLINE void envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_set_endpoint_config(envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig *msg, struct google_protobuf_Any* value) { + _upb_sethas(msg, 1); + *UPB_PTR_AT(msg, UPB_SIZE(4, 8), struct google_protobuf_Any*) = value; +} +UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_mutable_endpoint_config(envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig *msg, upb_arena *arena) { + struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_endpoint_config(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Any*)_upb_msg_new(&google_protobuf_Any_msginit, arena); + if (!sub) return NULL; + envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_set_endpoint_config(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_set_last_updated(envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig *msg, struct google_protobuf_Timestamp* value) { + _upb_sethas(msg, 2); + *UPB_PTR_AT(msg, UPB_SIZE(8, 16), struct google_protobuf_Timestamp*) = value; +} +UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_mutable_last_updated(envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig *msg, upb_arena *arena) { + struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_last_updated(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Timestamp*)_upb_msg_new(&google_protobuf_Timestamp_msginit, arena); + if (!sub) return NULL; + envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_set_last_updated(msg, sub); + } + return sub; +} + +/* envoy.admin.v3.EndpointsConfigDump.DynamicEndpointConfig */ + +UPB_INLINE envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig *envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_new(upb_arena *arena) { + return (envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig *)_upb_msg_new(&envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_msginit, arena); +} +UPB_INLINE envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig *envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig *ret = envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig *envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig *ret = envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_serialize(const envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_msginit, arena, len); +} + +UPB_INLINE upb_strview envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_version_info(const envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(8, 8), upb_strview); } +UPB_INLINE bool envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_has_endpoint_config(const envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig *msg) { return _upb_hasbit(msg, 1); } +UPB_INLINE const struct google_protobuf_Any* envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_endpoint_config(const envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(16, 24), const struct google_protobuf_Any*); } +UPB_INLINE bool envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_has_last_updated(const envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig *msg) { return _upb_hasbit(msg, 2); } +UPB_INLINE const struct google_protobuf_Timestamp* envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_last_updated(const envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(20, 32), const struct google_protobuf_Timestamp*); } +UPB_INLINE bool envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_has_error_state(const envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig *msg) { return _upb_hasbit(msg, 3); } +UPB_INLINE const envoy_admin_v3_UpdateFailureState* envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_error_state(const envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(24, 40), const envoy_admin_v3_UpdateFailureState*); } +UPB_INLINE int32_t envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_client_status(const envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t); } + +UPB_INLINE void envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_set_version_info(envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(8, 8), upb_strview) = value; +} +UPB_INLINE void envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_set_endpoint_config(envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig *msg, struct google_protobuf_Any* value) { + _upb_sethas(msg, 1); + *UPB_PTR_AT(msg, UPB_SIZE(16, 24), struct google_protobuf_Any*) = value; +} +UPB_INLINE struct google_protobuf_Any* envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_mutable_endpoint_config(envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig *msg, upb_arena *arena) { + struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_endpoint_config(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Any*)_upb_msg_new(&google_protobuf_Any_msginit, arena); + if (!sub) return NULL; + envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_set_endpoint_config(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_set_last_updated(envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig *msg, struct google_protobuf_Timestamp* value) { + _upb_sethas(msg, 2); + *UPB_PTR_AT(msg, UPB_SIZE(20, 32), struct google_protobuf_Timestamp*) = value; +} +UPB_INLINE struct google_protobuf_Timestamp* envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_mutable_last_updated(envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig *msg, upb_arena *arena) { + struct google_protobuf_Timestamp* sub = (struct google_protobuf_Timestamp*)envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_last_updated(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Timestamp*)_upb_msg_new(&google_protobuf_Timestamp_msginit, arena); + if (!sub) return NULL; + envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_set_last_updated(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_set_error_state(envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig *msg, envoy_admin_v3_UpdateFailureState* value) { + _upb_sethas(msg, 3); + *UPB_PTR_AT(msg, UPB_SIZE(24, 40), envoy_admin_v3_UpdateFailureState*) = value; +} +UPB_INLINE struct envoy_admin_v3_UpdateFailureState* envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_mutable_error_state(envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig *msg, upb_arena *arena) { + struct envoy_admin_v3_UpdateFailureState* sub = (struct envoy_admin_v3_UpdateFailureState*)envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_error_state(msg); + if (sub == NULL) { + sub = (struct envoy_admin_v3_UpdateFailureState*)_upb_msg_new(&envoy_admin_v3_UpdateFailureState_msginit, arena); + if (!sub) return NULL; + envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_set_error_state(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_set_client_status(envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig *msg, int32_t value) { + *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t) = value; +} + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#include "upb/port_undef.inc" + +#endif /* ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPB_H_ */ diff --git a/grpc/src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.c b/grpc/src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.c index 5de540fa..fa6dcbc1 100644 --- a/grpc/src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.c +++ b/grpc/src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.c @@ -14,7 +14,6 @@ #include "envoy/type/matcher/v3/metadata.upb.h" #include "envoy/type/v3/percent.upb.h" #include "google/protobuf/any.upb.h" -#include "google/protobuf/struct.upb.h" #include "google/protobuf/wrappers.upb.h" #include "udpa/annotations/status.upb.h" #include "udpa/annotations/versioning.upb.h" diff --git a/grpc/src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.c b/grpc/src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.c new file mode 100644 index 00000000..b7f9387b --- /dev/null +++ b/grpc/src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.c @@ -0,0 +1,350 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * envoy/config/bootstrap/v3/bootstrap.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#include <stddef.h> +#include "upb/msg.h" +#include "envoy/config/bootstrap/v3/bootstrap.upb.h" +#include "envoy/config/cluster/v3/cluster.upb.h" +#include "envoy/config/core/v3/address.upb.h" +#include "envoy/config/core/v3/base.upb.h" +#include "envoy/config/core/v3/config_source.upb.h" +#include "envoy/config/core/v3/event_service_config.upb.h" +#include "envoy/config/core/v3/extension.upb.h" +#include "envoy/config/core/v3/socket_option.upb.h" +#include "envoy/config/listener/v3/listener.upb.h" +#include "envoy/config/metrics/v3/stats.upb.h" +#include "envoy/config/overload/v3/overload.upb.h" +#include "envoy/config/trace/v3/http_tracer.upb.h" +#include "envoy/extensions/transport_sockets/tls/v3/secret.upb.h" +#include "envoy/type/v3/percent.upb.h" +#include "google/protobuf/duration.upb.h" +#include "google/protobuf/struct.upb.h" +#include "google/protobuf/wrappers.upb.h" +#include "udpa/annotations/migrate.upb.h" +#include "udpa/annotations/security.upb.h" +#include "udpa/annotations/status.upb.h" +#include "udpa/annotations/versioning.upb.h" +#include "validate/validate.upb.h" + +#include "upb/port_def.inc" + +static const upb_msglayout *const envoy_config_bootstrap_v3_Bootstrap_submsgs[19] = { + &envoy_config_bootstrap_v3_Admin_msginit, + &envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry_msginit, + &envoy_config_bootstrap_v3_Bootstrap_DynamicResources_msginit, + &envoy_config_bootstrap_v3_Bootstrap_StaticResources_msginit, + &envoy_config_bootstrap_v3_ClusterManager_msginit, + &envoy_config_bootstrap_v3_FatalAction_msginit, + &envoy_config_bootstrap_v3_LayeredRuntime_msginit, + &envoy_config_bootstrap_v3_Watchdog_msginit, + &envoy_config_bootstrap_v3_Watchdogs_msginit, + &envoy_config_core_v3_ApiConfigSource_msginit, + &envoy_config_core_v3_ConfigSource_msginit, + &envoy_config_core_v3_Node_msginit, + &envoy_config_core_v3_TypedExtensionConfig_msginit, + &envoy_config_metrics_v3_StatsConfig_msginit, + &envoy_config_metrics_v3_StatsSink_msginit, + &envoy_config_overload_v3_OverloadManager_msginit, + &envoy_config_trace_v3_Tracing_msginit, + &google_protobuf_Duration_msginit, + &google_protobuf_UInt64Value_msginit, +}; + +static const upb_msglayout_field envoy_config_bootstrap_v3_Bootstrap__fields[27] = { + {1, UPB_SIZE(28, 56), 1, 11, 11, 1}, + {2, UPB_SIZE(32, 64), 2, 3, 11, 1}, + {3, UPB_SIZE(36, 72), 3, 2, 11, 1}, + {4, UPB_SIZE(40, 80), 4, 4, 11, 1}, + {5, UPB_SIZE(4, 8), 0, 0, 9, 1}, + {6, UPB_SIZE(88, 176), 0, 14, 11, 3}, + {7, UPB_SIZE(44, 88), 5, 17, 11, 1}, + {8, UPB_SIZE(48, 96), 6, 7, 11, 1}, + {9, UPB_SIZE(52, 104), 7, 16, 11, 1}, + {12, UPB_SIZE(56, 112), 8, 0, 11, 1}, + {13, UPB_SIZE(60, 120), 9, 13, 11, 1}, + {14, UPB_SIZE(64, 128), 10, 9, 11, 1}, + {15, UPB_SIZE(68, 136), 11, 15, 11, 1}, + {16, UPB_SIZE(2, 2), 0, 0, 8, 1}, + {17, UPB_SIZE(72, 144), 12, 6, 11, 1}, + {18, UPB_SIZE(12, 24), 0, 0, 9, 1}, + {19, UPB_SIZE(76, 152), 13, 18, 11, 1}, + {20, UPB_SIZE(3, 3), 0, 0, 8, 1}, + {21, UPB_SIZE(92, 184), 0, 12, 11, 3}, + {22, UPB_SIZE(96, 192), 0, 10, 11, 3}, + {23, UPB_SIZE(80, 160), 14, 10, 11, 1}, + {24, UPB_SIZE(20, 40), 0, 0, 9, 1}, + {25, UPB_SIZE(100, 200), 0, 1, 11, _UPB_LABEL_MAP}, + {26, UPB_SIZE(104, 208), 0, 0, 9, 3}, + {27, UPB_SIZE(84, 168), 15, 8, 11, 1}, + {28, UPB_SIZE(108, 216), 0, 5, 11, 3}, + {29, UPB_SIZE(112, 224), UPB_SIZE(-117, -229), 0, 8, 1}, +}; + +const upb_msglayout envoy_config_bootstrap_v3_Bootstrap_msginit = { + &envoy_config_bootstrap_v3_Bootstrap_submsgs[0], + &envoy_config_bootstrap_v3_Bootstrap__fields[0], + UPB_SIZE(120, 240), 27, false, 255, +}; + +static const upb_msglayout *const envoy_config_bootstrap_v3_Bootstrap_StaticResources_submsgs[3] = { + &envoy_config_cluster_v3_Cluster_msginit, + &envoy_config_listener_v3_Listener_msginit, + &envoy_extensions_transport_sockets_tls_v3_Secret_msginit, +}; + +static const upb_msglayout_field envoy_config_bootstrap_v3_Bootstrap_StaticResources__fields[3] = { + {1, UPB_SIZE(0, 0), 0, 1, 11, 3}, + {2, UPB_SIZE(4, 8), 0, 0, 11, 3}, + {3, UPB_SIZE(8, 16), 0, 2, 11, 3}, +}; + +const upb_msglayout envoy_config_bootstrap_v3_Bootstrap_StaticResources_msginit = { + &envoy_config_bootstrap_v3_Bootstrap_StaticResources_submsgs[0], + &envoy_config_bootstrap_v3_Bootstrap_StaticResources__fields[0], + UPB_SIZE(16, 24), 3, false, 255, +}; + +static const upb_msglayout *const envoy_config_bootstrap_v3_Bootstrap_DynamicResources_submsgs[2] = { + &envoy_config_core_v3_ApiConfigSource_msginit, + &envoy_config_core_v3_ConfigSource_msginit, +}; + +static const upb_msglayout_field envoy_config_bootstrap_v3_Bootstrap_DynamicResources__fields[5] = { + {1, UPB_SIZE(20, 40), 1, 1, 11, 1}, + {2, UPB_SIZE(24, 48), 2, 1, 11, 1}, + {3, UPB_SIZE(28, 56), 3, 0, 11, 1}, + {5, UPB_SIZE(4, 8), 0, 0, 9, 1}, + {6, UPB_SIZE(12, 24), 0, 0, 9, 1}, +}; + +const upb_msglayout envoy_config_bootstrap_v3_Bootstrap_DynamicResources_msginit = { + &envoy_config_bootstrap_v3_Bootstrap_DynamicResources_submsgs[0], + &envoy_config_bootstrap_v3_Bootstrap_DynamicResources__fields[0], + UPB_SIZE(32, 64), 5, false, 255, +}; + +static const upb_msglayout *const envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry_submsgs[1] = { + &envoy_config_core_v3_TypedExtensionConfig_msginit, +}; + +static const upb_msglayout_field envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry__fields[2] = { + {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, + {2, UPB_SIZE(8, 16), 0, 0, 11, 1}, +}; + +const upb_msglayout envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry_msginit = { + &envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry_submsgs[0], + &envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry__fields[0], + UPB_SIZE(16, 32), 2, false, 255, +}; + +static const upb_msglayout *const envoy_config_bootstrap_v3_Admin_submsgs[2] = { + &envoy_config_core_v3_Address_msginit, + &envoy_config_core_v3_SocketOption_msginit, +}; + +static const upb_msglayout_field envoy_config_bootstrap_v3_Admin__fields[4] = { + {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, + {2, UPB_SIZE(12, 24), 0, 0, 9, 1}, + {3, UPB_SIZE(20, 40), 1, 0, 11, 1}, + {4, UPB_SIZE(24, 48), 0, 1, 11, 3}, +}; + +const upb_msglayout envoy_config_bootstrap_v3_Admin_msginit = { + &envoy_config_bootstrap_v3_Admin_submsgs[0], + &envoy_config_bootstrap_v3_Admin__fields[0], + UPB_SIZE(32, 64), 4, false, 255, +}; + +static const upb_msglayout *const envoy_config_bootstrap_v3_ClusterManager_submsgs[3] = { + &envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_msginit, + &envoy_config_core_v3_ApiConfigSource_msginit, + &envoy_config_core_v3_BindConfig_msginit, +}; + +static const upb_msglayout_field envoy_config_bootstrap_v3_ClusterManager__fields[4] = { + {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, + {2, UPB_SIZE(12, 24), 1, 0, 11, 1}, + {3, UPB_SIZE(16, 32), 2, 2, 11, 1}, + {4, UPB_SIZE(20, 40), 3, 1, 11, 1}, +}; + +const upb_msglayout envoy_config_bootstrap_v3_ClusterManager_msginit = { + &envoy_config_bootstrap_v3_ClusterManager_submsgs[0], + &envoy_config_bootstrap_v3_ClusterManager__fields[0], + UPB_SIZE(24, 48), 4, false, 255, +}; + +static const upb_msglayout *const envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_submsgs[1] = { + &envoy_config_core_v3_EventServiceConfig_msginit, +}; + +static const upb_msglayout_field envoy_config_bootstrap_v3_ClusterManager_OutlierDetection__fields[2] = { + {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, + {2, UPB_SIZE(12, 24), 1, 0, 11, 1}, +}; + +const upb_msglayout envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_msginit = { + &envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_submsgs[0], + &envoy_config_bootstrap_v3_ClusterManager_OutlierDetection__fields[0], + UPB_SIZE(16, 32), 2, false, 255, +}; + +static const upb_msglayout *const envoy_config_bootstrap_v3_Watchdogs_submsgs[1] = { + &envoy_config_bootstrap_v3_Watchdog_msginit, +}; + +static const upb_msglayout_field envoy_config_bootstrap_v3_Watchdogs__fields[2] = { + {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, + {2, UPB_SIZE(8, 16), 2, 0, 11, 1}, +}; + +const upb_msglayout envoy_config_bootstrap_v3_Watchdogs_msginit = { + &envoy_config_bootstrap_v3_Watchdogs_submsgs[0], + &envoy_config_bootstrap_v3_Watchdogs__fields[0], + UPB_SIZE(16, 24), 2, false, 255, +}; + +static const upb_msglayout *const envoy_config_bootstrap_v3_Watchdog_submsgs[3] = { + &envoy_config_bootstrap_v3_Watchdog_WatchdogAction_msginit, + &envoy_type_v3_Percent_msginit, + &google_protobuf_Duration_msginit, +}; + +static const upb_msglayout_field envoy_config_bootstrap_v3_Watchdog__fields[7] = { + {1, UPB_SIZE(4, 8), 1, 2, 11, 1}, + {2, UPB_SIZE(8, 16), 2, 2, 11, 1}, + {3, UPB_SIZE(12, 24), 3, 2, 11, 1}, + {4, UPB_SIZE(16, 32), 4, 2, 11, 1}, + {5, UPB_SIZE(20, 40), 5, 1, 11, 1}, + {6, UPB_SIZE(24, 48), 6, 2, 11, 1}, + {7, UPB_SIZE(28, 56), 0, 0, 11, 3}, +}; + +const upb_msglayout envoy_config_bootstrap_v3_Watchdog_msginit = { + &envoy_config_bootstrap_v3_Watchdog_submsgs[0], + &envoy_config_bootstrap_v3_Watchdog__fields[0], + UPB_SIZE(32, 64), 7, false, 255, +}; + +static const upb_msglayout *const envoy_config_bootstrap_v3_Watchdog_WatchdogAction_submsgs[1] = { + &envoy_config_core_v3_TypedExtensionConfig_msginit, +}; + +static const upb_msglayout_field envoy_config_bootstrap_v3_Watchdog_WatchdogAction__fields[2] = { + {1, UPB_SIZE(8, 8), 1, 0, 11, 1}, + {2, UPB_SIZE(4, 4), 0, 0, 14, 1}, +}; + +const upb_msglayout envoy_config_bootstrap_v3_Watchdog_WatchdogAction_msginit = { + &envoy_config_bootstrap_v3_Watchdog_WatchdogAction_submsgs[0], + &envoy_config_bootstrap_v3_Watchdog_WatchdogAction__fields[0], + UPB_SIZE(16, 16), 2, false, 255, +}; + +static const upb_msglayout *const envoy_config_bootstrap_v3_FatalAction_submsgs[1] = { + &envoy_config_core_v3_TypedExtensionConfig_msginit, +}; + +static const upb_msglayout_field envoy_config_bootstrap_v3_FatalAction__fields[1] = { + {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, +}; + +const upb_msglayout envoy_config_bootstrap_v3_FatalAction_msginit = { + &envoy_config_bootstrap_v3_FatalAction_submsgs[0], + &envoy_config_bootstrap_v3_FatalAction__fields[0], + UPB_SIZE(8, 16), 1, false, 255, +}; + +static const upb_msglayout *const envoy_config_bootstrap_v3_Runtime_submsgs[1] = { + &google_protobuf_Struct_msginit, +}; + +static const upb_msglayout_field envoy_config_bootstrap_v3_Runtime__fields[4] = { + {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, + {2, UPB_SIZE(12, 24), 0, 0, 9, 1}, + {3, UPB_SIZE(20, 40), 0, 0, 9, 1}, + {4, UPB_SIZE(28, 56), 1, 0, 11, 1}, +}; + +const upb_msglayout envoy_config_bootstrap_v3_Runtime_msginit = { + &envoy_config_bootstrap_v3_Runtime_submsgs[0], + &envoy_config_bootstrap_v3_Runtime__fields[0], + UPB_SIZE(32, 64), 4, false, 255, +}; + +static const upb_msglayout *const envoy_config_bootstrap_v3_RuntimeLayer_submsgs[4] = { + &envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer_msginit, + &envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_msginit, + &envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_msginit, + &google_protobuf_Struct_msginit, +}; + +static const upb_msglayout_field envoy_config_bootstrap_v3_RuntimeLayer__fields[5] = { + {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, + {2, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 3, 11, 1}, + {3, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 1, 11, 1}, + {4, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 11, 1}, + {5, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 2, 11, 1}, +}; + +const upb_msglayout envoy_config_bootstrap_v3_RuntimeLayer_msginit = { + &envoy_config_bootstrap_v3_RuntimeLayer_submsgs[0], + &envoy_config_bootstrap_v3_RuntimeLayer__fields[0], + UPB_SIZE(16, 32), 5, false, 255, +}; + +static const upb_msglayout_field envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer__fields[3] = { + {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, + {2, UPB_SIZE(0, 0), 0, 0, 8, 1}, + {3, UPB_SIZE(12, 24), 0, 0, 9, 1}, +}; + +const upb_msglayout envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_msginit = { + NULL, + &envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer__fields[0], + UPB_SIZE(24, 48), 3, false, 255, +}; + +const upb_msglayout envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer_msginit = { + NULL, + NULL, + UPB_SIZE(0, 0), 0, false, 255, +}; + +static const upb_msglayout *const envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_submsgs[1] = { + &envoy_config_core_v3_ConfigSource_msginit, +}; + +static const upb_msglayout_field envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer__fields[2] = { + {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, + {2, UPB_SIZE(12, 24), 1, 0, 11, 1}, +}; + +const upb_msglayout envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_msginit = { + &envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_submsgs[0], + &envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer__fields[0], + UPB_SIZE(16, 32), 2, false, 255, +}; + +static const upb_msglayout *const envoy_config_bootstrap_v3_LayeredRuntime_submsgs[1] = { + &envoy_config_bootstrap_v3_RuntimeLayer_msginit, +}; + +static const upb_msglayout_field envoy_config_bootstrap_v3_LayeredRuntime__fields[1] = { + {1, UPB_SIZE(0, 0), 0, 0, 11, 3}, +}; + +const upb_msglayout envoy_config_bootstrap_v3_LayeredRuntime_msginit = { + &envoy_config_bootstrap_v3_LayeredRuntime_submsgs[0], + &envoy_config_bootstrap_v3_LayeredRuntime__fields[0], + UPB_SIZE(8, 8), 1, false, 255, +}; + +#include "upb/port_undef.inc" + diff --git a/grpc/src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.h b/grpc/src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.h new file mode 100644 index 00000000..42e4c858 --- /dev/null +++ b/grpc/src/core/ext/upb-generated/envoy/config/bootstrap/v3/bootstrap.upb.h @@ -0,0 +1,1348 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * envoy/config/bootstrap/v3/bootstrap.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#ifndef ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPB_H_ +#define ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPB_H_ + +#include "upb/msg.h" +#include "upb/decode.h" +#include "upb/decode_fast.h" +#include "upb/encode.h" + +#include "upb/port_def.inc" + +#ifdef __cplusplus +extern "C" { +#endif + +struct envoy_config_bootstrap_v3_Bootstrap; +struct envoy_config_bootstrap_v3_Bootstrap_StaticResources; +struct envoy_config_bootstrap_v3_Bootstrap_DynamicResources; +struct envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry; +struct envoy_config_bootstrap_v3_Admin; +struct envoy_config_bootstrap_v3_ClusterManager; +struct envoy_config_bootstrap_v3_ClusterManager_OutlierDetection; +struct envoy_config_bootstrap_v3_Watchdogs; +struct envoy_config_bootstrap_v3_Watchdog; +struct envoy_config_bootstrap_v3_Watchdog_WatchdogAction; +struct envoy_config_bootstrap_v3_FatalAction; +struct envoy_config_bootstrap_v3_Runtime; +struct envoy_config_bootstrap_v3_RuntimeLayer; +struct envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer; +struct envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer; +struct envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer; +struct envoy_config_bootstrap_v3_LayeredRuntime; +typedef struct envoy_config_bootstrap_v3_Bootstrap envoy_config_bootstrap_v3_Bootstrap; +typedef struct envoy_config_bootstrap_v3_Bootstrap_StaticResources envoy_config_bootstrap_v3_Bootstrap_StaticResources; +typedef struct envoy_config_bootstrap_v3_Bootstrap_DynamicResources envoy_config_bootstrap_v3_Bootstrap_DynamicResources; +typedef struct envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry; +typedef struct envoy_config_bootstrap_v3_Admin envoy_config_bootstrap_v3_Admin; +typedef struct envoy_config_bootstrap_v3_ClusterManager envoy_config_bootstrap_v3_ClusterManager; +typedef struct envoy_config_bootstrap_v3_ClusterManager_OutlierDetection envoy_config_bootstrap_v3_ClusterManager_OutlierDetection; +typedef struct envoy_config_bootstrap_v3_Watchdogs envoy_config_bootstrap_v3_Watchdogs; +typedef struct envoy_config_bootstrap_v3_Watchdog envoy_config_bootstrap_v3_Watchdog; +typedef struct envoy_config_bootstrap_v3_Watchdog_WatchdogAction envoy_config_bootstrap_v3_Watchdog_WatchdogAction; +typedef struct envoy_config_bootstrap_v3_FatalAction envoy_config_bootstrap_v3_FatalAction; +typedef struct envoy_config_bootstrap_v3_Runtime envoy_config_bootstrap_v3_Runtime; +typedef struct envoy_config_bootstrap_v3_RuntimeLayer envoy_config_bootstrap_v3_RuntimeLayer; +typedef struct envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer; +typedef struct envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer; +typedef struct envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer; +typedef struct envoy_config_bootstrap_v3_LayeredRuntime envoy_config_bootstrap_v3_LayeredRuntime; +extern const upb_msglayout envoy_config_bootstrap_v3_Bootstrap_msginit; +extern const upb_msglayout envoy_config_bootstrap_v3_Bootstrap_StaticResources_msginit; +extern const upb_msglayout envoy_config_bootstrap_v3_Bootstrap_DynamicResources_msginit; +extern const upb_msglayout envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry_msginit; +extern const upb_msglayout envoy_config_bootstrap_v3_Admin_msginit; +extern const upb_msglayout envoy_config_bootstrap_v3_ClusterManager_msginit; +extern const upb_msglayout envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_msginit; +extern const upb_msglayout envoy_config_bootstrap_v3_Watchdogs_msginit; +extern const upb_msglayout envoy_config_bootstrap_v3_Watchdog_msginit; +extern const upb_msglayout envoy_config_bootstrap_v3_Watchdog_WatchdogAction_msginit; +extern const upb_msglayout envoy_config_bootstrap_v3_FatalAction_msginit; +extern const upb_msglayout envoy_config_bootstrap_v3_Runtime_msginit; +extern const upb_msglayout envoy_config_bootstrap_v3_RuntimeLayer_msginit; +extern const upb_msglayout envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_msginit; +extern const upb_msglayout envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer_msginit; +extern const upb_msglayout envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_msginit; +extern const upb_msglayout envoy_config_bootstrap_v3_LayeredRuntime_msginit; +struct envoy_config_cluster_v3_Cluster; +struct envoy_config_core_v3_Address; +struct envoy_config_core_v3_ApiConfigSource; +struct envoy_config_core_v3_BindConfig; +struct envoy_config_core_v3_ConfigSource; +struct envoy_config_core_v3_EventServiceConfig; +struct envoy_config_core_v3_Node; +struct envoy_config_core_v3_SocketOption; +struct envoy_config_core_v3_TypedExtensionConfig; +struct envoy_config_listener_v3_Listener; +struct envoy_config_metrics_v3_StatsConfig; +struct envoy_config_metrics_v3_StatsSink; +struct envoy_config_overload_v3_OverloadManager; +struct envoy_config_trace_v3_Tracing; +struct envoy_extensions_transport_sockets_tls_v3_Secret; +struct envoy_type_v3_Percent; +struct google_protobuf_Duration; +struct google_protobuf_Struct; +struct google_protobuf_UInt64Value; +extern const upb_msglayout envoy_config_cluster_v3_Cluster_msginit; +extern const upb_msglayout envoy_config_core_v3_Address_msginit; +extern const upb_msglayout envoy_config_core_v3_ApiConfigSource_msginit; +extern const upb_msglayout envoy_config_core_v3_BindConfig_msginit; +extern const upb_msglayout envoy_config_core_v3_ConfigSource_msginit; +extern const upb_msglayout envoy_config_core_v3_EventServiceConfig_msginit; +extern const upb_msglayout envoy_config_core_v3_Node_msginit; +extern const upb_msglayout envoy_config_core_v3_SocketOption_msginit; +extern const upb_msglayout envoy_config_core_v3_TypedExtensionConfig_msginit; +extern const upb_msglayout envoy_config_listener_v3_Listener_msginit; +extern const upb_msglayout envoy_config_metrics_v3_StatsConfig_msginit; +extern const upb_msglayout envoy_config_metrics_v3_StatsSink_msginit; +extern const upb_msglayout envoy_config_overload_v3_OverloadManager_msginit; +extern const upb_msglayout envoy_config_trace_v3_Tracing_msginit; +extern const upb_msglayout envoy_extensions_transport_sockets_tls_v3_Secret_msginit; +extern const upb_msglayout envoy_type_v3_Percent_msginit; +extern const upb_msglayout google_protobuf_Duration_msginit; +extern const upb_msglayout google_protobuf_Struct_msginit; +extern const upb_msglayout google_protobuf_UInt64Value_msginit; + +typedef enum { + envoy_config_bootstrap_v3_Watchdog_WatchdogAction_UNKNOWN = 0, + envoy_config_bootstrap_v3_Watchdog_WatchdogAction_KILL = 1, + envoy_config_bootstrap_v3_Watchdog_WatchdogAction_MULTIKILL = 2, + envoy_config_bootstrap_v3_Watchdog_WatchdogAction_MEGAMISS = 3, + envoy_config_bootstrap_v3_Watchdog_WatchdogAction_MISS = 4 +} envoy_config_bootstrap_v3_Watchdog_WatchdogAction_WatchdogEvent; + + +/* envoy.config.bootstrap.v3.Bootstrap */ + +UPB_INLINE envoy_config_bootstrap_v3_Bootstrap *envoy_config_bootstrap_v3_Bootstrap_new(upb_arena *arena) { + return (envoy_config_bootstrap_v3_Bootstrap *)_upb_msg_new(&envoy_config_bootstrap_v3_Bootstrap_msginit, arena); +} +UPB_INLINE envoy_config_bootstrap_v3_Bootstrap *envoy_config_bootstrap_v3_Bootstrap_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_config_bootstrap_v3_Bootstrap *ret = envoy_config_bootstrap_v3_Bootstrap_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_Bootstrap_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_config_bootstrap_v3_Bootstrap *envoy_config_bootstrap_v3_Bootstrap_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_config_bootstrap_v3_Bootstrap *ret = envoy_config_bootstrap_v3_Bootstrap_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_Bootstrap_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_config_bootstrap_v3_Bootstrap_serialize(const envoy_config_bootstrap_v3_Bootstrap *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_config_bootstrap_v3_Bootstrap_msginit, arena, len); +} + +typedef enum { + envoy_config_bootstrap_v3_Bootstrap_stats_flush_stats_flush_on_admin = 29, + envoy_config_bootstrap_v3_Bootstrap_stats_flush_NOT_SET = 0 +} envoy_config_bootstrap_v3_Bootstrap_stats_flush_oneofcases; +UPB_INLINE envoy_config_bootstrap_v3_Bootstrap_stats_flush_oneofcases envoy_config_bootstrap_v3_Bootstrap_stats_flush_case(const envoy_config_bootstrap_v3_Bootstrap* msg) { return (envoy_config_bootstrap_v3_Bootstrap_stats_flush_oneofcases)*UPB_PTR_AT(msg, UPB_SIZE(116, 228), int32_t); } + +UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_node(const envoy_config_bootstrap_v3_Bootstrap *msg) { return _upb_hasbit(msg, 1); } +UPB_INLINE const struct envoy_config_core_v3_Node* envoy_config_bootstrap_v3_Bootstrap_node(const envoy_config_bootstrap_v3_Bootstrap *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(28, 56), const struct envoy_config_core_v3_Node*); } +UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_static_resources(const envoy_config_bootstrap_v3_Bootstrap *msg) { return _upb_hasbit(msg, 2); } +UPB_INLINE const envoy_config_bootstrap_v3_Bootstrap_StaticResources* envoy_config_bootstrap_v3_Bootstrap_static_resources(const envoy_config_bootstrap_v3_Bootstrap *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(32, 64), const envoy_config_bootstrap_v3_Bootstrap_StaticResources*); } +UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_dynamic_resources(const envoy_config_bootstrap_v3_Bootstrap *msg) { return _upb_hasbit(msg, 3); } +UPB_INLINE const envoy_config_bootstrap_v3_Bootstrap_DynamicResources* envoy_config_bootstrap_v3_Bootstrap_dynamic_resources(const envoy_config_bootstrap_v3_Bootstrap *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(36, 72), const envoy_config_bootstrap_v3_Bootstrap_DynamicResources*); } +UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_cluster_manager(const envoy_config_bootstrap_v3_Bootstrap *msg) { return _upb_hasbit(msg, 4); } +UPB_INLINE const envoy_config_bootstrap_v3_ClusterManager* envoy_config_bootstrap_v3_Bootstrap_cluster_manager(const envoy_config_bootstrap_v3_Bootstrap *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(40, 80), const envoy_config_bootstrap_v3_ClusterManager*); } +UPB_INLINE upb_strview envoy_config_bootstrap_v3_Bootstrap_flags_path(const envoy_config_bootstrap_v3_Bootstrap *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview); } +UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_stats_sinks(const envoy_config_bootstrap_v3_Bootstrap *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(88, 176)); } +UPB_INLINE const struct envoy_config_metrics_v3_StatsSink* const* envoy_config_bootstrap_v3_Bootstrap_stats_sinks(const envoy_config_bootstrap_v3_Bootstrap *msg, size_t *len) { return (const struct envoy_config_metrics_v3_StatsSink* const*)_upb_array_accessor(msg, UPB_SIZE(88, 176), len); } +UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_stats_flush_interval(const envoy_config_bootstrap_v3_Bootstrap *msg) { return _upb_hasbit(msg, 5); } +UPB_INLINE const struct google_protobuf_Duration* envoy_config_bootstrap_v3_Bootstrap_stats_flush_interval(const envoy_config_bootstrap_v3_Bootstrap *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(44, 88), const struct google_protobuf_Duration*); } +UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_watchdog(const envoy_config_bootstrap_v3_Bootstrap *msg) { return _upb_hasbit(msg, 6); } +UPB_INLINE const envoy_config_bootstrap_v3_Watchdog* envoy_config_bootstrap_v3_Bootstrap_watchdog(const envoy_config_bootstrap_v3_Bootstrap *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(48, 96), const envoy_config_bootstrap_v3_Watchdog*); } +UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_tracing(const envoy_config_bootstrap_v3_Bootstrap *msg) { return _upb_hasbit(msg, 7); } +UPB_INLINE const struct envoy_config_trace_v3_Tracing* envoy_config_bootstrap_v3_Bootstrap_tracing(const envoy_config_bootstrap_v3_Bootstrap *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(52, 104), const struct envoy_config_trace_v3_Tracing*); } +UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_admin(const envoy_config_bootstrap_v3_Bootstrap *msg) { return _upb_hasbit(msg, 8); } +UPB_INLINE const envoy_config_bootstrap_v3_Admin* envoy_config_bootstrap_v3_Bootstrap_admin(const envoy_config_bootstrap_v3_Bootstrap *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(56, 112), const envoy_config_bootstrap_v3_Admin*); } +UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_stats_config(const envoy_config_bootstrap_v3_Bootstrap *msg) { return _upb_hasbit(msg, 9); } +UPB_INLINE const struct envoy_config_metrics_v3_StatsConfig* envoy_config_bootstrap_v3_Bootstrap_stats_config(const envoy_config_bootstrap_v3_Bootstrap *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(60, 120), const struct envoy_config_metrics_v3_StatsConfig*); } +UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_hds_config(const envoy_config_bootstrap_v3_Bootstrap *msg) { return _upb_hasbit(msg, 10); } +UPB_INLINE const struct envoy_config_core_v3_ApiConfigSource* envoy_config_bootstrap_v3_Bootstrap_hds_config(const envoy_config_bootstrap_v3_Bootstrap *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(64, 128), const struct envoy_config_core_v3_ApiConfigSource*); } +UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_overload_manager(const envoy_config_bootstrap_v3_Bootstrap *msg) { return _upb_hasbit(msg, 11); } +UPB_INLINE const struct envoy_config_overload_v3_OverloadManager* envoy_config_bootstrap_v3_Bootstrap_overload_manager(const envoy_config_bootstrap_v3_Bootstrap *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(68, 136), const struct envoy_config_overload_v3_OverloadManager*); } +UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_enable_dispatcher_stats(const envoy_config_bootstrap_v3_Bootstrap *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(2, 2), bool); } +UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_layered_runtime(const envoy_config_bootstrap_v3_Bootstrap *msg) { return _upb_hasbit(msg, 12); } +UPB_INLINE const envoy_config_bootstrap_v3_LayeredRuntime* envoy_config_bootstrap_v3_Bootstrap_layered_runtime(const envoy_config_bootstrap_v3_Bootstrap *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(72, 144), const envoy_config_bootstrap_v3_LayeredRuntime*); } +UPB_INLINE upb_strview envoy_config_bootstrap_v3_Bootstrap_header_prefix(const envoy_config_bootstrap_v3_Bootstrap *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(12, 24), upb_strview); } +UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_stats_server_version_override(const envoy_config_bootstrap_v3_Bootstrap *msg) { return _upb_hasbit(msg, 13); } +UPB_INLINE const struct google_protobuf_UInt64Value* envoy_config_bootstrap_v3_Bootstrap_stats_server_version_override(const envoy_config_bootstrap_v3_Bootstrap *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(76, 152), const struct google_protobuf_UInt64Value*); } +UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_use_tcp_for_dns_lookups(const envoy_config_bootstrap_v3_Bootstrap *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(3, 3), bool); } +UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_bootstrap_extensions(const envoy_config_bootstrap_v3_Bootstrap *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(92, 184)); } +UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* const* envoy_config_bootstrap_v3_Bootstrap_bootstrap_extensions(const envoy_config_bootstrap_v3_Bootstrap *msg, size_t *len) { return (const struct envoy_config_core_v3_TypedExtensionConfig* const*)_upb_array_accessor(msg, UPB_SIZE(92, 184), len); } +UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_config_sources(const envoy_config_bootstrap_v3_Bootstrap *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(96, 192)); } +UPB_INLINE const struct envoy_config_core_v3_ConfigSource* const* envoy_config_bootstrap_v3_Bootstrap_config_sources(const envoy_config_bootstrap_v3_Bootstrap *msg, size_t *len) { return (const struct envoy_config_core_v3_ConfigSource* const*)_upb_array_accessor(msg, UPB_SIZE(96, 192), len); } +UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_default_config_source(const envoy_config_bootstrap_v3_Bootstrap *msg) { return _upb_hasbit(msg, 14); } +UPB_INLINE const struct envoy_config_core_v3_ConfigSource* envoy_config_bootstrap_v3_Bootstrap_default_config_source(const envoy_config_bootstrap_v3_Bootstrap *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(80, 160), const struct envoy_config_core_v3_ConfigSource*); } +UPB_INLINE upb_strview envoy_config_bootstrap_v3_Bootstrap_default_socket_interface(const envoy_config_bootstrap_v3_Bootstrap *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(20, 40), upb_strview); } +UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_certificate_provider_instances(const envoy_config_bootstrap_v3_Bootstrap *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(100, 200)); } +UPB_INLINE size_t envoy_config_bootstrap_v3_Bootstrap_certificate_provider_instances_size(const envoy_config_bootstrap_v3_Bootstrap *msg) {return _upb_msg_map_size(msg, UPB_SIZE(100, 200)); } +UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_certificate_provider_instances_get(const envoy_config_bootstrap_v3_Bootstrap *msg, upb_strview key, struct envoy_config_core_v3_TypedExtensionConfig* *val) { return _upb_msg_map_get(msg, UPB_SIZE(100, 200), &key, 0, val, sizeof(*val)); } +UPB_INLINE const envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry* envoy_config_bootstrap_v3_Bootstrap_certificate_provider_instances_next(const envoy_config_bootstrap_v3_Bootstrap *msg, size_t* iter) { return (const envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry*)_upb_msg_map_next(msg, UPB_SIZE(100, 200), iter); } +UPB_INLINE upb_strview const* envoy_config_bootstrap_v3_Bootstrap_node_context_params(const envoy_config_bootstrap_v3_Bootstrap *msg, size_t *len) { return (upb_strview const*)_upb_array_accessor(msg, UPB_SIZE(104, 208), len); } +UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_watchdogs(const envoy_config_bootstrap_v3_Bootstrap *msg) { return _upb_hasbit(msg, 15); } +UPB_INLINE const envoy_config_bootstrap_v3_Watchdogs* envoy_config_bootstrap_v3_Bootstrap_watchdogs(const envoy_config_bootstrap_v3_Bootstrap *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(84, 168), const envoy_config_bootstrap_v3_Watchdogs*); } +UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_fatal_actions(const envoy_config_bootstrap_v3_Bootstrap *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(108, 216)); } +UPB_INLINE const envoy_config_bootstrap_v3_FatalAction* const* envoy_config_bootstrap_v3_Bootstrap_fatal_actions(const envoy_config_bootstrap_v3_Bootstrap *msg, size_t *len) { return (const envoy_config_bootstrap_v3_FatalAction* const*)_upb_array_accessor(msg, UPB_SIZE(108, 216), len); } +UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_has_stats_flush_on_admin(const envoy_config_bootstrap_v3_Bootstrap *msg) { return _upb_getoneofcase(msg, UPB_SIZE(116, 228)) == 29; } +UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_stats_flush_on_admin(const envoy_config_bootstrap_v3_Bootstrap *msg) { return UPB_READ_ONEOF(msg, bool, UPB_SIZE(112, 224), UPB_SIZE(116, 228), 29, false); } + +UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_node(envoy_config_bootstrap_v3_Bootstrap *msg, struct envoy_config_core_v3_Node* value) { + _upb_sethas(msg, 1); + *UPB_PTR_AT(msg, UPB_SIZE(28, 56), struct envoy_config_core_v3_Node*) = value; +} +UPB_INLINE struct envoy_config_core_v3_Node* envoy_config_bootstrap_v3_Bootstrap_mutable_node(envoy_config_bootstrap_v3_Bootstrap *msg, upb_arena *arena) { + struct envoy_config_core_v3_Node* sub = (struct envoy_config_core_v3_Node*)envoy_config_bootstrap_v3_Bootstrap_node(msg); + if (sub == NULL) { + sub = (struct envoy_config_core_v3_Node*)_upb_msg_new(&envoy_config_core_v3_Node_msginit, arena); + if (!sub) return NULL; + envoy_config_bootstrap_v3_Bootstrap_set_node(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_static_resources(envoy_config_bootstrap_v3_Bootstrap *msg, envoy_config_bootstrap_v3_Bootstrap_StaticResources* value) { + _upb_sethas(msg, 2); + *UPB_PTR_AT(msg, UPB_SIZE(32, 64), envoy_config_bootstrap_v3_Bootstrap_StaticResources*) = value; +} +UPB_INLINE struct envoy_config_bootstrap_v3_Bootstrap_StaticResources* envoy_config_bootstrap_v3_Bootstrap_mutable_static_resources(envoy_config_bootstrap_v3_Bootstrap *msg, upb_arena *arena) { + struct envoy_config_bootstrap_v3_Bootstrap_StaticResources* sub = (struct envoy_config_bootstrap_v3_Bootstrap_StaticResources*)envoy_config_bootstrap_v3_Bootstrap_static_resources(msg); + if (sub == NULL) { + sub = (struct envoy_config_bootstrap_v3_Bootstrap_StaticResources*)_upb_msg_new(&envoy_config_bootstrap_v3_Bootstrap_StaticResources_msginit, arena); + if (!sub) return NULL; + envoy_config_bootstrap_v3_Bootstrap_set_static_resources(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_dynamic_resources(envoy_config_bootstrap_v3_Bootstrap *msg, envoy_config_bootstrap_v3_Bootstrap_DynamicResources* value) { + _upb_sethas(msg, 3); + *UPB_PTR_AT(msg, UPB_SIZE(36, 72), envoy_config_bootstrap_v3_Bootstrap_DynamicResources*) = value; +} +UPB_INLINE struct envoy_config_bootstrap_v3_Bootstrap_DynamicResources* envoy_config_bootstrap_v3_Bootstrap_mutable_dynamic_resources(envoy_config_bootstrap_v3_Bootstrap *msg, upb_arena *arena) { + struct envoy_config_bootstrap_v3_Bootstrap_DynamicResources* sub = (struct envoy_config_bootstrap_v3_Bootstrap_DynamicResources*)envoy_config_bootstrap_v3_Bootstrap_dynamic_resources(msg); + if (sub == NULL) { + sub = (struct envoy_config_bootstrap_v3_Bootstrap_DynamicResources*)_upb_msg_new(&envoy_config_bootstrap_v3_Bootstrap_DynamicResources_msginit, arena); + if (!sub) return NULL; + envoy_config_bootstrap_v3_Bootstrap_set_dynamic_resources(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_cluster_manager(envoy_config_bootstrap_v3_Bootstrap *msg, envoy_config_bootstrap_v3_ClusterManager* value) { + _upb_sethas(msg, 4); + *UPB_PTR_AT(msg, UPB_SIZE(40, 80), envoy_config_bootstrap_v3_ClusterManager*) = value; +} +UPB_INLINE struct envoy_config_bootstrap_v3_ClusterManager* envoy_config_bootstrap_v3_Bootstrap_mutable_cluster_manager(envoy_config_bootstrap_v3_Bootstrap *msg, upb_arena *arena) { + struct envoy_config_bootstrap_v3_ClusterManager* sub = (struct envoy_config_bootstrap_v3_ClusterManager*)envoy_config_bootstrap_v3_Bootstrap_cluster_manager(msg); + if (sub == NULL) { + sub = (struct envoy_config_bootstrap_v3_ClusterManager*)_upb_msg_new(&envoy_config_bootstrap_v3_ClusterManager_msginit, arena); + if (!sub) return NULL; + envoy_config_bootstrap_v3_Bootstrap_set_cluster_manager(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_flags_path(envoy_config_bootstrap_v3_Bootstrap *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview) = value; +} +UPB_INLINE struct envoy_config_metrics_v3_StatsSink** envoy_config_bootstrap_v3_Bootstrap_mutable_stats_sinks(envoy_config_bootstrap_v3_Bootstrap *msg, size_t *len) { + return (struct envoy_config_metrics_v3_StatsSink**)_upb_array_mutable_accessor(msg, UPB_SIZE(88, 176), len); +} +UPB_INLINE struct envoy_config_metrics_v3_StatsSink** envoy_config_bootstrap_v3_Bootstrap_resize_stats_sinks(envoy_config_bootstrap_v3_Bootstrap *msg, size_t len, upb_arena *arena) { + return (struct envoy_config_metrics_v3_StatsSink**)_upb_array_resize_accessor2(msg, UPB_SIZE(88, 176), len, UPB_SIZE(2, 3), arena); +} +UPB_INLINE struct envoy_config_metrics_v3_StatsSink* envoy_config_bootstrap_v3_Bootstrap_add_stats_sinks(envoy_config_bootstrap_v3_Bootstrap *msg, upb_arena *arena) { + struct envoy_config_metrics_v3_StatsSink* sub = (struct envoy_config_metrics_v3_StatsSink*)_upb_msg_new(&envoy_config_metrics_v3_StatsSink_msginit, arena); + bool ok = _upb_array_append_accessor2( + msg, UPB_SIZE(88, 176), UPB_SIZE(2, 3), &sub, arena); + if (!ok) return NULL; + return sub; +} +UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_stats_flush_interval(envoy_config_bootstrap_v3_Bootstrap *msg, struct google_protobuf_Duration* value) { + _upb_sethas(msg, 5); + *UPB_PTR_AT(msg, UPB_SIZE(44, 88), struct google_protobuf_Duration*) = value; +} +UPB_INLINE struct google_protobuf_Duration* envoy_config_bootstrap_v3_Bootstrap_mutable_stats_flush_interval(envoy_config_bootstrap_v3_Bootstrap *msg, upb_arena *arena) { + struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_bootstrap_v3_Bootstrap_stats_flush_interval(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Duration*)_upb_msg_new(&google_protobuf_Duration_msginit, arena); + if (!sub) return NULL; + envoy_config_bootstrap_v3_Bootstrap_set_stats_flush_interval(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_watchdog(envoy_config_bootstrap_v3_Bootstrap *msg, envoy_config_bootstrap_v3_Watchdog* value) { + _upb_sethas(msg, 6); + *UPB_PTR_AT(msg, UPB_SIZE(48, 96), envoy_config_bootstrap_v3_Watchdog*) = value; +} +UPB_INLINE struct envoy_config_bootstrap_v3_Watchdog* envoy_config_bootstrap_v3_Bootstrap_mutable_watchdog(envoy_config_bootstrap_v3_Bootstrap *msg, upb_arena *arena) { + struct envoy_config_bootstrap_v3_Watchdog* sub = (struct envoy_config_bootstrap_v3_Watchdog*)envoy_config_bootstrap_v3_Bootstrap_watchdog(msg); + if (sub == NULL) { + sub = (struct envoy_config_bootstrap_v3_Watchdog*)_upb_msg_new(&envoy_config_bootstrap_v3_Watchdog_msginit, arena); + if (!sub) return NULL; + envoy_config_bootstrap_v3_Bootstrap_set_watchdog(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_tracing(envoy_config_bootstrap_v3_Bootstrap *msg, struct envoy_config_trace_v3_Tracing* value) { + _upb_sethas(msg, 7); + *UPB_PTR_AT(msg, UPB_SIZE(52, 104), struct envoy_config_trace_v3_Tracing*) = value; +} +UPB_INLINE struct envoy_config_trace_v3_Tracing* envoy_config_bootstrap_v3_Bootstrap_mutable_tracing(envoy_config_bootstrap_v3_Bootstrap *msg, upb_arena *arena) { + struct envoy_config_trace_v3_Tracing* sub = (struct envoy_config_trace_v3_Tracing*)envoy_config_bootstrap_v3_Bootstrap_tracing(msg); + if (sub == NULL) { + sub = (struct envoy_config_trace_v3_Tracing*)_upb_msg_new(&envoy_config_trace_v3_Tracing_msginit, arena); + if (!sub) return NULL; + envoy_config_bootstrap_v3_Bootstrap_set_tracing(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_admin(envoy_config_bootstrap_v3_Bootstrap *msg, envoy_config_bootstrap_v3_Admin* value) { + _upb_sethas(msg, 8); + *UPB_PTR_AT(msg, UPB_SIZE(56, 112), envoy_config_bootstrap_v3_Admin*) = value; +} +UPB_INLINE struct envoy_config_bootstrap_v3_Admin* envoy_config_bootstrap_v3_Bootstrap_mutable_admin(envoy_config_bootstrap_v3_Bootstrap *msg, upb_arena *arena) { + struct envoy_config_bootstrap_v3_Admin* sub = (struct envoy_config_bootstrap_v3_Admin*)envoy_config_bootstrap_v3_Bootstrap_admin(msg); + if (sub == NULL) { + sub = (struct envoy_config_bootstrap_v3_Admin*)_upb_msg_new(&envoy_config_bootstrap_v3_Admin_msginit, arena); + if (!sub) return NULL; + envoy_config_bootstrap_v3_Bootstrap_set_admin(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_stats_config(envoy_config_bootstrap_v3_Bootstrap *msg, struct envoy_config_metrics_v3_StatsConfig* value) { + _upb_sethas(msg, 9); + *UPB_PTR_AT(msg, UPB_SIZE(60, 120), struct envoy_config_metrics_v3_StatsConfig*) = value; +} +UPB_INLINE struct envoy_config_metrics_v3_StatsConfig* envoy_config_bootstrap_v3_Bootstrap_mutable_stats_config(envoy_config_bootstrap_v3_Bootstrap *msg, upb_arena *arena) { + struct envoy_config_metrics_v3_StatsConfig* sub = (struct envoy_config_metrics_v3_StatsConfig*)envoy_config_bootstrap_v3_Bootstrap_stats_config(msg); + if (sub == NULL) { + sub = (struct envoy_config_metrics_v3_StatsConfig*)_upb_msg_new(&envoy_config_metrics_v3_StatsConfig_msginit, arena); + if (!sub) return NULL; + envoy_config_bootstrap_v3_Bootstrap_set_stats_config(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_hds_config(envoy_config_bootstrap_v3_Bootstrap *msg, struct envoy_config_core_v3_ApiConfigSource* value) { + _upb_sethas(msg, 10); + *UPB_PTR_AT(msg, UPB_SIZE(64, 128), struct envoy_config_core_v3_ApiConfigSource*) = value; +} +UPB_INLINE struct envoy_config_core_v3_ApiConfigSource* envoy_config_bootstrap_v3_Bootstrap_mutable_hds_config(envoy_config_bootstrap_v3_Bootstrap *msg, upb_arena *arena) { + struct envoy_config_core_v3_ApiConfigSource* sub = (struct envoy_config_core_v3_ApiConfigSource*)envoy_config_bootstrap_v3_Bootstrap_hds_config(msg); + if (sub == NULL) { + sub = (struct envoy_config_core_v3_ApiConfigSource*)_upb_msg_new(&envoy_config_core_v3_ApiConfigSource_msginit, arena); + if (!sub) return NULL; + envoy_config_bootstrap_v3_Bootstrap_set_hds_config(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_overload_manager(envoy_config_bootstrap_v3_Bootstrap *msg, struct envoy_config_overload_v3_OverloadManager* value) { + _upb_sethas(msg, 11); + *UPB_PTR_AT(msg, UPB_SIZE(68, 136), struct envoy_config_overload_v3_OverloadManager*) = value; +} +UPB_INLINE struct envoy_config_overload_v3_OverloadManager* envoy_config_bootstrap_v3_Bootstrap_mutable_overload_manager(envoy_config_bootstrap_v3_Bootstrap *msg, upb_arena *arena) { + struct envoy_config_overload_v3_OverloadManager* sub = (struct envoy_config_overload_v3_OverloadManager*)envoy_config_bootstrap_v3_Bootstrap_overload_manager(msg); + if (sub == NULL) { + sub = (struct envoy_config_overload_v3_OverloadManager*)_upb_msg_new(&envoy_config_overload_v3_OverloadManager_msginit, arena); + if (!sub) return NULL; + envoy_config_bootstrap_v3_Bootstrap_set_overload_manager(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_enable_dispatcher_stats(envoy_config_bootstrap_v3_Bootstrap *msg, bool value) { + *UPB_PTR_AT(msg, UPB_SIZE(2, 2), bool) = value; +} +UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_layered_runtime(envoy_config_bootstrap_v3_Bootstrap *msg, envoy_config_bootstrap_v3_LayeredRuntime* value) { + _upb_sethas(msg, 12); + *UPB_PTR_AT(msg, UPB_SIZE(72, 144), envoy_config_bootstrap_v3_LayeredRuntime*) = value; +} +UPB_INLINE struct envoy_config_bootstrap_v3_LayeredRuntime* envoy_config_bootstrap_v3_Bootstrap_mutable_layered_runtime(envoy_config_bootstrap_v3_Bootstrap *msg, upb_arena *arena) { + struct envoy_config_bootstrap_v3_LayeredRuntime* sub = (struct envoy_config_bootstrap_v3_LayeredRuntime*)envoy_config_bootstrap_v3_Bootstrap_layered_runtime(msg); + if (sub == NULL) { + sub = (struct envoy_config_bootstrap_v3_LayeredRuntime*)_upb_msg_new(&envoy_config_bootstrap_v3_LayeredRuntime_msginit, arena); + if (!sub) return NULL; + envoy_config_bootstrap_v3_Bootstrap_set_layered_runtime(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_header_prefix(envoy_config_bootstrap_v3_Bootstrap *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(12, 24), upb_strview) = value; +} +UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_stats_server_version_override(envoy_config_bootstrap_v3_Bootstrap *msg, struct google_protobuf_UInt64Value* value) { + _upb_sethas(msg, 13); + *UPB_PTR_AT(msg, UPB_SIZE(76, 152), struct google_protobuf_UInt64Value*) = value; +} +UPB_INLINE struct google_protobuf_UInt64Value* envoy_config_bootstrap_v3_Bootstrap_mutable_stats_server_version_override(envoy_config_bootstrap_v3_Bootstrap *msg, upb_arena *arena) { + struct google_protobuf_UInt64Value* sub = (struct google_protobuf_UInt64Value*)envoy_config_bootstrap_v3_Bootstrap_stats_server_version_override(msg); + if (sub == NULL) { + sub = (struct google_protobuf_UInt64Value*)_upb_msg_new(&google_protobuf_UInt64Value_msginit, arena); + if (!sub) return NULL; + envoy_config_bootstrap_v3_Bootstrap_set_stats_server_version_override(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_use_tcp_for_dns_lookups(envoy_config_bootstrap_v3_Bootstrap *msg, bool value) { + *UPB_PTR_AT(msg, UPB_SIZE(3, 3), bool) = value; +} +UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig** envoy_config_bootstrap_v3_Bootstrap_mutable_bootstrap_extensions(envoy_config_bootstrap_v3_Bootstrap *msg, size_t *len) { + return (struct envoy_config_core_v3_TypedExtensionConfig**)_upb_array_mutable_accessor(msg, UPB_SIZE(92, 184), len); +} +UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig** envoy_config_bootstrap_v3_Bootstrap_resize_bootstrap_extensions(envoy_config_bootstrap_v3_Bootstrap *msg, size_t len, upb_arena *arena) { + return (struct envoy_config_core_v3_TypedExtensionConfig**)_upb_array_resize_accessor2(msg, UPB_SIZE(92, 184), len, UPB_SIZE(2, 3), arena); +} +UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootstrap_v3_Bootstrap_add_bootstrap_extensions(envoy_config_bootstrap_v3_Bootstrap *msg, upb_arena *arena) { + struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_msg_new(&envoy_config_core_v3_TypedExtensionConfig_msginit, arena); + bool ok = _upb_array_append_accessor2( + msg, UPB_SIZE(92, 184), UPB_SIZE(2, 3), &sub, arena); + if (!ok) return NULL; + return sub; +} +UPB_INLINE struct envoy_config_core_v3_ConfigSource** envoy_config_bootstrap_v3_Bootstrap_mutable_config_sources(envoy_config_bootstrap_v3_Bootstrap *msg, size_t *len) { + return (struct envoy_config_core_v3_ConfigSource**)_upb_array_mutable_accessor(msg, UPB_SIZE(96, 192), len); +} +UPB_INLINE struct envoy_config_core_v3_ConfigSource** envoy_config_bootstrap_v3_Bootstrap_resize_config_sources(envoy_config_bootstrap_v3_Bootstrap *msg, size_t len, upb_arena *arena) { + return (struct envoy_config_core_v3_ConfigSource**)_upb_array_resize_accessor2(msg, UPB_SIZE(96, 192), len, UPB_SIZE(2, 3), arena); +} +UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_config_bootstrap_v3_Bootstrap_add_config_sources(envoy_config_bootstrap_v3_Bootstrap *msg, upb_arena *arena) { + struct envoy_config_core_v3_ConfigSource* sub = (struct envoy_config_core_v3_ConfigSource*)_upb_msg_new(&envoy_config_core_v3_ConfigSource_msginit, arena); + bool ok = _upb_array_append_accessor2( + msg, UPB_SIZE(96, 192), UPB_SIZE(2, 3), &sub, arena); + if (!ok) return NULL; + return sub; +} +UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_default_config_source(envoy_config_bootstrap_v3_Bootstrap *msg, struct envoy_config_core_v3_ConfigSource* value) { + _upb_sethas(msg, 14); + *UPB_PTR_AT(msg, UPB_SIZE(80, 160), struct envoy_config_core_v3_ConfigSource*) = value; +} +UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_config_bootstrap_v3_Bootstrap_mutable_default_config_source(envoy_config_bootstrap_v3_Bootstrap *msg, upb_arena *arena) { + struct envoy_config_core_v3_ConfigSource* sub = (struct envoy_config_core_v3_ConfigSource*)envoy_config_bootstrap_v3_Bootstrap_default_config_source(msg); + if (sub == NULL) { + sub = (struct envoy_config_core_v3_ConfigSource*)_upb_msg_new(&envoy_config_core_v3_ConfigSource_msginit, arena); + if (!sub) return NULL; + envoy_config_bootstrap_v3_Bootstrap_set_default_config_source(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_default_socket_interface(envoy_config_bootstrap_v3_Bootstrap *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(20, 40), upb_strview) = value; +} +UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_certificate_provider_instances_clear(envoy_config_bootstrap_v3_Bootstrap *msg) { _upb_msg_map_clear(msg, UPB_SIZE(100, 200)); } +UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_certificate_provider_instances_set(envoy_config_bootstrap_v3_Bootstrap *msg, upb_strview key, struct envoy_config_core_v3_TypedExtensionConfig* val, upb_arena *a) { return _upb_msg_map_set(msg, UPB_SIZE(100, 200), &key, 0, &val, sizeof(val), a); } +UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_certificate_provider_instances_delete(envoy_config_bootstrap_v3_Bootstrap *msg, upb_strview key) { return _upb_msg_map_delete(msg, UPB_SIZE(100, 200), &key, 0); } +UPB_INLINE envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry* envoy_config_bootstrap_v3_Bootstrap_certificate_provider_instances_nextmutable(envoy_config_bootstrap_v3_Bootstrap *msg, size_t* iter) { return (envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry*)_upb_msg_map_next(msg, UPB_SIZE(100, 200), iter); } +UPB_INLINE upb_strview* envoy_config_bootstrap_v3_Bootstrap_mutable_node_context_params(envoy_config_bootstrap_v3_Bootstrap *msg, size_t *len) { + return (upb_strview*)_upb_array_mutable_accessor(msg, UPB_SIZE(104, 208), len); +} +UPB_INLINE upb_strview* envoy_config_bootstrap_v3_Bootstrap_resize_node_context_params(envoy_config_bootstrap_v3_Bootstrap *msg, size_t len, upb_arena *arena) { + return (upb_strview*)_upb_array_resize_accessor2(msg, UPB_SIZE(104, 208), len, UPB_SIZE(3, 4), arena); +} +UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_add_node_context_params(envoy_config_bootstrap_v3_Bootstrap *msg, upb_strview val, upb_arena *arena) { + return _upb_array_append_accessor2(msg, UPB_SIZE(104, 208), UPB_SIZE(3, 4), &val, + arena); +} +UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_watchdogs(envoy_config_bootstrap_v3_Bootstrap *msg, envoy_config_bootstrap_v3_Watchdogs* value) { + _upb_sethas(msg, 15); + *UPB_PTR_AT(msg, UPB_SIZE(84, 168), envoy_config_bootstrap_v3_Watchdogs*) = value; +} +UPB_INLINE struct envoy_config_bootstrap_v3_Watchdogs* envoy_config_bootstrap_v3_Bootstrap_mutable_watchdogs(envoy_config_bootstrap_v3_Bootstrap *msg, upb_arena *arena) { + struct envoy_config_bootstrap_v3_Watchdogs* sub = (struct envoy_config_bootstrap_v3_Watchdogs*)envoy_config_bootstrap_v3_Bootstrap_watchdogs(msg); + if (sub == NULL) { + sub = (struct envoy_config_bootstrap_v3_Watchdogs*)_upb_msg_new(&envoy_config_bootstrap_v3_Watchdogs_msginit, arena); + if (!sub) return NULL; + envoy_config_bootstrap_v3_Bootstrap_set_watchdogs(msg, sub); + } + return sub; +} +UPB_INLINE envoy_config_bootstrap_v3_FatalAction** envoy_config_bootstrap_v3_Bootstrap_mutable_fatal_actions(envoy_config_bootstrap_v3_Bootstrap *msg, size_t *len) { + return (envoy_config_bootstrap_v3_FatalAction**)_upb_array_mutable_accessor(msg, UPB_SIZE(108, 216), len); +} +UPB_INLINE envoy_config_bootstrap_v3_FatalAction** envoy_config_bootstrap_v3_Bootstrap_resize_fatal_actions(envoy_config_bootstrap_v3_Bootstrap *msg, size_t len, upb_arena *arena) { + return (envoy_config_bootstrap_v3_FatalAction**)_upb_array_resize_accessor2(msg, UPB_SIZE(108, 216), len, UPB_SIZE(2, 3), arena); +} +UPB_INLINE struct envoy_config_bootstrap_v3_FatalAction* envoy_config_bootstrap_v3_Bootstrap_add_fatal_actions(envoy_config_bootstrap_v3_Bootstrap *msg, upb_arena *arena) { + struct envoy_config_bootstrap_v3_FatalAction* sub = (struct envoy_config_bootstrap_v3_FatalAction*)_upb_msg_new(&envoy_config_bootstrap_v3_FatalAction_msginit, arena); + bool ok = _upb_array_append_accessor2( + msg, UPB_SIZE(108, 216), UPB_SIZE(2, 3), &sub, arena); + if (!ok) return NULL; + return sub; +} +UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_set_stats_flush_on_admin(envoy_config_bootstrap_v3_Bootstrap *msg, bool value) { + UPB_WRITE_ONEOF(msg, bool, UPB_SIZE(112, 224), value, UPB_SIZE(116, 228), 29); +} + +/* envoy.config.bootstrap.v3.Bootstrap.StaticResources */ + +UPB_INLINE envoy_config_bootstrap_v3_Bootstrap_StaticResources *envoy_config_bootstrap_v3_Bootstrap_StaticResources_new(upb_arena *arena) { + return (envoy_config_bootstrap_v3_Bootstrap_StaticResources *)_upb_msg_new(&envoy_config_bootstrap_v3_Bootstrap_StaticResources_msginit, arena); +} +UPB_INLINE envoy_config_bootstrap_v3_Bootstrap_StaticResources *envoy_config_bootstrap_v3_Bootstrap_StaticResources_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_config_bootstrap_v3_Bootstrap_StaticResources *ret = envoy_config_bootstrap_v3_Bootstrap_StaticResources_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_Bootstrap_StaticResources_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_config_bootstrap_v3_Bootstrap_StaticResources *envoy_config_bootstrap_v3_Bootstrap_StaticResources_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_config_bootstrap_v3_Bootstrap_StaticResources *ret = envoy_config_bootstrap_v3_Bootstrap_StaticResources_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_Bootstrap_StaticResources_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_config_bootstrap_v3_Bootstrap_StaticResources_serialize(const envoy_config_bootstrap_v3_Bootstrap_StaticResources *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_config_bootstrap_v3_Bootstrap_StaticResources_msginit, arena, len); +} + +UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_StaticResources_has_listeners(const envoy_config_bootstrap_v3_Bootstrap_StaticResources *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(0, 0)); } +UPB_INLINE const struct envoy_config_listener_v3_Listener* const* envoy_config_bootstrap_v3_Bootstrap_StaticResources_listeners(const envoy_config_bootstrap_v3_Bootstrap_StaticResources *msg, size_t *len) { return (const struct envoy_config_listener_v3_Listener* const*)_upb_array_accessor(msg, UPB_SIZE(0, 0), len); } +UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_StaticResources_has_clusters(const envoy_config_bootstrap_v3_Bootstrap_StaticResources *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(4, 8)); } +UPB_INLINE const struct envoy_config_cluster_v3_Cluster* const* envoy_config_bootstrap_v3_Bootstrap_StaticResources_clusters(const envoy_config_bootstrap_v3_Bootstrap_StaticResources *msg, size_t *len) { return (const struct envoy_config_cluster_v3_Cluster* const*)_upb_array_accessor(msg, UPB_SIZE(4, 8), len); } +UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_StaticResources_has_secrets(const envoy_config_bootstrap_v3_Bootstrap_StaticResources *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(8, 16)); } +UPB_INLINE const struct envoy_extensions_transport_sockets_tls_v3_Secret* const* envoy_config_bootstrap_v3_Bootstrap_StaticResources_secrets(const envoy_config_bootstrap_v3_Bootstrap_StaticResources *msg, size_t *len) { return (const struct envoy_extensions_transport_sockets_tls_v3_Secret* const*)_upb_array_accessor(msg, UPB_SIZE(8, 16), len); } + +UPB_INLINE struct envoy_config_listener_v3_Listener** envoy_config_bootstrap_v3_Bootstrap_StaticResources_mutable_listeners(envoy_config_bootstrap_v3_Bootstrap_StaticResources *msg, size_t *len) { + return (struct envoy_config_listener_v3_Listener**)_upb_array_mutable_accessor(msg, UPB_SIZE(0, 0), len); +} +UPB_INLINE struct envoy_config_listener_v3_Listener** envoy_config_bootstrap_v3_Bootstrap_StaticResources_resize_listeners(envoy_config_bootstrap_v3_Bootstrap_StaticResources *msg, size_t len, upb_arena *arena) { + return (struct envoy_config_listener_v3_Listener**)_upb_array_resize_accessor2(msg, UPB_SIZE(0, 0), len, UPB_SIZE(2, 3), arena); +} +UPB_INLINE struct envoy_config_listener_v3_Listener* envoy_config_bootstrap_v3_Bootstrap_StaticResources_add_listeners(envoy_config_bootstrap_v3_Bootstrap_StaticResources *msg, upb_arena *arena) { + struct envoy_config_listener_v3_Listener* sub = (struct envoy_config_listener_v3_Listener*)_upb_msg_new(&envoy_config_listener_v3_Listener_msginit, arena); + bool ok = _upb_array_append_accessor2( + msg, UPB_SIZE(0, 0), UPB_SIZE(2, 3), &sub, arena); + if (!ok) return NULL; + return sub; +} +UPB_INLINE struct envoy_config_cluster_v3_Cluster** envoy_config_bootstrap_v3_Bootstrap_StaticResources_mutable_clusters(envoy_config_bootstrap_v3_Bootstrap_StaticResources *msg, size_t *len) { + return (struct envoy_config_cluster_v3_Cluster**)_upb_array_mutable_accessor(msg, UPB_SIZE(4, 8), len); +} +UPB_INLINE struct envoy_config_cluster_v3_Cluster** envoy_config_bootstrap_v3_Bootstrap_StaticResources_resize_clusters(envoy_config_bootstrap_v3_Bootstrap_StaticResources *msg, size_t len, upb_arena *arena) { + return (struct envoy_config_cluster_v3_Cluster**)_upb_array_resize_accessor2(msg, UPB_SIZE(4, 8), len, UPB_SIZE(2, 3), arena); +} +UPB_INLINE struct envoy_config_cluster_v3_Cluster* envoy_config_bootstrap_v3_Bootstrap_StaticResources_add_clusters(envoy_config_bootstrap_v3_Bootstrap_StaticResources *msg, upb_arena *arena) { + struct envoy_config_cluster_v3_Cluster* sub = (struct envoy_config_cluster_v3_Cluster*)_upb_msg_new(&envoy_config_cluster_v3_Cluster_msginit, arena); + bool ok = _upb_array_append_accessor2( + msg, UPB_SIZE(4, 8), UPB_SIZE(2, 3), &sub, arena); + if (!ok) return NULL; + return sub; +} +UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_Secret** envoy_config_bootstrap_v3_Bootstrap_StaticResources_mutable_secrets(envoy_config_bootstrap_v3_Bootstrap_StaticResources *msg, size_t *len) { + return (struct envoy_extensions_transport_sockets_tls_v3_Secret**)_upb_array_mutable_accessor(msg, UPB_SIZE(8, 16), len); +} +UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_Secret** envoy_config_bootstrap_v3_Bootstrap_StaticResources_resize_secrets(envoy_config_bootstrap_v3_Bootstrap_StaticResources *msg, size_t len, upb_arena *arena) { + return (struct envoy_extensions_transport_sockets_tls_v3_Secret**)_upb_array_resize_accessor2(msg, UPB_SIZE(8, 16), len, UPB_SIZE(2, 3), arena); +} +UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_Secret* envoy_config_bootstrap_v3_Bootstrap_StaticResources_add_secrets(envoy_config_bootstrap_v3_Bootstrap_StaticResources *msg, upb_arena *arena) { + struct envoy_extensions_transport_sockets_tls_v3_Secret* sub = (struct envoy_extensions_transport_sockets_tls_v3_Secret*)_upb_msg_new(&envoy_extensions_transport_sockets_tls_v3_Secret_msginit, arena); + bool ok = _upb_array_append_accessor2( + msg, UPB_SIZE(8, 16), UPB_SIZE(2, 3), &sub, arena); + if (!ok) return NULL; + return sub; +} + +/* envoy.config.bootstrap.v3.Bootstrap.DynamicResources */ + +UPB_INLINE envoy_config_bootstrap_v3_Bootstrap_DynamicResources *envoy_config_bootstrap_v3_Bootstrap_DynamicResources_new(upb_arena *arena) { + return (envoy_config_bootstrap_v3_Bootstrap_DynamicResources *)_upb_msg_new(&envoy_config_bootstrap_v3_Bootstrap_DynamicResources_msginit, arena); +} +UPB_INLINE envoy_config_bootstrap_v3_Bootstrap_DynamicResources *envoy_config_bootstrap_v3_Bootstrap_DynamicResources_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_config_bootstrap_v3_Bootstrap_DynamicResources *ret = envoy_config_bootstrap_v3_Bootstrap_DynamicResources_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_Bootstrap_DynamicResources_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_config_bootstrap_v3_Bootstrap_DynamicResources *envoy_config_bootstrap_v3_Bootstrap_DynamicResources_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_config_bootstrap_v3_Bootstrap_DynamicResources *ret = envoy_config_bootstrap_v3_Bootstrap_DynamicResources_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_Bootstrap_DynamicResources_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_config_bootstrap_v3_Bootstrap_DynamicResources_serialize(const envoy_config_bootstrap_v3_Bootstrap_DynamicResources *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_config_bootstrap_v3_Bootstrap_DynamicResources_msginit, arena, len); +} + +UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_DynamicResources_has_lds_config(const envoy_config_bootstrap_v3_Bootstrap_DynamicResources *msg) { return _upb_hasbit(msg, 1); } +UPB_INLINE const struct envoy_config_core_v3_ConfigSource* envoy_config_bootstrap_v3_Bootstrap_DynamicResources_lds_config(const envoy_config_bootstrap_v3_Bootstrap_DynamicResources *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(20, 40), const struct envoy_config_core_v3_ConfigSource*); } +UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_DynamicResources_has_cds_config(const envoy_config_bootstrap_v3_Bootstrap_DynamicResources *msg) { return _upb_hasbit(msg, 2); } +UPB_INLINE const struct envoy_config_core_v3_ConfigSource* envoy_config_bootstrap_v3_Bootstrap_DynamicResources_cds_config(const envoy_config_bootstrap_v3_Bootstrap_DynamicResources *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(24, 48), const struct envoy_config_core_v3_ConfigSource*); } +UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_DynamicResources_has_ads_config(const envoy_config_bootstrap_v3_Bootstrap_DynamicResources *msg) { return _upb_hasbit(msg, 3); } +UPB_INLINE const struct envoy_config_core_v3_ApiConfigSource* envoy_config_bootstrap_v3_Bootstrap_DynamicResources_ads_config(const envoy_config_bootstrap_v3_Bootstrap_DynamicResources *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(28, 56), const struct envoy_config_core_v3_ApiConfigSource*); } +UPB_INLINE upb_strview envoy_config_bootstrap_v3_Bootstrap_DynamicResources_lds_resources_locator(const envoy_config_bootstrap_v3_Bootstrap_DynamicResources *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview); } +UPB_INLINE upb_strview envoy_config_bootstrap_v3_Bootstrap_DynamicResources_cds_resources_locator(const envoy_config_bootstrap_v3_Bootstrap_DynamicResources *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(12, 24), upb_strview); } + +UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_DynamicResources_set_lds_config(envoy_config_bootstrap_v3_Bootstrap_DynamicResources *msg, struct envoy_config_core_v3_ConfigSource* value) { + _upb_sethas(msg, 1); + *UPB_PTR_AT(msg, UPB_SIZE(20, 40), struct envoy_config_core_v3_ConfigSource*) = value; +} +UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_config_bootstrap_v3_Bootstrap_DynamicResources_mutable_lds_config(envoy_config_bootstrap_v3_Bootstrap_DynamicResources *msg, upb_arena *arena) { + struct envoy_config_core_v3_ConfigSource* sub = (struct envoy_config_core_v3_ConfigSource*)envoy_config_bootstrap_v3_Bootstrap_DynamicResources_lds_config(msg); + if (sub == NULL) { + sub = (struct envoy_config_core_v3_ConfigSource*)_upb_msg_new(&envoy_config_core_v3_ConfigSource_msginit, arena); + if (!sub) return NULL; + envoy_config_bootstrap_v3_Bootstrap_DynamicResources_set_lds_config(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_DynamicResources_set_cds_config(envoy_config_bootstrap_v3_Bootstrap_DynamicResources *msg, struct envoy_config_core_v3_ConfigSource* value) { + _upb_sethas(msg, 2); + *UPB_PTR_AT(msg, UPB_SIZE(24, 48), struct envoy_config_core_v3_ConfigSource*) = value; +} +UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_config_bootstrap_v3_Bootstrap_DynamicResources_mutable_cds_config(envoy_config_bootstrap_v3_Bootstrap_DynamicResources *msg, upb_arena *arena) { + struct envoy_config_core_v3_ConfigSource* sub = (struct envoy_config_core_v3_ConfigSource*)envoy_config_bootstrap_v3_Bootstrap_DynamicResources_cds_config(msg); + if (sub == NULL) { + sub = (struct envoy_config_core_v3_ConfigSource*)_upb_msg_new(&envoy_config_core_v3_ConfigSource_msginit, arena); + if (!sub) return NULL; + envoy_config_bootstrap_v3_Bootstrap_DynamicResources_set_cds_config(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_DynamicResources_set_ads_config(envoy_config_bootstrap_v3_Bootstrap_DynamicResources *msg, struct envoy_config_core_v3_ApiConfigSource* value) { + _upb_sethas(msg, 3); + *UPB_PTR_AT(msg, UPB_SIZE(28, 56), struct envoy_config_core_v3_ApiConfigSource*) = value; +} +UPB_INLINE struct envoy_config_core_v3_ApiConfigSource* envoy_config_bootstrap_v3_Bootstrap_DynamicResources_mutable_ads_config(envoy_config_bootstrap_v3_Bootstrap_DynamicResources *msg, upb_arena *arena) { + struct envoy_config_core_v3_ApiConfigSource* sub = (struct envoy_config_core_v3_ApiConfigSource*)envoy_config_bootstrap_v3_Bootstrap_DynamicResources_ads_config(msg); + if (sub == NULL) { + sub = (struct envoy_config_core_v3_ApiConfigSource*)_upb_msg_new(&envoy_config_core_v3_ApiConfigSource_msginit, arena); + if (!sub) return NULL; + envoy_config_bootstrap_v3_Bootstrap_DynamicResources_set_ads_config(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_DynamicResources_set_lds_resources_locator(envoy_config_bootstrap_v3_Bootstrap_DynamicResources *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview) = value; +} +UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_DynamicResources_set_cds_resources_locator(envoy_config_bootstrap_v3_Bootstrap_DynamicResources *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(12, 24), upb_strview) = value; +} + +/* envoy.config.bootstrap.v3.Bootstrap.CertificateProviderInstancesEntry */ + +UPB_INLINE upb_strview envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry_key(const envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry *msg) { + upb_strview ret; + _upb_msg_map_key(msg, &ret, 0); + return ret; +} +UPB_INLINE bool envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry_has_value(const envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(8, 16)); } +UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry_value(const envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry *msg) { + struct envoy_config_core_v3_TypedExtensionConfig* ret; + _upb_msg_map_value(msg, &ret, sizeof(ret)); + return ret; +} + +UPB_INLINE void envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry_set_value(envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { + _upb_msg_map_set_value(msg, &value, sizeof(struct envoy_config_core_v3_TypedExtensionConfig*)); +} + +/* envoy.config.bootstrap.v3.Admin */ + +UPB_INLINE envoy_config_bootstrap_v3_Admin *envoy_config_bootstrap_v3_Admin_new(upb_arena *arena) { + return (envoy_config_bootstrap_v3_Admin *)_upb_msg_new(&envoy_config_bootstrap_v3_Admin_msginit, arena); +} +UPB_INLINE envoy_config_bootstrap_v3_Admin *envoy_config_bootstrap_v3_Admin_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_config_bootstrap_v3_Admin *ret = envoy_config_bootstrap_v3_Admin_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_Admin_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_config_bootstrap_v3_Admin *envoy_config_bootstrap_v3_Admin_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_config_bootstrap_v3_Admin *ret = envoy_config_bootstrap_v3_Admin_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_Admin_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_config_bootstrap_v3_Admin_serialize(const envoy_config_bootstrap_v3_Admin *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_config_bootstrap_v3_Admin_msginit, arena, len); +} + +UPB_INLINE upb_strview envoy_config_bootstrap_v3_Admin_access_log_path(const envoy_config_bootstrap_v3_Admin *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview); } +UPB_INLINE upb_strview envoy_config_bootstrap_v3_Admin_profile_path(const envoy_config_bootstrap_v3_Admin *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(12, 24), upb_strview); } +UPB_INLINE bool envoy_config_bootstrap_v3_Admin_has_address(const envoy_config_bootstrap_v3_Admin *msg) { return _upb_hasbit(msg, 1); } +UPB_INLINE const struct envoy_config_core_v3_Address* envoy_config_bootstrap_v3_Admin_address(const envoy_config_bootstrap_v3_Admin *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(20, 40), const struct envoy_config_core_v3_Address*); } +UPB_INLINE bool envoy_config_bootstrap_v3_Admin_has_socket_options(const envoy_config_bootstrap_v3_Admin *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(24, 48)); } +UPB_INLINE const struct envoy_config_core_v3_SocketOption* const* envoy_config_bootstrap_v3_Admin_socket_options(const envoy_config_bootstrap_v3_Admin *msg, size_t *len) { return (const struct envoy_config_core_v3_SocketOption* const*)_upb_array_accessor(msg, UPB_SIZE(24, 48), len); } + +UPB_INLINE void envoy_config_bootstrap_v3_Admin_set_access_log_path(envoy_config_bootstrap_v3_Admin *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview) = value; +} +UPB_INLINE void envoy_config_bootstrap_v3_Admin_set_profile_path(envoy_config_bootstrap_v3_Admin *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(12, 24), upb_strview) = value; +} +UPB_INLINE void envoy_config_bootstrap_v3_Admin_set_address(envoy_config_bootstrap_v3_Admin *msg, struct envoy_config_core_v3_Address* value) { + _upb_sethas(msg, 1); + *UPB_PTR_AT(msg, UPB_SIZE(20, 40), struct envoy_config_core_v3_Address*) = value; +} +UPB_INLINE struct envoy_config_core_v3_Address* envoy_config_bootstrap_v3_Admin_mutable_address(envoy_config_bootstrap_v3_Admin *msg, upb_arena *arena) { + struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)envoy_config_bootstrap_v3_Admin_address(msg); + if (sub == NULL) { + sub = (struct envoy_config_core_v3_Address*)_upb_msg_new(&envoy_config_core_v3_Address_msginit, arena); + if (!sub) return NULL; + envoy_config_bootstrap_v3_Admin_set_address(msg, sub); + } + return sub; +} +UPB_INLINE struct envoy_config_core_v3_SocketOption** envoy_config_bootstrap_v3_Admin_mutable_socket_options(envoy_config_bootstrap_v3_Admin *msg, size_t *len) { + return (struct envoy_config_core_v3_SocketOption**)_upb_array_mutable_accessor(msg, UPB_SIZE(24, 48), len); +} +UPB_INLINE struct envoy_config_core_v3_SocketOption** envoy_config_bootstrap_v3_Admin_resize_socket_options(envoy_config_bootstrap_v3_Admin *msg, size_t len, upb_arena *arena) { + return (struct envoy_config_core_v3_SocketOption**)_upb_array_resize_accessor2(msg, UPB_SIZE(24, 48), len, UPB_SIZE(2, 3), arena); +} +UPB_INLINE struct envoy_config_core_v3_SocketOption* envoy_config_bootstrap_v3_Admin_add_socket_options(envoy_config_bootstrap_v3_Admin *msg, upb_arena *arena) { + struct envoy_config_core_v3_SocketOption* sub = (struct envoy_config_core_v3_SocketOption*)_upb_msg_new(&envoy_config_core_v3_SocketOption_msginit, arena); + bool ok = _upb_array_append_accessor2( + msg, UPB_SIZE(24, 48), UPB_SIZE(2, 3), &sub, arena); + if (!ok) return NULL; + return sub; +} + +/* envoy.config.bootstrap.v3.ClusterManager */ + +UPB_INLINE envoy_config_bootstrap_v3_ClusterManager *envoy_config_bootstrap_v3_ClusterManager_new(upb_arena *arena) { + return (envoy_config_bootstrap_v3_ClusterManager *)_upb_msg_new(&envoy_config_bootstrap_v3_ClusterManager_msginit, arena); +} +UPB_INLINE envoy_config_bootstrap_v3_ClusterManager *envoy_config_bootstrap_v3_ClusterManager_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_config_bootstrap_v3_ClusterManager *ret = envoy_config_bootstrap_v3_ClusterManager_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_ClusterManager_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_config_bootstrap_v3_ClusterManager *envoy_config_bootstrap_v3_ClusterManager_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_config_bootstrap_v3_ClusterManager *ret = envoy_config_bootstrap_v3_ClusterManager_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_ClusterManager_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_config_bootstrap_v3_ClusterManager_serialize(const envoy_config_bootstrap_v3_ClusterManager *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_config_bootstrap_v3_ClusterManager_msginit, arena, len); +} + +UPB_INLINE upb_strview envoy_config_bootstrap_v3_ClusterManager_local_cluster_name(const envoy_config_bootstrap_v3_ClusterManager *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview); } +UPB_INLINE bool envoy_config_bootstrap_v3_ClusterManager_has_outlier_detection(const envoy_config_bootstrap_v3_ClusterManager *msg) { return _upb_hasbit(msg, 1); } +UPB_INLINE const envoy_config_bootstrap_v3_ClusterManager_OutlierDetection* envoy_config_bootstrap_v3_ClusterManager_outlier_detection(const envoy_config_bootstrap_v3_ClusterManager *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(12, 24), const envoy_config_bootstrap_v3_ClusterManager_OutlierDetection*); } +UPB_INLINE bool envoy_config_bootstrap_v3_ClusterManager_has_upstream_bind_config(const envoy_config_bootstrap_v3_ClusterManager *msg) { return _upb_hasbit(msg, 2); } +UPB_INLINE const struct envoy_config_core_v3_BindConfig* envoy_config_bootstrap_v3_ClusterManager_upstream_bind_config(const envoy_config_bootstrap_v3_ClusterManager *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(16, 32), const struct envoy_config_core_v3_BindConfig*); } +UPB_INLINE bool envoy_config_bootstrap_v3_ClusterManager_has_load_stats_config(const envoy_config_bootstrap_v3_ClusterManager *msg) { return _upb_hasbit(msg, 3); } +UPB_INLINE const struct envoy_config_core_v3_ApiConfigSource* envoy_config_bootstrap_v3_ClusterManager_load_stats_config(const envoy_config_bootstrap_v3_ClusterManager *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(20, 40), const struct envoy_config_core_v3_ApiConfigSource*); } + +UPB_INLINE void envoy_config_bootstrap_v3_ClusterManager_set_local_cluster_name(envoy_config_bootstrap_v3_ClusterManager *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview) = value; +} +UPB_INLINE void envoy_config_bootstrap_v3_ClusterManager_set_outlier_detection(envoy_config_bootstrap_v3_ClusterManager *msg, envoy_config_bootstrap_v3_ClusterManager_OutlierDetection* value) { + _upb_sethas(msg, 1); + *UPB_PTR_AT(msg, UPB_SIZE(12, 24), envoy_config_bootstrap_v3_ClusterManager_OutlierDetection*) = value; +} +UPB_INLINE struct envoy_config_bootstrap_v3_ClusterManager_OutlierDetection* envoy_config_bootstrap_v3_ClusterManager_mutable_outlier_detection(envoy_config_bootstrap_v3_ClusterManager *msg, upb_arena *arena) { + struct envoy_config_bootstrap_v3_ClusterManager_OutlierDetection* sub = (struct envoy_config_bootstrap_v3_ClusterManager_OutlierDetection*)envoy_config_bootstrap_v3_ClusterManager_outlier_detection(msg); + if (sub == NULL) { + sub = (struct envoy_config_bootstrap_v3_ClusterManager_OutlierDetection*)_upb_msg_new(&envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_msginit, arena); + if (!sub) return NULL; + envoy_config_bootstrap_v3_ClusterManager_set_outlier_detection(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_config_bootstrap_v3_ClusterManager_set_upstream_bind_config(envoy_config_bootstrap_v3_ClusterManager *msg, struct envoy_config_core_v3_BindConfig* value) { + _upb_sethas(msg, 2); + *UPB_PTR_AT(msg, UPB_SIZE(16, 32), struct envoy_config_core_v3_BindConfig*) = value; +} +UPB_INLINE struct envoy_config_core_v3_BindConfig* envoy_config_bootstrap_v3_ClusterManager_mutable_upstream_bind_config(envoy_config_bootstrap_v3_ClusterManager *msg, upb_arena *arena) { + struct envoy_config_core_v3_BindConfig* sub = (struct envoy_config_core_v3_BindConfig*)envoy_config_bootstrap_v3_ClusterManager_upstream_bind_config(msg); + if (sub == NULL) { + sub = (struct envoy_config_core_v3_BindConfig*)_upb_msg_new(&envoy_config_core_v3_BindConfig_msginit, arena); + if (!sub) return NULL; + envoy_config_bootstrap_v3_ClusterManager_set_upstream_bind_config(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_config_bootstrap_v3_ClusterManager_set_load_stats_config(envoy_config_bootstrap_v3_ClusterManager *msg, struct envoy_config_core_v3_ApiConfigSource* value) { + _upb_sethas(msg, 3); + *UPB_PTR_AT(msg, UPB_SIZE(20, 40), struct envoy_config_core_v3_ApiConfigSource*) = value; +} +UPB_INLINE struct envoy_config_core_v3_ApiConfigSource* envoy_config_bootstrap_v3_ClusterManager_mutable_load_stats_config(envoy_config_bootstrap_v3_ClusterManager *msg, upb_arena *arena) { + struct envoy_config_core_v3_ApiConfigSource* sub = (struct envoy_config_core_v3_ApiConfigSource*)envoy_config_bootstrap_v3_ClusterManager_load_stats_config(msg); + if (sub == NULL) { + sub = (struct envoy_config_core_v3_ApiConfigSource*)_upb_msg_new(&envoy_config_core_v3_ApiConfigSource_msginit, arena); + if (!sub) return NULL; + envoy_config_bootstrap_v3_ClusterManager_set_load_stats_config(msg, sub); + } + return sub; +} + +/* envoy.config.bootstrap.v3.ClusterManager.OutlierDetection */ + +UPB_INLINE envoy_config_bootstrap_v3_ClusterManager_OutlierDetection *envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_new(upb_arena *arena) { + return (envoy_config_bootstrap_v3_ClusterManager_OutlierDetection *)_upb_msg_new(&envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_msginit, arena); +} +UPB_INLINE envoy_config_bootstrap_v3_ClusterManager_OutlierDetection *envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_config_bootstrap_v3_ClusterManager_OutlierDetection *ret = envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_config_bootstrap_v3_ClusterManager_OutlierDetection *envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_config_bootstrap_v3_ClusterManager_OutlierDetection *ret = envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_serialize(const envoy_config_bootstrap_v3_ClusterManager_OutlierDetection *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_msginit, arena, len); +} + +UPB_INLINE upb_strview envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_event_log_path(const envoy_config_bootstrap_v3_ClusterManager_OutlierDetection *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview); } +UPB_INLINE bool envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_has_event_service(const envoy_config_bootstrap_v3_ClusterManager_OutlierDetection *msg) { return _upb_hasbit(msg, 1); } +UPB_INLINE const struct envoy_config_core_v3_EventServiceConfig* envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_event_service(const envoy_config_bootstrap_v3_ClusterManager_OutlierDetection *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(12, 24), const struct envoy_config_core_v3_EventServiceConfig*); } + +UPB_INLINE void envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_set_event_log_path(envoy_config_bootstrap_v3_ClusterManager_OutlierDetection *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview) = value; +} +UPB_INLINE void envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_set_event_service(envoy_config_bootstrap_v3_ClusterManager_OutlierDetection *msg, struct envoy_config_core_v3_EventServiceConfig* value) { + _upb_sethas(msg, 1); + *UPB_PTR_AT(msg, UPB_SIZE(12, 24), struct envoy_config_core_v3_EventServiceConfig*) = value; +} +UPB_INLINE struct envoy_config_core_v3_EventServiceConfig* envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_mutable_event_service(envoy_config_bootstrap_v3_ClusterManager_OutlierDetection *msg, upb_arena *arena) { + struct envoy_config_core_v3_EventServiceConfig* sub = (struct envoy_config_core_v3_EventServiceConfig*)envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_event_service(msg); + if (sub == NULL) { + sub = (struct envoy_config_core_v3_EventServiceConfig*)_upb_msg_new(&envoy_config_core_v3_EventServiceConfig_msginit, arena); + if (!sub) return NULL; + envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_set_event_service(msg, sub); + } + return sub; +} + +/* envoy.config.bootstrap.v3.Watchdogs */ + +UPB_INLINE envoy_config_bootstrap_v3_Watchdogs *envoy_config_bootstrap_v3_Watchdogs_new(upb_arena *arena) { + return (envoy_config_bootstrap_v3_Watchdogs *)_upb_msg_new(&envoy_config_bootstrap_v3_Watchdogs_msginit, arena); +} +UPB_INLINE envoy_config_bootstrap_v3_Watchdogs *envoy_config_bootstrap_v3_Watchdogs_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_config_bootstrap_v3_Watchdogs *ret = envoy_config_bootstrap_v3_Watchdogs_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_Watchdogs_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_config_bootstrap_v3_Watchdogs *envoy_config_bootstrap_v3_Watchdogs_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_config_bootstrap_v3_Watchdogs *ret = envoy_config_bootstrap_v3_Watchdogs_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_Watchdogs_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_config_bootstrap_v3_Watchdogs_serialize(const envoy_config_bootstrap_v3_Watchdogs *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_config_bootstrap_v3_Watchdogs_msginit, arena, len); +} + +UPB_INLINE bool envoy_config_bootstrap_v3_Watchdogs_has_main_thread_watchdog(const envoy_config_bootstrap_v3_Watchdogs *msg) { return _upb_hasbit(msg, 1); } +UPB_INLINE const envoy_config_bootstrap_v3_Watchdog* envoy_config_bootstrap_v3_Watchdogs_main_thread_watchdog(const envoy_config_bootstrap_v3_Watchdogs *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), const envoy_config_bootstrap_v3_Watchdog*); } +UPB_INLINE bool envoy_config_bootstrap_v3_Watchdogs_has_worker_watchdog(const envoy_config_bootstrap_v3_Watchdogs *msg) { return _upb_hasbit(msg, 2); } +UPB_INLINE const envoy_config_bootstrap_v3_Watchdog* envoy_config_bootstrap_v3_Watchdogs_worker_watchdog(const envoy_config_bootstrap_v3_Watchdogs *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(8, 16), const envoy_config_bootstrap_v3_Watchdog*); } + +UPB_INLINE void envoy_config_bootstrap_v3_Watchdogs_set_main_thread_watchdog(envoy_config_bootstrap_v3_Watchdogs *msg, envoy_config_bootstrap_v3_Watchdog* value) { + _upb_sethas(msg, 1); + *UPB_PTR_AT(msg, UPB_SIZE(4, 8), envoy_config_bootstrap_v3_Watchdog*) = value; +} +UPB_INLINE struct envoy_config_bootstrap_v3_Watchdog* envoy_config_bootstrap_v3_Watchdogs_mutable_main_thread_watchdog(envoy_config_bootstrap_v3_Watchdogs *msg, upb_arena *arena) { + struct envoy_config_bootstrap_v3_Watchdog* sub = (struct envoy_config_bootstrap_v3_Watchdog*)envoy_config_bootstrap_v3_Watchdogs_main_thread_watchdog(msg); + if (sub == NULL) { + sub = (struct envoy_config_bootstrap_v3_Watchdog*)_upb_msg_new(&envoy_config_bootstrap_v3_Watchdog_msginit, arena); + if (!sub) return NULL; + envoy_config_bootstrap_v3_Watchdogs_set_main_thread_watchdog(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_config_bootstrap_v3_Watchdogs_set_worker_watchdog(envoy_config_bootstrap_v3_Watchdogs *msg, envoy_config_bootstrap_v3_Watchdog* value) { + _upb_sethas(msg, 2); + *UPB_PTR_AT(msg, UPB_SIZE(8, 16), envoy_config_bootstrap_v3_Watchdog*) = value; +} +UPB_INLINE struct envoy_config_bootstrap_v3_Watchdog* envoy_config_bootstrap_v3_Watchdogs_mutable_worker_watchdog(envoy_config_bootstrap_v3_Watchdogs *msg, upb_arena *arena) { + struct envoy_config_bootstrap_v3_Watchdog* sub = (struct envoy_config_bootstrap_v3_Watchdog*)envoy_config_bootstrap_v3_Watchdogs_worker_watchdog(msg); + if (sub == NULL) { + sub = (struct envoy_config_bootstrap_v3_Watchdog*)_upb_msg_new(&envoy_config_bootstrap_v3_Watchdog_msginit, arena); + if (!sub) return NULL; + envoy_config_bootstrap_v3_Watchdogs_set_worker_watchdog(msg, sub); + } + return sub; +} + +/* envoy.config.bootstrap.v3.Watchdog */ + +UPB_INLINE envoy_config_bootstrap_v3_Watchdog *envoy_config_bootstrap_v3_Watchdog_new(upb_arena *arena) { + return (envoy_config_bootstrap_v3_Watchdog *)_upb_msg_new(&envoy_config_bootstrap_v3_Watchdog_msginit, arena); +} +UPB_INLINE envoy_config_bootstrap_v3_Watchdog *envoy_config_bootstrap_v3_Watchdog_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_config_bootstrap_v3_Watchdog *ret = envoy_config_bootstrap_v3_Watchdog_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_Watchdog_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_config_bootstrap_v3_Watchdog *envoy_config_bootstrap_v3_Watchdog_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_config_bootstrap_v3_Watchdog *ret = envoy_config_bootstrap_v3_Watchdog_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_Watchdog_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_config_bootstrap_v3_Watchdog_serialize(const envoy_config_bootstrap_v3_Watchdog *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_config_bootstrap_v3_Watchdog_msginit, arena, len); +} + +UPB_INLINE bool envoy_config_bootstrap_v3_Watchdog_has_miss_timeout(const envoy_config_bootstrap_v3_Watchdog *msg) { return _upb_hasbit(msg, 1); } +UPB_INLINE const struct google_protobuf_Duration* envoy_config_bootstrap_v3_Watchdog_miss_timeout(const envoy_config_bootstrap_v3_Watchdog *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), const struct google_protobuf_Duration*); } +UPB_INLINE bool envoy_config_bootstrap_v3_Watchdog_has_megamiss_timeout(const envoy_config_bootstrap_v3_Watchdog *msg) { return _upb_hasbit(msg, 2); } +UPB_INLINE const struct google_protobuf_Duration* envoy_config_bootstrap_v3_Watchdog_megamiss_timeout(const envoy_config_bootstrap_v3_Watchdog *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(8, 16), const struct google_protobuf_Duration*); } +UPB_INLINE bool envoy_config_bootstrap_v3_Watchdog_has_kill_timeout(const envoy_config_bootstrap_v3_Watchdog *msg) { return _upb_hasbit(msg, 3); } +UPB_INLINE const struct google_protobuf_Duration* envoy_config_bootstrap_v3_Watchdog_kill_timeout(const envoy_config_bootstrap_v3_Watchdog *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(12, 24), const struct google_protobuf_Duration*); } +UPB_INLINE bool envoy_config_bootstrap_v3_Watchdog_has_multikill_timeout(const envoy_config_bootstrap_v3_Watchdog *msg) { return _upb_hasbit(msg, 4); } +UPB_INLINE const struct google_protobuf_Duration* envoy_config_bootstrap_v3_Watchdog_multikill_timeout(const envoy_config_bootstrap_v3_Watchdog *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(16, 32), const struct google_protobuf_Duration*); } +UPB_INLINE bool envoy_config_bootstrap_v3_Watchdog_has_multikill_threshold(const envoy_config_bootstrap_v3_Watchdog *msg) { return _upb_hasbit(msg, 5); } +UPB_INLINE const struct envoy_type_v3_Percent* envoy_config_bootstrap_v3_Watchdog_multikill_threshold(const envoy_config_bootstrap_v3_Watchdog *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(20, 40), const struct envoy_type_v3_Percent*); } +UPB_INLINE bool envoy_config_bootstrap_v3_Watchdog_has_max_kill_timeout_jitter(const envoy_config_bootstrap_v3_Watchdog *msg) { return _upb_hasbit(msg, 6); } +UPB_INLINE const struct google_protobuf_Duration* envoy_config_bootstrap_v3_Watchdog_max_kill_timeout_jitter(const envoy_config_bootstrap_v3_Watchdog *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(24, 48), const struct google_protobuf_Duration*); } +UPB_INLINE bool envoy_config_bootstrap_v3_Watchdog_has_actions(const envoy_config_bootstrap_v3_Watchdog *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(28, 56)); } +UPB_INLINE const envoy_config_bootstrap_v3_Watchdog_WatchdogAction* const* envoy_config_bootstrap_v3_Watchdog_actions(const envoy_config_bootstrap_v3_Watchdog *msg, size_t *len) { return (const envoy_config_bootstrap_v3_Watchdog_WatchdogAction* const*)_upb_array_accessor(msg, UPB_SIZE(28, 56), len); } + +UPB_INLINE void envoy_config_bootstrap_v3_Watchdog_set_miss_timeout(envoy_config_bootstrap_v3_Watchdog *msg, struct google_protobuf_Duration* value) { + _upb_sethas(msg, 1); + *UPB_PTR_AT(msg, UPB_SIZE(4, 8), struct google_protobuf_Duration*) = value; +} +UPB_INLINE struct google_protobuf_Duration* envoy_config_bootstrap_v3_Watchdog_mutable_miss_timeout(envoy_config_bootstrap_v3_Watchdog *msg, upb_arena *arena) { + struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_bootstrap_v3_Watchdog_miss_timeout(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Duration*)_upb_msg_new(&google_protobuf_Duration_msginit, arena); + if (!sub) return NULL; + envoy_config_bootstrap_v3_Watchdog_set_miss_timeout(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_config_bootstrap_v3_Watchdog_set_megamiss_timeout(envoy_config_bootstrap_v3_Watchdog *msg, struct google_protobuf_Duration* value) { + _upb_sethas(msg, 2); + *UPB_PTR_AT(msg, UPB_SIZE(8, 16), struct google_protobuf_Duration*) = value; +} +UPB_INLINE struct google_protobuf_Duration* envoy_config_bootstrap_v3_Watchdog_mutable_megamiss_timeout(envoy_config_bootstrap_v3_Watchdog *msg, upb_arena *arena) { + struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_bootstrap_v3_Watchdog_megamiss_timeout(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Duration*)_upb_msg_new(&google_protobuf_Duration_msginit, arena); + if (!sub) return NULL; + envoy_config_bootstrap_v3_Watchdog_set_megamiss_timeout(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_config_bootstrap_v3_Watchdog_set_kill_timeout(envoy_config_bootstrap_v3_Watchdog *msg, struct google_protobuf_Duration* value) { + _upb_sethas(msg, 3); + *UPB_PTR_AT(msg, UPB_SIZE(12, 24), struct google_protobuf_Duration*) = value; +} +UPB_INLINE struct google_protobuf_Duration* envoy_config_bootstrap_v3_Watchdog_mutable_kill_timeout(envoy_config_bootstrap_v3_Watchdog *msg, upb_arena *arena) { + struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_bootstrap_v3_Watchdog_kill_timeout(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Duration*)_upb_msg_new(&google_protobuf_Duration_msginit, arena); + if (!sub) return NULL; + envoy_config_bootstrap_v3_Watchdog_set_kill_timeout(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_config_bootstrap_v3_Watchdog_set_multikill_timeout(envoy_config_bootstrap_v3_Watchdog *msg, struct google_protobuf_Duration* value) { + _upb_sethas(msg, 4); + *UPB_PTR_AT(msg, UPB_SIZE(16, 32), struct google_protobuf_Duration*) = value; +} +UPB_INLINE struct google_protobuf_Duration* envoy_config_bootstrap_v3_Watchdog_mutable_multikill_timeout(envoy_config_bootstrap_v3_Watchdog *msg, upb_arena *arena) { + struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_bootstrap_v3_Watchdog_multikill_timeout(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Duration*)_upb_msg_new(&google_protobuf_Duration_msginit, arena); + if (!sub) return NULL; + envoy_config_bootstrap_v3_Watchdog_set_multikill_timeout(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_config_bootstrap_v3_Watchdog_set_multikill_threshold(envoy_config_bootstrap_v3_Watchdog *msg, struct envoy_type_v3_Percent* value) { + _upb_sethas(msg, 5); + *UPB_PTR_AT(msg, UPB_SIZE(20, 40), struct envoy_type_v3_Percent*) = value; +} +UPB_INLINE struct envoy_type_v3_Percent* envoy_config_bootstrap_v3_Watchdog_mutable_multikill_threshold(envoy_config_bootstrap_v3_Watchdog *msg, upb_arena *arena) { + struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_config_bootstrap_v3_Watchdog_multikill_threshold(msg); + if (sub == NULL) { + sub = (struct envoy_type_v3_Percent*)_upb_msg_new(&envoy_type_v3_Percent_msginit, arena); + if (!sub) return NULL; + envoy_config_bootstrap_v3_Watchdog_set_multikill_threshold(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_config_bootstrap_v3_Watchdog_set_max_kill_timeout_jitter(envoy_config_bootstrap_v3_Watchdog *msg, struct google_protobuf_Duration* value) { + _upb_sethas(msg, 6); + *UPB_PTR_AT(msg, UPB_SIZE(24, 48), struct google_protobuf_Duration*) = value; +} +UPB_INLINE struct google_protobuf_Duration* envoy_config_bootstrap_v3_Watchdog_mutable_max_kill_timeout_jitter(envoy_config_bootstrap_v3_Watchdog *msg, upb_arena *arena) { + struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_bootstrap_v3_Watchdog_max_kill_timeout_jitter(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Duration*)_upb_msg_new(&google_protobuf_Duration_msginit, arena); + if (!sub) return NULL; + envoy_config_bootstrap_v3_Watchdog_set_max_kill_timeout_jitter(msg, sub); + } + return sub; +} +UPB_INLINE envoy_config_bootstrap_v3_Watchdog_WatchdogAction** envoy_config_bootstrap_v3_Watchdog_mutable_actions(envoy_config_bootstrap_v3_Watchdog *msg, size_t *len) { + return (envoy_config_bootstrap_v3_Watchdog_WatchdogAction**)_upb_array_mutable_accessor(msg, UPB_SIZE(28, 56), len); +} +UPB_INLINE envoy_config_bootstrap_v3_Watchdog_WatchdogAction** envoy_config_bootstrap_v3_Watchdog_resize_actions(envoy_config_bootstrap_v3_Watchdog *msg, size_t len, upb_arena *arena) { + return (envoy_config_bootstrap_v3_Watchdog_WatchdogAction**)_upb_array_resize_accessor2(msg, UPB_SIZE(28, 56), len, UPB_SIZE(2, 3), arena); +} +UPB_INLINE struct envoy_config_bootstrap_v3_Watchdog_WatchdogAction* envoy_config_bootstrap_v3_Watchdog_add_actions(envoy_config_bootstrap_v3_Watchdog *msg, upb_arena *arena) { + struct envoy_config_bootstrap_v3_Watchdog_WatchdogAction* sub = (struct envoy_config_bootstrap_v3_Watchdog_WatchdogAction*)_upb_msg_new(&envoy_config_bootstrap_v3_Watchdog_WatchdogAction_msginit, arena); + bool ok = _upb_array_append_accessor2( + msg, UPB_SIZE(28, 56), UPB_SIZE(2, 3), &sub, arena); + if (!ok) return NULL; + return sub; +} + +/* envoy.config.bootstrap.v3.Watchdog.WatchdogAction */ + +UPB_INLINE envoy_config_bootstrap_v3_Watchdog_WatchdogAction *envoy_config_bootstrap_v3_Watchdog_WatchdogAction_new(upb_arena *arena) { + return (envoy_config_bootstrap_v3_Watchdog_WatchdogAction *)_upb_msg_new(&envoy_config_bootstrap_v3_Watchdog_WatchdogAction_msginit, arena); +} +UPB_INLINE envoy_config_bootstrap_v3_Watchdog_WatchdogAction *envoy_config_bootstrap_v3_Watchdog_WatchdogAction_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_config_bootstrap_v3_Watchdog_WatchdogAction *ret = envoy_config_bootstrap_v3_Watchdog_WatchdogAction_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_Watchdog_WatchdogAction_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_config_bootstrap_v3_Watchdog_WatchdogAction *envoy_config_bootstrap_v3_Watchdog_WatchdogAction_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_config_bootstrap_v3_Watchdog_WatchdogAction *ret = envoy_config_bootstrap_v3_Watchdog_WatchdogAction_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_Watchdog_WatchdogAction_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_config_bootstrap_v3_Watchdog_WatchdogAction_serialize(const envoy_config_bootstrap_v3_Watchdog_WatchdogAction *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_config_bootstrap_v3_Watchdog_WatchdogAction_msginit, arena, len); +} + +UPB_INLINE bool envoy_config_bootstrap_v3_Watchdog_WatchdogAction_has_config(const envoy_config_bootstrap_v3_Watchdog_WatchdogAction *msg) { return _upb_hasbit(msg, 1); } +UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootstrap_v3_Watchdog_WatchdogAction_config(const envoy_config_bootstrap_v3_Watchdog_WatchdogAction *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(8, 8), const struct envoy_config_core_v3_TypedExtensionConfig*); } +UPB_INLINE int32_t envoy_config_bootstrap_v3_Watchdog_WatchdogAction_event(const envoy_config_bootstrap_v3_Watchdog_WatchdogAction *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t); } + +UPB_INLINE void envoy_config_bootstrap_v3_Watchdog_WatchdogAction_set_config(envoy_config_bootstrap_v3_Watchdog_WatchdogAction *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { + _upb_sethas(msg, 1); + *UPB_PTR_AT(msg, UPB_SIZE(8, 8), struct envoy_config_core_v3_TypedExtensionConfig*) = value; +} +UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootstrap_v3_Watchdog_WatchdogAction_mutable_config(envoy_config_bootstrap_v3_Watchdog_WatchdogAction *msg, upb_arena *arena) { + struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_bootstrap_v3_Watchdog_WatchdogAction_config(msg); + if (sub == NULL) { + sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_msg_new(&envoy_config_core_v3_TypedExtensionConfig_msginit, arena); + if (!sub) return NULL; + envoy_config_bootstrap_v3_Watchdog_WatchdogAction_set_config(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_config_bootstrap_v3_Watchdog_WatchdogAction_set_event(envoy_config_bootstrap_v3_Watchdog_WatchdogAction *msg, int32_t value) { + *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t) = value; +} + +/* envoy.config.bootstrap.v3.FatalAction */ + +UPB_INLINE envoy_config_bootstrap_v3_FatalAction *envoy_config_bootstrap_v3_FatalAction_new(upb_arena *arena) { + return (envoy_config_bootstrap_v3_FatalAction *)_upb_msg_new(&envoy_config_bootstrap_v3_FatalAction_msginit, arena); +} +UPB_INLINE envoy_config_bootstrap_v3_FatalAction *envoy_config_bootstrap_v3_FatalAction_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_config_bootstrap_v3_FatalAction *ret = envoy_config_bootstrap_v3_FatalAction_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_FatalAction_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_config_bootstrap_v3_FatalAction *envoy_config_bootstrap_v3_FatalAction_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_config_bootstrap_v3_FatalAction *ret = envoy_config_bootstrap_v3_FatalAction_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_FatalAction_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_config_bootstrap_v3_FatalAction_serialize(const envoy_config_bootstrap_v3_FatalAction *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_config_bootstrap_v3_FatalAction_msginit, arena, len); +} + +UPB_INLINE bool envoy_config_bootstrap_v3_FatalAction_has_config(const envoy_config_bootstrap_v3_FatalAction *msg) { return _upb_hasbit(msg, 1); } +UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootstrap_v3_FatalAction_config(const envoy_config_bootstrap_v3_FatalAction *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), const struct envoy_config_core_v3_TypedExtensionConfig*); } + +UPB_INLINE void envoy_config_bootstrap_v3_FatalAction_set_config(envoy_config_bootstrap_v3_FatalAction *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { + _upb_sethas(msg, 1); + *UPB_PTR_AT(msg, UPB_SIZE(4, 8), struct envoy_config_core_v3_TypedExtensionConfig*) = value; +} +UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_bootstrap_v3_FatalAction_mutable_config(envoy_config_bootstrap_v3_FatalAction *msg, upb_arena *arena) { + struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_bootstrap_v3_FatalAction_config(msg); + if (sub == NULL) { + sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_msg_new(&envoy_config_core_v3_TypedExtensionConfig_msginit, arena); + if (!sub) return NULL; + envoy_config_bootstrap_v3_FatalAction_set_config(msg, sub); + } + return sub; +} + +/* envoy.config.bootstrap.v3.Runtime */ + +UPB_INLINE envoy_config_bootstrap_v3_Runtime *envoy_config_bootstrap_v3_Runtime_new(upb_arena *arena) { + return (envoy_config_bootstrap_v3_Runtime *)_upb_msg_new(&envoy_config_bootstrap_v3_Runtime_msginit, arena); +} +UPB_INLINE envoy_config_bootstrap_v3_Runtime *envoy_config_bootstrap_v3_Runtime_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_config_bootstrap_v3_Runtime *ret = envoy_config_bootstrap_v3_Runtime_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_Runtime_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_config_bootstrap_v3_Runtime *envoy_config_bootstrap_v3_Runtime_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_config_bootstrap_v3_Runtime *ret = envoy_config_bootstrap_v3_Runtime_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_Runtime_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_config_bootstrap_v3_Runtime_serialize(const envoy_config_bootstrap_v3_Runtime *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_config_bootstrap_v3_Runtime_msginit, arena, len); +} + +UPB_INLINE upb_strview envoy_config_bootstrap_v3_Runtime_symlink_root(const envoy_config_bootstrap_v3_Runtime *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview); } +UPB_INLINE upb_strview envoy_config_bootstrap_v3_Runtime_subdirectory(const envoy_config_bootstrap_v3_Runtime *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(12, 24), upb_strview); } +UPB_INLINE upb_strview envoy_config_bootstrap_v3_Runtime_override_subdirectory(const envoy_config_bootstrap_v3_Runtime *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(20, 40), upb_strview); } +UPB_INLINE bool envoy_config_bootstrap_v3_Runtime_has_base(const envoy_config_bootstrap_v3_Runtime *msg) { return _upb_hasbit(msg, 1); } +UPB_INLINE const struct google_protobuf_Struct* envoy_config_bootstrap_v3_Runtime_base(const envoy_config_bootstrap_v3_Runtime *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(28, 56), const struct google_protobuf_Struct*); } + +UPB_INLINE void envoy_config_bootstrap_v3_Runtime_set_symlink_root(envoy_config_bootstrap_v3_Runtime *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview) = value; +} +UPB_INLINE void envoy_config_bootstrap_v3_Runtime_set_subdirectory(envoy_config_bootstrap_v3_Runtime *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(12, 24), upb_strview) = value; +} +UPB_INLINE void envoy_config_bootstrap_v3_Runtime_set_override_subdirectory(envoy_config_bootstrap_v3_Runtime *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(20, 40), upb_strview) = value; +} +UPB_INLINE void envoy_config_bootstrap_v3_Runtime_set_base(envoy_config_bootstrap_v3_Runtime *msg, struct google_protobuf_Struct* value) { + _upb_sethas(msg, 1); + *UPB_PTR_AT(msg, UPB_SIZE(28, 56), struct google_protobuf_Struct*) = value; +} +UPB_INLINE struct google_protobuf_Struct* envoy_config_bootstrap_v3_Runtime_mutable_base(envoy_config_bootstrap_v3_Runtime *msg, upb_arena *arena) { + struct google_protobuf_Struct* sub = (struct google_protobuf_Struct*)envoy_config_bootstrap_v3_Runtime_base(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Struct*)_upb_msg_new(&google_protobuf_Struct_msginit, arena); + if (!sub) return NULL; + envoy_config_bootstrap_v3_Runtime_set_base(msg, sub); + } + return sub; +} + +/* envoy.config.bootstrap.v3.RuntimeLayer */ + +UPB_INLINE envoy_config_bootstrap_v3_RuntimeLayer *envoy_config_bootstrap_v3_RuntimeLayer_new(upb_arena *arena) { + return (envoy_config_bootstrap_v3_RuntimeLayer *)_upb_msg_new(&envoy_config_bootstrap_v3_RuntimeLayer_msginit, arena); +} +UPB_INLINE envoy_config_bootstrap_v3_RuntimeLayer *envoy_config_bootstrap_v3_RuntimeLayer_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_config_bootstrap_v3_RuntimeLayer *ret = envoy_config_bootstrap_v3_RuntimeLayer_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_RuntimeLayer_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_config_bootstrap_v3_RuntimeLayer *envoy_config_bootstrap_v3_RuntimeLayer_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_config_bootstrap_v3_RuntimeLayer *ret = envoy_config_bootstrap_v3_RuntimeLayer_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_RuntimeLayer_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_config_bootstrap_v3_RuntimeLayer_serialize(const envoy_config_bootstrap_v3_RuntimeLayer *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_config_bootstrap_v3_RuntimeLayer_msginit, arena, len); +} + +typedef enum { + envoy_config_bootstrap_v3_RuntimeLayer_layer_specifier_static_layer = 2, + envoy_config_bootstrap_v3_RuntimeLayer_layer_specifier_disk_layer = 3, + envoy_config_bootstrap_v3_RuntimeLayer_layer_specifier_admin_layer = 4, + envoy_config_bootstrap_v3_RuntimeLayer_layer_specifier_rtds_layer = 5, + envoy_config_bootstrap_v3_RuntimeLayer_layer_specifier_NOT_SET = 0 +} envoy_config_bootstrap_v3_RuntimeLayer_layer_specifier_oneofcases; +UPB_INLINE envoy_config_bootstrap_v3_RuntimeLayer_layer_specifier_oneofcases envoy_config_bootstrap_v3_RuntimeLayer_layer_specifier_case(const envoy_config_bootstrap_v3_RuntimeLayer* msg) { return (envoy_config_bootstrap_v3_RuntimeLayer_layer_specifier_oneofcases)*UPB_PTR_AT(msg, UPB_SIZE(12, 24), int32_t); } + +UPB_INLINE upb_strview envoy_config_bootstrap_v3_RuntimeLayer_name(const envoy_config_bootstrap_v3_RuntimeLayer *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(0, 0), upb_strview); } +UPB_INLINE bool envoy_config_bootstrap_v3_RuntimeLayer_has_static_layer(const envoy_config_bootstrap_v3_RuntimeLayer *msg) { return _upb_getoneofcase(msg, UPB_SIZE(12, 24)) == 2; } +UPB_INLINE const struct google_protobuf_Struct* envoy_config_bootstrap_v3_RuntimeLayer_static_layer(const envoy_config_bootstrap_v3_RuntimeLayer *msg) { return UPB_READ_ONEOF(msg, const struct google_protobuf_Struct*, UPB_SIZE(8, 16), UPB_SIZE(12, 24), 2, NULL); } +UPB_INLINE bool envoy_config_bootstrap_v3_RuntimeLayer_has_disk_layer(const envoy_config_bootstrap_v3_RuntimeLayer *msg) { return _upb_getoneofcase(msg, UPB_SIZE(12, 24)) == 3; } +UPB_INLINE const envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer* envoy_config_bootstrap_v3_RuntimeLayer_disk_layer(const envoy_config_bootstrap_v3_RuntimeLayer *msg) { return UPB_READ_ONEOF(msg, const envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer*, UPB_SIZE(8, 16), UPB_SIZE(12, 24), 3, NULL); } +UPB_INLINE bool envoy_config_bootstrap_v3_RuntimeLayer_has_admin_layer(const envoy_config_bootstrap_v3_RuntimeLayer *msg) { return _upb_getoneofcase(msg, UPB_SIZE(12, 24)) == 4; } +UPB_INLINE const envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer* envoy_config_bootstrap_v3_RuntimeLayer_admin_layer(const envoy_config_bootstrap_v3_RuntimeLayer *msg) { return UPB_READ_ONEOF(msg, const envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer*, UPB_SIZE(8, 16), UPB_SIZE(12, 24), 4, NULL); } +UPB_INLINE bool envoy_config_bootstrap_v3_RuntimeLayer_has_rtds_layer(const envoy_config_bootstrap_v3_RuntimeLayer *msg) { return _upb_getoneofcase(msg, UPB_SIZE(12, 24)) == 5; } +UPB_INLINE const envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer* envoy_config_bootstrap_v3_RuntimeLayer_rtds_layer(const envoy_config_bootstrap_v3_RuntimeLayer *msg) { return UPB_READ_ONEOF(msg, const envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer*, UPB_SIZE(8, 16), UPB_SIZE(12, 24), 5, NULL); } + +UPB_INLINE void envoy_config_bootstrap_v3_RuntimeLayer_set_name(envoy_config_bootstrap_v3_RuntimeLayer *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(0, 0), upb_strview) = value; +} +UPB_INLINE void envoy_config_bootstrap_v3_RuntimeLayer_set_static_layer(envoy_config_bootstrap_v3_RuntimeLayer *msg, struct google_protobuf_Struct* value) { + UPB_WRITE_ONEOF(msg, struct google_protobuf_Struct*, UPB_SIZE(8, 16), value, UPB_SIZE(12, 24), 2); +} +UPB_INLINE struct google_protobuf_Struct* envoy_config_bootstrap_v3_RuntimeLayer_mutable_static_layer(envoy_config_bootstrap_v3_RuntimeLayer *msg, upb_arena *arena) { + struct google_protobuf_Struct* sub = (struct google_protobuf_Struct*)envoy_config_bootstrap_v3_RuntimeLayer_static_layer(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Struct*)_upb_msg_new(&google_protobuf_Struct_msginit, arena); + if (!sub) return NULL; + envoy_config_bootstrap_v3_RuntimeLayer_set_static_layer(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_config_bootstrap_v3_RuntimeLayer_set_disk_layer(envoy_config_bootstrap_v3_RuntimeLayer *msg, envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer* value) { + UPB_WRITE_ONEOF(msg, envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer*, UPB_SIZE(8, 16), value, UPB_SIZE(12, 24), 3); +} +UPB_INLINE struct envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer* envoy_config_bootstrap_v3_RuntimeLayer_mutable_disk_layer(envoy_config_bootstrap_v3_RuntimeLayer *msg, upb_arena *arena) { + struct envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer* sub = (struct envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer*)envoy_config_bootstrap_v3_RuntimeLayer_disk_layer(msg); + if (sub == NULL) { + sub = (struct envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer*)_upb_msg_new(&envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_msginit, arena); + if (!sub) return NULL; + envoy_config_bootstrap_v3_RuntimeLayer_set_disk_layer(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_config_bootstrap_v3_RuntimeLayer_set_admin_layer(envoy_config_bootstrap_v3_RuntimeLayer *msg, envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer* value) { + UPB_WRITE_ONEOF(msg, envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer*, UPB_SIZE(8, 16), value, UPB_SIZE(12, 24), 4); +} +UPB_INLINE struct envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer* envoy_config_bootstrap_v3_RuntimeLayer_mutable_admin_layer(envoy_config_bootstrap_v3_RuntimeLayer *msg, upb_arena *arena) { + struct envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer* sub = (struct envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer*)envoy_config_bootstrap_v3_RuntimeLayer_admin_layer(msg); + if (sub == NULL) { + sub = (struct envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer*)_upb_msg_new(&envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer_msginit, arena); + if (!sub) return NULL; + envoy_config_bootstrap_v3_RuntimeLayer_set_admin_layer(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_config_bootstrap_v3_RuntimeLayer_set_rtds_layer(envoy_config_bootstrap_v3_RuntimeLayer *msg, envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer* value) { + UPB_WRITE_ONEOF(msg, envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer*, UPB_SIZE(8, 16), value, UPB_SIZE(12, 24), 5); +} +UPB_INLINE struct envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer* envoy_config_bootstrap_v3_RuntimeLayer_mutable_rtds_layer(envoy_config_bootstrap_v3_RuntimeLayer *msg, upb_arena *arena) { + struct envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer* sub = (struct envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer*)envoy_config_bootstrap_v3_RuntimeLayer_rtds_layer(msg); + if (sub == NULL) { + sub = (struct envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer*)_upb_msg_new(&envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_msginit, arena); + if (!sub) return NULL; + envoy_config_bootstrap_v3_RuntimeLayer_set_rtds_layer(msg, sub); + } + return sub; +} + +/* envoy.config.bootstrap.v3.RuntimeLayer.DiskLayer */ + +UPB_INLINE envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer *envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_new(upb_arena *arena) { + return (envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer *)_upb_msg_new(&envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_msginit, arena); +} +UPB_INLINE envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer *envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer *ret = envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer *envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer *ret = envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_serialize(const envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_msginit, arena, len); +} + +UPB_INLINE upb_strview envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_symlink_root(const envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview); } +UPB_INLINE bool envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_append_service_cluster(const envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(0, 0), bool); } +UPB_INLINE upb_strview envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_subdirectory(const envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(12, 24), upb_strview); } + +UPB_INLINE void envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_set_symlink_root(envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview) = value; +} +UPB_INLINE void envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_set_append_service_cluster(envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer *msg, bool value) { + *UPB_PTR_AT(msg, UPB_SIZE(0, 0), bool) = value; +} +UPB_INLINE void envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_set_subdirectory(envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(12, 24), upb_strview) = value; +} + +/* envoy.config.bootstrap.v3.RuntimeLayer.AdminLayer */ + +UPB_INLINE envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer *envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer_new(upb_arena *arena) { + return (envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer *)_upb_msg_new(&envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer_msginit, arena); +} +UPB_INLINE envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer *envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer *ret = envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer *envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer *ret = envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer_serialize(const envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer_msginit, arena, len); +} + + + +/* envoy.config.bootstrap.v3.RuntimeLayer.RtdsLayer */ + +UPB_INLINE envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer *envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_new(upb_arena *arena) { + return (envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer *)_upb_msg_new(&envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_msginit, arena); +} +UPB_INLINE envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer *envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer *ret = envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer *envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer *ret = envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_serialize(const envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_msginit, arena, len); +} + +UPB_INLINE upb_strview envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_name(const envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview); } +UPB_INLINE bool envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_has_rtds_config(const envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer *msg) { return _upb_hasbit(msg, 1); } +UPB_INLINE const struct envoy_config_core_v3_ConfigSource* envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_rtds_config(const envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(12, 24), const struct envoy_config_core_v3_ConfigSource*); } + +UPB_INLINE void envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_set_name(envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview) = value; +} +UPB_INLINE void envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_set_rtds_config(envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer *msg, struct envoy_config_core_v3_ConfigSource* value) { + _upb_sethas(msg, 1); + *UPB_PTR_AT(msg, UPB_SIZE(12, 24), struct envoy_config_core_v3_ConfigSource*) = value; +} +UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_mutable_rtds_config(envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer *msg, upb_arena *arena) { + struct envoy_config_core_v3_ConfigSource* sub = (struct envoy_config_core_v3_ConfigSource*)envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_rtds_config(msg); + if (sub == NULL) { + sub = (struct envoy_config_core_v3_ConfigSource*)_upb_msg_new(&envoy_config_core_v3_ConfigSource_msginit, arena); + if (!sub) return NULL; + envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_set_rtds_config(msg, sub); + } + return sub; +} + +/* envoy.config.bootstrap.v3.LayeredRuntime */ + +UPB_INLINE envoy_config_bootstrap_v3_LayeredRuntime *envoy_config_bootstrap_v3_LayeredRuntime_new(upb_arena *arena) { + return (envoy_config_bootstrap_v3_LayeredRuntime *)_upb_msg_new(&envoy_config_bootstrap_v3_LayeredRuntime_msginit, arena); +} +UPB_INLINE envoy_config_bootstrap_v3_LayeredRuntime *envoy_config_bootstrap_v3_LayeredRuntime_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_config_bootstrap_v3_LayeredRuntime *ret = envoy_config_bootstrap_v3_LayeredRuntime_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_LayeredRuntime_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_config_bootstrap_v3_LayeredRuntime *envoy_config_bootstrap_v3_LayeredRuntime_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_config_bootstrap_v3_LayeredRuntime *ret = envoy_config_bootstrap_v3_LayeredRuntime_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_config_bootstrap_v3_LayeredRuntime_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_config_bootstrap_v3_LayeredRuntime_serialize(const envoy_config_bootstrap_v3_LayeredRuntime *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_config_bootstrap_v3_LayeredRuntime_msginit, arena, len); +} + +UPB_INLINE bool envoy_config_bootstrap_v3_LayeredRuntime_has_layers(const envoy_config_bootstrap_v3_LayeredRuntime *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(0, 0)); } +UPB_INLINE const envoy_config_bootstrap_v3_RuntimeLayer* const* envoy_config_bootstrap_v3_LayeredRuntime_layers(const envoy_config_bootstrap_v3_LayeredRuntime *msg, size_t *len) { return (const envoy_config_bootstrap_v3_RuntimeLayer* const*)_upb_array_accessor(msg, UPB_SIZE(0, 0), len); } + +UPB_INLINE envoy_config_bootstrap_v3_RuntimeLayer** envoy_config_bootstrap_v3_LayeredRuntime_mutable_layers(envoy_config_bootstrap_v3_LayeredRuntime *msg, size_t *len) { + return (envoy_config_bootstrap_v3_RuntimeLayer**)_upb_array_mutable_accessor(msg, UPB_SIZE(0, 0), len); +} +UPB_INLINE envoy_config_bootstrap_v3_RuntimeLayer** envoy_config_bootstrap_v3_LayeredRuntime_resize_layers(envoy_config_bootstrap_v3_LayeredRuntime *msg, size_t len, upb_arena *arena) { + return (envoy_config_bootstrap_v3_RuntimeLayer**)_upb_array_resize_accessor2(msg, UPB_SIZE(0, 0), len, UPB_SIZE(2, 3), arena); +} +UPB_INLINE struct envoy_config_bootstrap_v3_RuntimeLayer* envoy_config_bootstrap_v3_LayeredRuntime_add_layers(envoy_config_bootstrap_v3_LayeredRuntime *msg, upb_arena *arena) { + struct envoy_config_bootstrap_v3_RuntimeLayer* sub = (struct envoy_config_bootstrap_v3_RuntimeLayer*)_upb_msg_new(&envoy_config_bootstrap_v3_RuntimeLayer_msginit, arena); + bool ok = _upb_array_append_accessor2( + msg, UPB_SIZE(0, 0), UPB_SIZE(2, 3), &sub, arena); + if (!ok) return NULL; + return sub; +} + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#include "upb/port_undef.inc" + +#endif /* ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPB_H_ */ diff --git a/grpc/src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.c b/grpc/src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.c index 10bdb303..8854ed02 100644 --- a/grpc/src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.c +++ b/grpc/src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.c @@ -24,10 +24,7 @@ #include "google/protobuf/duration.upb.h" #include "google/protobuf/struct.upb.h" #include "google/protobuf/wrappers.upb.h" -#include "udpa/core/v1/collection_entry.upb.h" -#include "udpa/core/v1/resource_locator.upb.h" -#include "envoy/annotations/deprecation.upb.h" -#include "udpa/annotations/migrate.upb.h" +#include "xds/core/v3/collection_entry.upb.h" #include "udpa/annotations/security.upb.h" #include "udpa/annotations/status.upb.h" #include "udpa/annotations/versioning.upb.h" @@ -36,7 +33,7 @@ #include "upb/port_def.inc" static const upb_msglayout *const envoy_config_cluster_v3_ClusterCollection_submsgs[1] = { - &udpa_core_v1_CollectionEntry_msginit, + &xds_core_v3_CollectionEntry_msginit, }; static const upb_msglayout_field envoy_config_cluster_v3_ClusterCollection__fields[1] = { @@ -58,7 +55,7 @@ static const upb_msglayout *const envoy_config_cluster_v3_Cluster_submsgs[32] = &envoy_config_cluster_v3_Cluster_LeastRequestLbConfig_msginit, &envoy_config_cluster_v3_Cluster_MaglevLbConfig_msginit, &envoy_config_cluster_v3_Cluster_OriginalDstLbConfig_msginit, - &envoy_config_cluster_v3_Cluster_PrefetchPolicy_msginit, + &envoy_config_cluster_v3_Cluster_PreconnectPolicy_msginit, &envoy_config_cluster_v3_Cluster_RefreshRate_msginit, &envoy_config_cluster_v3_Cluster_RingHashLbConfig_msginit, &envoy_config_cluster_v3_Cluster_TransportSocketMatch_msginit, @@ -172,21 +169,19 @@ const upb_msglayout envoy_config_cluster_v3_Cluster_CustomClusterType_msginit = UPB_SIZE(16, 32), 2, false, 255, }; -static const upb_msglayout *const envoy_config_cluster_v3_Cluster_EdsClusterConfig_submsgs[2] = { +static const upb_msglayout *const envoy_config_cluster_v3_Cluster_EdsClusterConfig_submsgs[1] = { &envoy_config_core_v3_ConfigSource_msginit, - &udpa_core_v1_ResourceLocator_msginit, }; -static const upb_msglayout_field envoy_config_cluster_v3_Cluster_EdsClusterConfig__fields[3] = { +static const upb_msglayout_field envoy_config_cluster_v3_Cluster_EdsClusterConfig__fields[2] = { {1, UPB_SIZE(12, 24), 1, 0, 11, 1}, {2, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {3, UPB_SIZE(16, 32), 2, 1, 11, 1}, }; const upb_msglayout envoy_config_cluster_v3_Cluster_EdsClusterConfig_msginit = { &envoy_config_cluster_v3_Cluster_EdsClusterConfig_submsgs[0], &envoy_config_cluster_v3_Cluster_EdsClusterConfig__fields[0], - UPB_SIZE(24, 48), 3, false, 255, + UPB_SIZE(16, 32), 2, false, 255, }; static const upb_msglayout *const envoy_config_cluster_v3_Cluster_LbSubsetConfig_submsgs[2] = { @@ -356,18 +351,18 @@ const upb_msglayout envoy_config_cluster_v3_Cluster_RefreshRate_msginit = { UPB_SIZE(16, 24), 2, false, 255, }; -static const upb_msglayout *const envoy_config_cluster_v3_Cluster_PrefetchPolicy_submsgs[1] = { +static const upb_msglayout *const envoy_config_cluster_v3_Cluster_PreconnectPolicy_submsgs[1] = { &google_protobuf_DoubleValue_msginit, }; -static const upb_msglayout_field envoy_config_cluster_v3_Cluster_PrefetchPolicy__fields[2] = { +static const upb_msglayout_field envoy_config_cluster_v3_Cluster_PreconnectPolicy__fields[2] = { {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, {2, UPB_SIZE(8, 16), 2, 0, 11, 1}, }; -const upb_msglayout envoy_config_cluster_v3_Cluster_PrefetchPolicy_msginit = { - &envoy_config_cluster_v3_Cluster_PrefetchPolicy_submsgs[0], - &envoy_config_cluster_v3_Cluster_PrefetchPolicy__fields[0], +const upb_msglayout envoy_config_cluster_v3_Cluster_PreconnectPolicy_msginit = { + &envoy_config_cluster_v3_Cluster_PreconnectPolicy_submsgs[0], + &envoy_config_cluster_v3_Cluster_PreconnectPolicy__fields[0], UPB_SIZE(16, 24), 2, false, 255, }; diff --git a/grpc/src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.h b/grpc/src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.h index 6f27dc71..da4d6206 100644 --- a/grpc/src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.h +++ b/grpc/src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.h @@ -36,7 +36,7 @@ struct envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig; struct envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig; struct envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig; struct envoy_config_cluster_v3_Cluster_RefreshRate; -struct envoy_config_cluster_v3_Cluster_PrefetchPolicy; +struct envoy_config_cluster_v3_Cluster_PreconnectPolicy; struct envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry; struct envoy_config_cluster_v3_LoadBalancingPolicy; struct envoy_config_cluster_v3_LoadBalancingPolicy_Policy; @@ -59,7 +59,7 @@ typedef struct envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAwareLbConfig typedef struct envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig; typedef struct envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig; typedef struct envoy_config_cluster_v3_Cluster_RefreshRate envoy_config_cluster_v3_Cluster_RefreshRate; -typedef struct envoy_config_cluster_v3_Cluster_PrefetchPolicy envoy_config_cluster_v3_Cluster_PrefetchPolicy; +typedef struct envoy_config_cluster_v3_Cluster_PreconnectPolicy envoy_config_cluster_v3_Cluster_PreconnectPolicy; typedef struct envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry; typedef struct envoy_config_cluster_v3_LoadBalancingPolicy envoy_config_cluster_v3_LoadBalancingPolicy; typedef struct envoy_config_cluster_v3_LoadBalancingPolicy_Policy envoy_config_cluster_v3_LoadBalancingPolicy_Policy; @@ -82,7 +82,7 @@ extern const upb_msglayout envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAw extern const upb_msglayout envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig_msginit; extern const upb_msglayout envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_msginit; extern const upb_msglayout envoy_config_cluster_v3_Cluster_RefreshRate_msginit; -extern const upb_msglayout envoy_config_cluster_v3_Cluster_PrefetchPolicy_msginit; +extern const upb_msglayout envoy_config_cluster_v3_Cluster_PreconnectPolicy_msginit; extern const upb_msglayout envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry_msginit; extern const upb_msglayout envoy_config_cluster_v3_LoadBalancingPolicy_msginit; extern const upb_msglayout envoy_config_cluster_v3_LoadBalancingPolicy_Policy_msginit; @@ -113,8 +113,7 @@ struct google_protobuf_Duration; struct google_protobuf_Struct; struct google_protobuf_UInt32Value; struct google_protobuf_UInt64Value; -struct udpa_core_v1_CollectionEntry; -struct udpa_core_v1_ResourceLocator; +struct xds_core_v3_CollectionEntry; extern const upb_msglayout envoy_config_cluster_v3_CircuitBreakers_msginit; extern const upb_msglayout envoy_config_cluster_v3_Filter_msginit; extern const upb_msglayout envoy_config_cluster_v3_OutlierDetection_msginit; @@ -139,8 +138,7 @@ extern const upb_msglayout google_protobuf_Duration_msginit; extern const upb_msglayout google_protobuf_Struct_msginit; extern const upb_msglayout google_protobuf_UInt32Value_msginit; extern const upb_msglayout google_protobuf_UInt64Value_msginit; -extern const upb_msglayout udpa_core_v1_CollectionEntry_msginit; -extern const upb_msglayout udpa_core_v1_ResourceLocator_msginit; +extern const upb_msglayout xds_core_v3_CollectionEntry_msginit; typedef enum { envoy_config_cluster_v3_Cluster_USE_CONFIGURED_PROTOCOL = 0, @@ -212,16 +210,16 @@ UPB_INLINE char *envoy_config_cluster_v3_ClusterCollection_serialize(const envoy } UPB_INLINE bool envoy_config_cluster_v3_ClusterCollection_has_entries(const envoy_config_cluster_v3_ClusterCollection *msg) { return _upb_hasbit(msg, 1); } -UPB_INLINE const struct udpa_core_v1_CollectionEntry* envoy_config_cluster_v3_ClusterCollection_entries(const envoy_config_cluster_v3_ClusterCollection *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), const struct udpa_core_v1_CollectionEntry*); } +UPB_INLINE const struct xds_core_v3_CollectionEntry* envoy_config_cluster_v3_ClusterCollection_entries(const envoy_config_cluster_v3_ClusterCollection *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), const struct xds_core_v3_CollectionEntry*); } -UPB_INLINE void envoy_config_cluster_v3_ClusterCollection_set_entries(envoy_config_cluster_v3_ClusterCollection *msg, struct udpa_core_v1_CollectionEntry* value) { +UPB_INLINE void envoy_config_cluster_v3_ClusterCollection_set_entries(envoy_config_cluster_v3_ClusterCollection *msg, struct xds_core_v3_CollectionEntry* value) { _upb_sethas(msg, 1); - *UPB_PTR_AT(msg, UPB_SIZE(4, 8), struct udpa_core_v1_CollectionEntry*) = value; + *UPB_PTR_AT(msg, UPB_SIZE(4, 8), struct xds_core_v3_CollectionEntry*) = value; } -UPB_INLINE struct udpa_core_v1_CollectionEntry* envoy_config_cluster_v3_ClusterCollection_mutable_entries(envoy_config_cluster_v3_ClusterCollection *msg, upb_arena *arena) { - struct udpa_core_v1_CollectionEntry* sub = (struct udpa_core_v1_CollectionEntry*)envoy_config_cluster_v3_ClusterCollection_entries(msg); +UPB_INLINE struct xds_core_v3_CollectionEntry* envoy_config_cluster_v3_ClusterCollection_mutable_entries(envoy_config_cluster_v3_ClusterCollection *msg, upb_arena *arena) { + struct xds_core_v3_CollectionEntry* sub = (struct xds_core_v3_CollectionEntry*)envoy_config_cluster_v3_ClusterCollection_entries(msg); if (sub == NULL) { - sub = (struct udpa_core_v1_CollectionEntry*)_upb_msg_new(&udpa_core_v1_CollectionEntry_msginit, arena); + sub = (struct xds_core_v3_CollectionEntry*)_upb_msg_new(&xds_core_v3_CollectionEntry_msginit, arena); if (!sub) return NULL; envoy_config_cluster_v3_ClusterCollection_set_entries(msg, sub); } @@ -344,8 +342,8 @@ UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_upstream_config(const envoy_ UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_cluster_v3_Cluster_upstream_config(const envoy_config_cluster_v3_Cluster *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(128, 232), const struct envoy_config_core_v3_TypedExtensionConfig*); } UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_track_cluster_stats(const envoy_config_cluster_v3_Cluster *msg) { return _upb_hasbit(msg, 24); } UPB_INLINE const envoy_config_cluster_v3_TrackClusterStats* envoy_config_cluster_v3_Cluster_track_cluster_stats(const envoy_config_cluster_v3_Cluster *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(132, 240), const envoy_config_cluster_v3_TrackClusterStats*); } -UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_prefetch_policy(const envoy_config_cluster_v3_Cluster *msg) { return _upb_hasbit(msg, 25); } -UPB_INLINE const envoy_config_cluster_v3_Cluster_PrefetchPolicy* envoy_config_cluster_v3_Cluster_prefetch_policy(const envoy_config_cluster_v3_Cluster *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(136, 248), const envoy_config_cluster_v3_Cluster_PrefetchPolicy*); } +UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_preconnect_policy(const envoy_config_cluster_v3_Cluster *msg) { return _upb_hasbit(msg, 25); } +UPB_INLINE const envoy_config_cluster_v3_Cluster_PreconnectPolicy* envoy_config_cluster_v3_Cluster_preconnect_policy(const envoy_config_cluster_v3_Cluster *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(136, 248), const envoy_config_cluster_v3_Cluster_PreconnectPolicy*); } UPB_INLINE bool envoy_config_cluster_v3_Cluster_connection_pool_per_downstream_connection(const envoy_config_cluster_v3_Cluster *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(21, 21), bool); } UPB_INLINE bool envoy_config_cluster_v3_Cluster_has_maglev_lb_config(const envoy_config_cluster_v3_Cluster *msg) { return _upb_getoneofcase(msg, UPB_SIZE(172, 320)) == 52; } UPB_INLINE const envoy_config_cluster_v3_Cluster_MaglevLbConfig* envoy_config_cluster_v3_Cluster_maglev_lb_config(const envoy_config_cluster_v3_Cluster *msg) { return UPB_READ_ONEOF(msg, const envoy_config_cluster_v3_Cluster_MaglevLbConfig*, UPB_SIZE(168, 312), UPB_SIZE(172, 320), 52, NULL); } @@ -799,16 +797,16 @@ UPB_INLINE struct envoy_config_cluster_v3_TrackClusterStats* envoy_config_cluste } return sub; } -UPB_INLINE void envoy_config_cluster_v3_Cluster_set_prefetch_policy(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_Cluster_PrefetchPolicy* value) { +UPB_INLINE void envoy_config_cluster_v3_Cluster_set_preconnect_policy(envoy_config_cluster_v3_Cluster *msg, envoy_config_cluster_v3_Cluster_PreconnectPolicy* value) { _upb_sethas(msg, 25); - *UPB_PTR_AT(msg, UPB_SIZE(136, 248), envoy_config_cluster_v3_Cluster_PrefetchPolicy*) = value; + *UPB_PTR_AT(msg, UPB_SIZE(136, 248), envoy_config_cluster_v3_Cluster_PreconnectPolicy*) = value; } -UPB_INLINE struct envoy_config_cluster_v3_Cluster_PrefetchPolicy* envoy_config_cluster_v3_Cluster_mutable_prefetch_policy(envoy_config_cluster_v3_Cluster *msg, upb_arena *arena) { - struct envoy_config_cluster_v3_Cluster_PrefetchPolicy* sub = (struct envoy_config_cluster_v3_Cluster_PrefetchPolicy*)envoy_config_cluster_v3_Cluster_prefetch_policy(msg); +UPB_INLINE struct envoy_config_cluster_v3_Cluster_PreconnectPolicy* envoy_config_cluster_v3_Cluster_mutable_preconnect_policy(envoy_config_cluster_v3_Cluster *msg, upb_arena *arena) { + struct envoy_config_cluster_v3_Cluster_PreconnectPolicy* sub = (struct envoy_config_cluster_v3_Cluster_PreconnectPolicy*)envoy_config_cluster_v3_Cluster_preconnect_policy(msg); if (sub == NULL) { - sub = (struct envoy_config_cluster_v3_Cluster_PrefetchPolicy*)_upb_msg_new(&envoy_config_cluster_v3_Cluster_PrefetchPolicy_msginit, arena); + sub = (struct envoy_config_cluster_v3_Cluster_PreconnectPolicy*)_upb_msg_new(&envoy_config_cluster_v3_Cluster_PreconnectPolicy_msginit, arena); if (!sub) return NULL; - envoy_config_cluster_v3_Cluster_set_prefetch_policy(msg, sub); + envoy_config_cluster_v3_Cluster_set_preconnect_policy(msg, sub); } return sub; } @@ -948,8 +946,6 @@ UPB_INLINE char *envoy_config_cluster_v3_Cluster_EdsClusterConfig_serialize(cons UPB_INLINE bool envoy_config_cluster_v3_Cluster_EdsClusterConfig_has_eds_config(const envoy_config_cluster_v3_Cluster_EdsClusterConfig *msg) { return _upb_hasbit(msg, 1); } UPB_INLINE const struct envoy_config_core_v3_ConfigSource* envoy_config_cluster_v3_Cluster_EdsClusterConfig_eds_config(const envoy_config_cluster_v3_Cluster_EdsClusterConfig *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(12, 24), const struct envoy_config_core_v3_ConfigSource*); } UPB_INLINE upb_strview envoy_config_cluster_v3_Cluster_EdsClusterConfig_service_name(const envoy_config_cluster_v3_Cluster_EdsClusterConfig *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview); } -UPB_INLINE bool envoy_config_cluster_v3_Cluster_EdsClusterConfig_has_eds_resource_locator(const envoy_config_cluster_v3_Cluster_EdsClusterConfig *msg) { return _upb_hasbit(msg, 2); } -UPB_INLINE const struct udpa_core_v1_ResourceLocator* envoy_config_cluster_v3_Cluster_EdsClusterConfig_eds_resource_locator(const envoy_config_cluster_v3_Cluster_EdsClusterConfig *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(16, 32), const struct udpa_core_v1_ResourceLocator*); } UPB_INLINE void envoy_config_cluster_v3_Cluster_EdsClusterConfig_set_eds_config(envoy_config_cluster_v3_Cluster_EdsClusterConfig *msg, struct envoy_config_core_v3_ConfigSource* value) { _upb_sethas(msg, 1); @@ -967,19 +963,6 @@ UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_config_cluster_v3_Clu UPB_INLINE void envoy_config_cluster_v3_Cluster_EdsClusterConfig_set_service_name(envoy_config_cluster_v3_Cluster_EdsClusterConfig *msg, upb_strview value) { *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview) = value; } -UPB_INLINE void envoy_config_cluster_v3_Cluster_EdsClusterConfig_set_eds_resource_locator(envoy_config_cluster_v3_Cluster_EdsClusterConfig *msg, struct udpa_core_v1_ResourceLocator* value) { - _upb_sethas(msg, 2); - *UPB_PTR_AT(msg, UPB_SIZE(16, 32), struct udpa_core_v1_ResourceLocator*) = value; -} -UPB_INLINE struct udpa_core_v1_ResourceLocator* envoy_config_cluster_v3_Cluster_EdsClusterConfig_mutable_eds_resource_locator(envoy_config_cluster_v3_Cluster_EdsClusterConfig *msg, upb_arena *arena) { - struct udpa_core_v1_ResourceLocator* sub = (struct udpa_core_v1_ResourceLocator*)envoy_config_cluster_v3_Cluster_EdsClusterConfig_eds_resource_locator(msg); - if (sub == NULL) { - sub = (struct udpa_core_v1_ResourceLocator*)_upb_msg_new(&udpa_core_v1_ResourceLocator_msginit, arena); - if (!sub) return NULL; - envoy_config_cluster_v3_Cluster_EdsClusterConfig_set_eds_resource_locator(msg, sub); - } - return sub; -} /* envoy.config.cluster.v3.Cluster.LbSubsetConfig */ @@ -1557,54 +1540,54 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_Cluster_Refr return sub; } -/* envoy.config.cluster.v3.Cluster.PrefetchPolicy */ +/* envoy.config.cluster.v3.Cluster.PreconnectPolicy */ -UPB_INLINE envoy_config_cluster_v3_Cluster_PrefetchPolicy *envoy_config_cluster_v3_Cluster_PrefetchPolicy_new(upb_arena *arena) { - return (envoy_config_cluster_v3_Cluster_PrefetchPolicy *)_upb_msg_new(&envoy_config_cluster_v3_Cluster_PrefetchPolicy_msginit, arena); +UPB_INLINE envoy_config_cluster_v3_Cluster_PreconnectPolicy *envoy_config_cluster_v3_Cluster_PreconnectPolicy_new(upb_arena *arena) { + return (envoy_config_cluster_v3_Cluster_PreconnectPolicy *)_upb_msg_new(&envoy_config_cluster_v3_Cluster_PreconnectPolicy_msginit, arena); } -UPB_INLINE envoy_config_cluster_v3_Cluster_PrefetchPolicy *envoy_config_cluster_v3_Cluster_PrefetchPolicy_parse(const char *buf, size_t size, +UPB_INLINE envoy_config_cluster_v3_Cluster_PreconnectPolicy *envoy_config_cluster_v3_Cluster_PreconnectPolicy_parse(const char *buf, size_t size, upb_arena *arena) { - envoy_config_cluster_v3_Cluster_PrefetchPolicy *ret = envoy_config_cluster_v3_Cluster_PrefetchPolicy_new(arena); - return (ret && upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_PrefetchPolicy_msginit, arena)) ? ret : NULL; + envoy_config_cluster_v3_Cluster_PreconnectPolicy *ret = envoy_config_cluster_v3_Cluster_PreconnectPolicy_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_PreconnectPolicy_msginit, arena)) ? ret : NULL; } -UPB_INLINE envoy_config_cluster_v3_Cluster_PrefetchPolicy *envoy_config_cluster_v3_Cluster_PrefetchPolicy_parse_ex(const char *buf, size_t size, +UPB_INLINE envoy_config_cluster_v3_Cluster_PreconnectPolicy *envoy_config_cluster_v3_Cluster_PreconnectPolicy_parse_ex(const char *buf, size_t size, upb_arena *arena, int options) { - envoy_config_cluster_v3_Cluster_PrefetchPolicy *ret = envoy_config_cluster_v3_Cluster_PrefetchPolicy_new(arena); - return (ret && _upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_PrefetchPolicy_msginit, arena, options)) + envoy_config_cluster_v3_Cluster_PreconnectPolicy *ret = envoy_config_cluster_v3_Cluster_PreconnectPolicy_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_config_cluster_v3_Cluster_PreconnectPolicy_msginit, arena, options)) ? ret : NULL; } -UPB_INLINE char *envoy_config_cluster_v3_Cluster_PrefetchPolicy_serialize(const envoy_config_cluster_v3_Cluster_PrefetchPolicy *msg, upb_arena *arena, size_t *len) { - return upb_encode(msg, &envoy_config_cluster_v3_Cluster_PrefetchPolicy_msginit, arena, len); +UPB_INLINE char *envoy_config_cluster_v3_Cluster_PreconnectPolicy_serialize(const envoy_config_cluster_v3_Cluster_PreconnectPolicy *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_config_cluster_v3_Cluster_PreconnectPolicy_msginit, arena, len); } -UPB_INLINE bool envoy_config_cluster_v3_Cluster_PrefetchPolicy_has_per_upstream_prefetch_ratio(const envoy_config_cluster_v3_Cluster_PrefetchPolicy *msg) { return _upb_hasbit(msg, 1); } -UPB_INLINE const struct google_protobuf_DoubleValue* envoy_config_cluster_v3_Cluster_PrefetchPolicy_per_upstream_prefetch_ratio(const envoy_config_cluster_v3_Cluster_PrefetchPolicy *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), const struct google_protobuf_DoubleValue*); } -UPB_INLINE bool envoy_config_cluster_v3_Cluster_PrefetchPolicy_has_predictive_prefetch_ratio(const envoy_config_cluster_v3_Cluster_PrefetchPolicy *msg) { return _upb_hasbit(msg, 2); } -UPB_INLINE const struct google_protobuf_DoubleValue* envoy_config_cluster_v3_Cluster_PrefetchPolicy_predictive_prefetch_ratio(const envoy_config_cluster_v3_Cluster_PrefetchPolicy *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(8, 16), const struct google_protobuf_DoubleValue*); } +UPB_INLINE bool envoy_config_cluster_v3_Cluster_PreconnectPolicy_has_per_upstream_preconnect_ratio(const envoy_config_cluster_v3_Cluster_PreconnectPolicy *msg) { return _upb_hasbit(msg, 1); } +UPB_INLINE const struct google_protobuf_DoubleValue* envoy_config_cluster_v3_Cluster_PreconnectPolicy_per_upstream_preconnect_ratio(const envoy_config_cluster_v3_Cluster_PreconnectPolicy *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), const struct google_protobuf_DoubleValue*); } +UPB_INLINE bool envoy_config_cluster_v3_Cluster_PreconnectPolicy_has_predictive_preconnect_ratio(const envoy_config_cluster_v3_Cluster_PreconnectPolicy *msg) { return _upb_hasbit(msg, 2); } +UPB_INLINE const struct google_protobuf_DoubleValue* envoy_config_cluster_v3_Cluster_PreconnectPolicy_predictive_preconnect_ratio(const envoy_config_cluster_v3_Cluster_PreconnectPolicy *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(8, 16), const struct google_protobuf_DoubleValue*); } -UPB_INLINE void envoy_config_cluster_v3_Cluster_PrefetchPolicy_set_per_upstream_prefetch_ratio(envoy_config_cluster_v3_Cluster_PrefetchPolicy *msg, struct google_protobuf_DoubleValue* value) { +UPB_INLINE void envoy_config_cluster_v3_Cluster_PreconnectPolicy_set_per_upstream_preconnect_ratio(envoy_config_cluster_v3_Cluster_PreconnectPolicy *msg, struct google_protobuf_DoubleValue* value) { _upb_sethas(msg, 1); *UPB_PTR_AT(msg, UPB_SIZE(4, 8), struct google_protobuf_DoubleValue*) = value; } -UPB_INLINE struct google_protobuf_DoubleValue* envoy_config_cluster_v3_Cluster_PrefetchPolicy_mutable_per_upstream_prefetch_ratio(envoy_config_cluster_v3_Cluster_PrefetchPolicy *msg, upb_arena *arena) { - struct google_protobuf_DoubleValue* sub = (struct google_protobuf_DoubleValue*)envoy_config_cluster_v3_Cluster_PrefetchPolicy_per_upstream_prefetch_ratio(msg); +UPB_INLINE struct google_protobuf_DoubleValue* envoy_config_cluster_v3_Cluster_PreconnectPolicy_mutable_per_upstream_preconnect_ratio(envoy_config_cluster_v3_Cluster_PreconnectPolicy *msg, upb_arena *arena) { + struct google_protobuf_DoubleValue* sub = (struct google_protobuf_DoubleValue*)envoy_config_cluster_v3_Cluster_PreconnectPolicy_per_upstream_preconnect_ratio(msg); if (sub == NULL) { sub = (struct google_protobuf_DoubleValue*)_upb_msg_new(&google_protobuf_DoubleValue_msginit, arena); if (!sub) return NULL; - envoy_config_cluster_v3_Cluster_PrefetchPolicy_set_per_upstream_prefetch_ratio(msg, sub); + envoy_config_cluster_v3_Cluster_PreconnectPolicy_set_per_upstream_preconnect_ratio(msg, sub); } return sub; } -UPB_INLINE void envoy_config_cluster_v3_Cluster_PrefetchPolicy_set_predictive_prefetch_ratio(envoy_config_cluster_v3_Cluster_PrefetchPolicy *msg, struct google_protobuf_DoubleValue* value) { +UPB_INLINE void envoy_config_cluster_v3_Cluster_PreconnectPolicy_set_predictive_preconnect_ratio(envoy_config_cluster_v3_Cluster_PreconnectPolicy *msg, struct google_protobuf_DoubleValue* value) { _upb_sethas(msg, 2); *UPB_PTR_AT(msg, UPB_SIZE(8, 16), struct google_protobuf_DoubleValue*) = value; } -UPB_INLINE struct google_protobuf_DoubleValue* envoy_config_cluster_v3_Cluster_PrefetchPolicy_mutable_predictive_prefetch_ratio(envoy_config_cluster_v3_Cluster_PrefetchPolicy *msg, upb_arena *arena) { - struct google_protobuf_DoubleValue* sub = (struct google_protobuf_DoubleValue*)envoy_config_cluster_v3_Cluster_PrefetchPolicy_predictive_prefetch_ratio(msg); +UPB_INLINE struct google_protobuf_DoubleValue* envoy_config_cluster_v3_Cluster_PreconnectPolicy_mutable_predictive_preconnect_ratio(envoy_config_cluster_v3_Cluster_PreconnectPolicy *msg, upb_arena *arena) { + struct google_protobuf_DoubleValue* sub = (struct google_protobuf_DoubleValue*)envoy_config_cluster_v3_Cluster_PreconnectPolicy_predictive_preconnect_ratio(msg); if (sub == NULL) { sub = (struct google_protobuf_DoubleValue*)_upb_msg_new(&google_protobuf_DoubleValue_msginit, arena); if (!sub) return NULL; - envoy_config_cluster_v3_Cluster_PrefetchPolicy_set_predictive_prefetch_ratio(msg, sub); + envoy_config_cluster_v3_Cluster_PreconnectPolicy_set_predictive_preconnect_ratio(msg, sub); } return sub; } diff --git a/grpc/src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.c b/grpc/src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.c index 9e32e67f..f90563f1 100644 --- a/grpc/src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.c +++ b/grpc/src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.c @@ -22,7 +22,7 @@ static const upb_msglayout *const envoy_config_cluster_v3_OutlierDetection_subms &google_protobuf_UInt32Value_msginit, }; -static const upb_msglayout_field envoy_config_cluster_v3_OutlierDetection__fields[20] = { +static const upb_msglayout_field envoy_config_cluster_v3_OutlierDetection__fields[21] = { {1, UPB_SIZE(4, 8), 1, 1, 11, 1}, {2, UPB_SIZE(8, 16), 2, 0, 11, 1}, {3, UPB_SIZE(12, 24), 3, 0, 11, 1}, @@ -43,12 +43,13 @@ static const upb_msglayout_field envoy_config_cluster_v3_OutlierDetection__field {18, UPB_SIZE(68, 136), 17, 1, 11, 1}, {19, UPB_SIZE(72, 144), 18, 1, 11, 1}, {20, UPB_SIZE(76, 152), 19, 1, 11, 1}, + {21, UPB_SIZE(80, 160), 20, 0, 11, 1}, }; const upb_msglayout envoy_config_cluster_v3_OutlierDetection_msginit = { &envoy_config_cluster_v3_OutlierDetection_submsgs[0], &envoy_config_cluster_v3_OutlierDetection__fields[0], - UPB_SIZE(80, 160), 20, false, 255, + UPB_SIZE(88, 168), 21, false, 255, }; #include "upb/port_undef.inc" diff --git a/grpc/src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.h b/grpc/src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.h index 8d43fa97..70b76232 100644 --- a/grpc/src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.h +++ b/grpc/src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.h @@ -88,6 +88,8 @@ UPB_INLINE bool envoy_config_cluster_v3_OutlierDetection_has_failure_percentage_ UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_failure_percentage_minimum_hosts(const envoy_config_cluster_v3_OutlierDetection *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(72, 144), const struct google_protobuf_UInt32Value*); } UPB_INLINE bool envoy_config_cluster_v3_OutlierDetection_has_failure_percentage_request_volume(const envoy_config_cluster_v3_OutlierDetection *msg) { return _upb_hasbit(msg, 19); } UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDetection_failure_percentage_request_volume(const envoy_config_cluster_v3_OutlierDetection *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(76, 152), const struct google_protobuf_UInt32Value*); } +UPB_INLINE bool envoy_config_cluster_v3_OutlierDetection_has_max_ejection_time(const envoy_config_cluster_v3_OutlierDetection *msg) { return _upb_hasbit(msg, 20); } +UPB_INLINE const struct google_protobuf_Duration* envoy_config_cluster_v3_OutlierDetection_max_ejection_time(const envoy_config_cluster_v3_OutlierDetection *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(80, 160), const struct google_protobuf_Duration*); } UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_consecutive_5xx(envoy_config_cluster_v3_OutlierDetection *msg, struct google_protobuf_UInt32Value* value) { _upb_sethas(msg, 1); @@ -339,6 +341,19 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_cluster_v3_OutlierDe } return sub; } +UPB_INLINE void envoy_config_cluster_v3_OutlierDetection_set_max_ejection_time(envoy_config_cluster_v3_OutlierDetection *msg, struct google_protobuf_Duration* value) { + _upb_sethas(msg, 20); + *UPB_PTR_AT(msg, UPB_SIZE(80, 160), struct google_protobuf_Duration*) = value; +} +UPB_INLINE struct google_protobuf_Duration* envoy_config_cluster_v3_OutlierDetection_mutable_max_ejection_time(envoy_config_cluster_v3_OutlierDetection *msg, upb_arena *arena) { + struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_cluster_v3_OutlierDetection_max_ejection_time(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Duration*)_upb_msg_new(&google_protobuf_Duration_msginit, arena); + if (!sub) return NULL; + envoy_config_cluster_v3_OutlierDetection_set_max_ejection_time(msg, sub); + } + return sub; +} #ifdef __cplusplus } /* extern "C" */ diff --git a/grpc/src/core/ext/upb-generated/envoy/config/core/v3/base.upb.c b/grpc/src/core/ext/upb-generated/envoy/config/core/v3/base.upb.c index 355bbdc6..0baf9e98 100644 --- a/grpc/src/core/ext/upb-generated/envoy/config/core/v3/base.upb.c +++ b/grpc/src/core/ext/upb-generated/envoy/config/core/v3/base.upb.c @@ -15,7 +15,6 @@ #include "envoy/type/v3/percent.upb.h" #include "envoy/type/v3/semantic_version.upb.h" #include "google/protobuf/any.upb.h" -#include "google/protobuf/duration.upb.h" #include "google/protobuf/struct.upb.h" #include "google/protobuf/wrappers.upb.h" #include "udpa/annotations/migrate.upb.h" @@ -138,6 +137,21 @@ const upb_msglayout envoy_config_core_v3_RuntimeUInt32_msginit = { UPB_SIZE(16, 32), 2, false, 255, }; +static const upb_msglayout *const envoy_config_core_v3_RuntimePercent_submsgs[1] = { + &envoy_type_v3_Percent_msginit, +}; + +static const upb_msglayout_field envoy_config_core_v3_RuntimePercent__fields[2] = { + {1, UPB_SIZE(12, 24), 1, 0, 11, 1}, + {2, UPB_SIZE(4, 8), 0, 0, 9, 1}, +}; + +const upb_msglayout envoy_config_core_v3_RuntimePercent_msginit = { + &envoy_config_core_v3_RuntimePercent_submsgs[0], + &envoy_config_core_v3_RuntimePercent__fields[0], + UPB_SIZE(16, 32), 2, false, 255, +}; + static const upb_msglayout_field envoy_config_core_v3_RuntimeDouble__fields[2] = { {1, UPB_SIZE(0, 0), 0, 0, 1, 1}, {2, UPB_SIZE(8, 8), 0, 0, 9, 1}, @@ -205,6 +219,16 @@ const upb_msglayout envoy_config_core_v3_HeaderMap_msginit = { UPB_SIZE(8, 8), 1, false, 255, }; +static const upb_msglayout_field envoy_config_core_v3_WatchedDirectory__fields[1] = { + {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, +}; + +const upb_msglayout envoy_config_core_v3_WatchedDirectory_msginit = { + NULL, + &envoy_config_core_v3_WatchedDirectory__fields[0], + UPB_SIZE(8, 16), 1, false, 255, +}; + static const upb_msglayout_field envoy_config_core_v3_DataSource__fields[3] = { {1, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 9, 1}, {2, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 12, 1}, diff --git a/grpc/src/core/ext/upb-generated/envoy/config/core/v3/base.upb.h b/grpc/src/core/ext/upb-generated/envoy/config/core/v3/base.upb.h index 07cbaf43..bfb4fd4d 100644 --- a/grpc/src/core/ext/upb-generated/envoy/config/core/v3/base.upb.h +++ b/grpc/src/core/ext/upb-generated/envoy/config/core/v3/base.upb.h @@ -27,11 +27,13 @@ struct envoy_config_core_v3_Node; struct envoy_config_core_v3_Metadata; struct envoy_config_core_v3_Metadata_FilterMetadataEntry; struct envoy_config_core_v3_RuntimeUInt32; +struct envoy_config_core_v3_RuntimePercent; struct envoy_config_core_v3_RuntimeDouble; struct envoy_config_core_v3_RuntimeFeatureFlag; struct envoy_config_core_v3_HeaderValue; struct envoy_config_core_v3_HeaderValueOption; struct envoy_config_core_v3_HeaderMap; +struct envoy_config_core_v3_WatchedDirectory; struct envoy_config_core_v3_DataSource; struct envoy_config_core_v3_RetryPolicy; struct envoy_config_core_v3_RemoteDataSource; @@ -46,11 +48,13 @@ typedef struct envoy_config_core_v3_Node envoy_config_core_v3_Node; typedef struct envoy_config_core_v3_Metadata envoy_config_core_v3_Metadata; typedef struct envoy_config_core_v3_Metadata_FilterMetadataEntry envoy_config_core_v3_Metadata_FilterMetadataEntry; typedef struct envoy_config_core_v3_RuntimeUInt32 envoy_config_core_v3_RuntimeUInt32; +typedef struct envoy_config_core_v3_RuntimePercent envoy_config_core_v3_RuntimePercent; typedef struct envoy_config_core_v3_RuntimeDouble envoy_config_core_v3_RuntimeDouble; typedef struct envoy_config_core_v3_RuntimeFeatureFlag envoy_config_core_v3_RuntimeFeatureFlag; typedef struct envoy_config_core_v3_HeaderValue envoy_config_core_v3_HeaderValue; typedef struct envoy_config_core_v3_HeaderValueOption envoy_config_core_v3_HeaderValueOption; typedef struct envoy_config_core_v3_HeaderMap envoy_config_core_v3_HeaderMap; +typedef struct envoy_config_core_v3_WatchedDirectory envoy_config_core_v3_WatchedDirectory; typedef struct envoy_config_core_v3_DataSource envoy_config_core_v3_DataSource; typedef struct envoy_config_core_v3_RetryPolicy envoy_config_core_v3_RetryPolicy; typedef struct envoy_config_core_v3_RemoteDataSource envoy_config_core_v3_RemoteDataSource; @@ -65,11 +69,13 @@ extern const upb_msglayout envoy_config_core_v3_Node_msginit; extern const upb_msglayout envoy_config_core_v3_Metadata_msginit; extern const upb_msglayout envoy_config_core_v3_Metadata_FilterMetadataEntry_msginit; extern const upb_msglayout envoy_config_core_v3_RuntimeUInt32_msginit; +extern const upb_msglayout envoy_config_core_v3_RuntimePercent_msginit; extern const upb_msglayout envoy_config_core_v3_RuntimeDouble_msginit; extern const upb_msglayout envoy_config_core_v3_RuntimeFeatureFlag_msginit; extern const upb_msglayout envoy_config_core_v3_HeaderValue_msginit; extern const upb_msglayout envoy_config_core_v3_HeaderValueOption_msginit; extern const upb_msglayout envoy_config_core_v3_HeaderMap_msginit; +extern const upb_msglayout envoy_config_core_v3_WatchedDirectory_msginit; extern const upb_msglayout envoy_config_core_v3_DataSource_msginit; extern const upb_msglayout envoy_config_core_v3_RetryPolicy_msginit; extern const upb_msglayout envoy_config_core_v3_RemoteDataSource_msginit; @@ -81,6 +87,7 @@ struct envoy_config_core_v3_Address; struct envoy_config_core_v3_BackoffStrategy; struct envoy_config_core_v3_HttpUri; struct envoy_type_v3_FractionalPercent; +struct envoy_type_v3_Percent; struct envoy_type_v3_SemanticVersion; struct google_protobuf_Any; struct google_protobuf_BoolValue; @@ -90,6 +97,7 @@ extern const upb_msglayout envoy_config_core_v3_Address_msginit; extern const upb_msglayout envoy_config_core_v3_BackoffStrategy_msginit; extern const upb_msglayout envoy_config_core_v3_HttpUri_msginit; extern const upb_msglayout envoy_type_v3_FractionalPercent_msginit; +extern const upb_msglayout envoy_type_v3_Percent_msginit; extern const upb_msglayout envoy_type_v3_SemanticVersion_msginit; extern const upb_msglayout google_protobuf_Any_msginit; extern const upb_msglayout google_protobuf_BoolValue_msginit; @@ -469,6 +477,47 @@ UPB_INLINE void envoy_config_core_v3_RuntimeUInt32_set_runtime_key(envoy_config_ *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview) = value; } +/* envoy.config.core.v3.RuntimePercent */ + +UPB_INLINE envoy_config_core_v3_RuntimePercent *envoy_config_core_v3_RuntimePercent_new(upb_arena *arena) { + return (envoy_config_core_v3_RuntimePercent *)_upb_msg_new(&envoy_config_core_v3_RuntimePercent_msginit, arena); +} +UPB_INLINE envoy_config_core_v3_RuntimePercent *envoy_config_core_v3_RuntimePercent_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_config_core_v3_RuntimePercent *ret = envoy_config_core_v3_RuntimePercent_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_RuntimePercent_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_config_core_v3_RuntimePercent *envoy_config_core_v3_RuntimePercent_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_config_core_v3_RuntimePercent *ret = envoy_config_core_v3_RuntimePercent_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_RuntimePercent_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_config_core_v3_RuntimePercent_serialize(const envoy_config_core_v3_RuntimePercent *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_config_core_v3_RuntimePercent_msginit, arena, len); +} + +UPB_INLINE bool envoy_config_core_v3_RuntimePercent_has_default_value(const envoy_config_core_v3_RuntimePercent *msg) { return _upb_hasbit(msg, 1); } +UPB_INLINE const struct envoy_type_v3_Percent* envoy_config_core_v3_RuntimePercent_default_value(const envoy_config_core_v3_RuntimePercent *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(12, 24), const struct envoy_type_v3_Percent*); } +UPB_INLINE upb_strview envoy_config_core_v3_RuntimePercent_runtime_key(const envoy_config_core_v3_RuntimePercent *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview); } + +UPB_INLINE void envoy_config_core_v3_RuntimePercent_set_default_value(envoy_config_core_v3_RuntimePercent *msg, struct envoy_type_v3_Percent* value) { + _upb_sethas(msg, 1); + *UPB_PTR_AT(msg, UPB_SIZE(12, 24), struct envoy_type_v3_Percent*) = value; +} +UPB_INLINE struct envoy_type_v3_Percent* envoy_config_core_v3_RuntimePercent_mutable_default_value(envoy_config_core_v3_RuntimePercent *msg, upb_arena *arena) { + struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_config_core_v3_RuntimePercent_default_value(msg); + if (sub == NULL) { + sub = (struct envoy_type_v3_Percent*)_upb_msg_new(&envoy_type_v3_Percent_msginit, arena); + if (!sub) return NULL; + envoy_config_core_v3_RuntimePercent_set_default_value(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_config_core_v3_RuntimePercent_set_runtime_key(envoy_config_core_v3_RuntimePercent *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview) = value; +} + /* envoy.config.core.v3.RuntimeDouble */ UPB_INLINE envoy_config_core_v3_RuntimeDouble *envoy_config_core_v3_RuntimeDouble_new(upb_arena *arena) { @@ -659,6 +708,32 @@ UPB_INLINE struct envoy_config_core_v3_HeaderValue* envoy_config_core_v3_HeaderM return sub; } +/* envoy.config.core.v3.WatchedDirectory */ + +UPB_INLINE envoy_config_core_v3_WatchedDirectory *envoy_config_core_v3_WatchedDirectory_new(upb_arena *arena) { + return (envoy_config_core_v3_WatchedDirectory *)_upb_msg_new(&envoy_config_core_v3_WatchedDirectory_msginit, arena); +} +UPB_INLINE envoy_config_core_v3_WatchedDirectory *envoy_config_core_v3_WatchedDirectory_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_config_core_v3_WatchedDirectory *ret = envoy_config_core_v3_WatchedDirectory_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_WatchedDirectory_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_config_core_v3_WatchedDirectory *envoy_config_core_v3_WatchedDirectory_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_config_core_v3_WatchedDirectory *ret = envoy_config_core_v3_WatchedDirectory_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_WatchedDirectory_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_config_core_v3_WatchedDirectory_serialize(const envoy_config_core_v3_WatchedDirectory *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_config_core_v3_WatchedDirectory_msginit, arena, len); +} + +UPB_INLINE upb_strview envoy_config_core_v3_WatchedDirectory_path(const envoy_config_core_v3_WatchedDirectory *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(0, 0), upb_strview); } + +UPB_INLINE void envoy_config_core_v3_WatchedDirectory_set_path(envoy_config_core_v3_WatchedDirectory *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(0, 0), upb_strview) = value; +} + /* envoy.config.core.v3.DataSource */ UPB_INLINE envoy_config_core_v3_DataSource *envoy_config_core_v3_DataSource_new(upb_arena *arena) { diff --git a/grpc/src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.c b/grpc/src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.c index 60be5fb1..30a2e754 100644 --- a/grpc/src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.c +++ b/grpc/src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.c @@ -12,7 +12,7 @@ #include "envoy/config/core/v3/grpc_service.upb.h" #include "google/protobuf/duration.upb.h" #include "google/protobuf/wrappers.upb.h" -#include "udpa/core/v1/authority.upb.h" +#include "xds/core/v3/authority.upb.h" #include "envoy/annotations/deprecation.upb.h" #include "udpa/annotations/status.upb.h" #include "udpa/annotations/versioning.upb.h" @@ -80,7 +80,7 @@ static const upb_msglayout *const envoy_config_core_v3_ConfigSource_submsgs[5] = &envoy_config_core_v3_ApiConfigSource_msginit, &envoy_config_core_v3_SelfConfigSource_msginit, &google_protobuf_Duration_msginit, - &udpa_core_v1_Authority_msginit, + &xds_core_v3_Authority_msginit, }; static const upb_msglayout_field envoy_config_core_v3_ConfigSource__fields[7] = { diff --git a/grpc/src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.h b/grpc/src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.h index bbc165f8..1fc85348 100644 --- a/grpc/src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.h +++ b/grpc/src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.h @@ -39,12 +39,12 @@ struct envoy_config_core_v3_GrpcService; struct google_protobuf_DoubleValue; struct google_protobuf_Duration; struct google_protobuf_UInt32Value; -struct udpa_core_v1_Authority; +struct xds_core_v3_Authority; extern const upb_msglayout envoy_config_core_v3_GrpcService_msginit; extern const upb_msglayout google_protobuf_DoubleValue_msginit; extern const upb_msglayout google_protobuf_Duration_msginit; extern const upb_msglayout google_protobuf_UInt32Value_msginit; -extern const upb_msglayout udpa_core_v1_Authority_msginit; +extern const upb_msglayout xds_core_v3_Authority_msginit; typedef enum { envoy_config_core_v3_ApiConfigSource_DEPRECATED_AND_UNAVAILABLE_DO_NOT_USE = 0, @@ -308,7 +308,7 @@ UPB_INLINE bool envoy_config_core_v3_ConfigSource_has_self(const envoy_config_co UPB_INLINE const envoy_config_core_v3_SelfConfigSource* envoy_config_core_v3_ConfigSource_self(const envoy_config_core_v3_ConfigSource *msg) { return UPB_READ_ONEOF(msg, const envoy_config_core_v3_SelfConfigSource*, UPB_SIZE(16, 24), UPB_SIZE(24, 40), 5, NULL); } UPB_INLINE int32_t envoy_config_core_v3_ConfigSource_resource_api_version(const envoy_config_core_v3_ConfigSource *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t); } UPB_INLINE bool envoy_config_core_v3_ConfigSource_has_authorities(const envoy_config_core_v3_ConfigSource *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(12, 16)); } -UPB_INLINE const struct udpa_core_v1_Authority* const* envoy_config_core_v3_ConfigSource_authorities(const envoy_config_core_v3_ConfigSource *msg, size_t *len) { return (const struct udpa_core_v1_Authority* const*)_upb_array_accessor(msg, UPB_SIZE(12, 16), len); } +UPB_INLINE const struct xds_core_v3_Authority* const* envoy_config_core_v3_ConfigSource_authorities(const envoy_config_core_v3_ConfigSource *msg, size_t *len) { return (const struct xds_core_v3_Authority* const*)_upb_array_accessor(msg, UPB_SIZE(12, 16), len); } UPB_INLINE void envoy_config_core_v3_ConfigSource_set_path(envoy_config_core_v3_ConfigSource *msg, upb_strview value) { UPB_WRITE_ONEOF(msg, upb_strview, UPB_SIZE(16, 24), value, UPB_SIZE(24, 40), 1); @@ -365,14 +365,14 @@ UPB_INLINE struct envoy_config_core_v3_SelfConfigSource* envoy_config_core_v3_Co UPB_INLINE void envoy_config_core_v3_ConfigSource_set_resource_api_version(envoy_config_core_v3_ConfigSource *msg, int32_t value) { *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t) = value; } -UPB_INLINE struct udpa_core_v1_Authority** envoy_config_core_v3_ConfigSource_mutable_authorities(envoy_config_core_v3_ConfigSource *msg, size_t *len) { - return (struct udpa_core_v1_Authority**)_upb_array_mutable_accessor(msg, UPB_SIZE(12, 16), len); +UPB_INLINE struct xds_core_v3_Authority** envoy_config_core_v3_ConfigSource_mutable_authorities(envoy_config_core_v3_ConfigSource *msg, size_t *len) { + return (struct xds_core_v3_Authority**)_upb_array_mutable_accessor(msg, UPB_SIZE(12, 16), len); } -UPB_INLINE struct udpa_core_v1_Authority** envoy_config_core_v3_ConfigSource_resize_authorities(envoy_config_core_v3_ConfigSource *msg, size_t len, upb_arena *arena) { - return (struct udpa_core_v1_Authority**)_upb_array_resize_accessor2(msg, UPB_SIZE(12, 16), len, UPB_SIZE(2, 3), arena); +UPB_INLINE struct xds_core_v3_Authority** envoy_config_core_v3_ConfigSource_resize_authorities(envoy_config_core_v3_ConfigSource *msg, size_t len, upb_arena *arena) { + return (struct xds_core_v3_Authority**)_upb_array_resize_accessor2(msg, UPB_SIZE(12, 16), len, UPB_SIZE(2, 3), arena); } -UPB_INLINE struct udpa_core_v1_Authority* envoy_config_core_v3_ConfigSource_add_authorities(envoy_config_core_v3_ConfigSource *msg, upb_arena *arena) { - struct udpa_core_v1_Authority* sub = (struct udpa_core_v1_Authority*)_upb_msg_new(&udpa_core_v1_Authority_msginit, arena); +UPB_INLINE struct xds_core_v3_Authority* envoy_config_core_v3_ConfigSource_add_authorities(envoy_config_core_v3_ConfigSource *msg, upb_arena *arena) { + struct xds_core_v3_Authority* sub = (struct xds_core_v3_Authority*)_upb_msg_new(&xds_core_v3_Authority_msginit, arena); bool ok = _upb_array_append_accessor2( msg, UPB_SIZE(12, 16), UPB_SIZE(2, 3), &sub, arena); if (!ok) return NULL; diff --git a/grpc/src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.c b/grpc/src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.c index c3f4339c..b0a5a642 100644 --- a/grpc/src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.c +++ b/grpc/src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.c @@ -18,7 +18,6 @@ #include "google/protobuf/duration.upb.h" #include "google/protobuf/struct.upb.h" #include "google/protobuf/wrappers.upb.h" -#include "envoy/annotations/deprecation.upb.h" #include "udpa/annotations/status.upb.h" #include "udpa/annotations/versioning.upb.h" #include "validate/validate.upb.h" @@ -38,7 +37,7 @@ static const upb_msglayout *const envoy_config_core_v3_HealthCheck_submsgs[10] = &google_protobuf_UInt32Value_msginit, }; -static const upb_msglayout_field envoy_config_core_v3_HealthCheck__fields[22] = { +static const upb_msglayout_field envoy_config_core_v3_HealthCheck__fields[23] = { {1, UPB_SIZE(20, 32), 1, 7, 11, 1}, {2, UPB_SIZE(24, 40), 2, 7, 11, 1}, {3, UPB_SIZE(28, 48), 3, 7, 11, 1}, @@ -46,11 +45,11 @@ static const upb_msglayout_field envoy_config_core_v3_HealthCheck__fields[22] = {5, UPB_SIZE(36, 64), 5, 9, 11, 1}, {6, UPB_SIZE(40, 72), 6, 9, 11, 1}, {7, UPB_SIZE(44, 80), 7, 6, 11, 1}, - {8, UPB_SIZE(80, 152), UPB_SIZE(-85, -161), 3, 11, 1}, - {9, UPB_SIZE(80, 152), UPB_SIZE(-85, -161), 4, 11, 1}, - {11, UPB_SIZE(80, 152), UPB_SIZE(-85, -161), 2, 11, 1}, + {8, UPB_SIZE(84, 160), UPB_SIZE(-89, -169), 3, 11, 1}, + {9, UPB_SIZE(84, 160), UPB_SIZE(-89, -169), 4, 11, 1}, + {11, UPB_SIZE(84, 160), UPB_SIZE(-89, -169), 2, 11, 1}, {12, UPB_SIZE(48, 88), 8, 7, 11, 1}, - {13, UPB_SIZE(80, 152), UPB_SIZE(-85, -161), 1, 11, 1}, + {13, UPB_SIZE(84, 160), UPB_SIZE(-89, -169), 1, 11, 1}, {14, UPB_SIZE(52, 96), 9, 7, 11, 1}, {15, UPB_SIZE(56, 104), 10, 7, 11, 1}, {16, UPB_SIZE(60, 112), 11, 7, 11, 1}, @@ -61,12 +60,13 @@ static const upb_msglayout_field envoy_config_core_v3_HealthCheck__fields[22] = {21, UPB_SIZE(68, 128), 13, 5, 11, 1}, {22, UPB_SIZE(72, 136), 14, 0, 11, 1}, {23, UPB_SIZE(76, 144), 15, 8, 11, 1}, + {24, UPB_SIZE(80, 152), 16, 7, 11, 1}, }; const upb_msglayout envoy_config_core_v3_HealthCheck_msginit = { &envoy_config_core_v3_HealthCheck_submsgs[0], &envoy_config_core_v3_HealthCheck__fields[0], - UPB_SIZE(88, 176), 22, false, 255, + UPB_SIZE(96, 176), 23, false, 255, }; static const upb_msglayout_field envoy_config_core_v3_HealthCheck_Payload__fields[2] = { diff --git a/grpc/src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.h b/grpc/src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.h index 711bbfca..e4a803ab 100644 --- a/grpc/src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.h +++ b/grpc/src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.h @@ -100,7 +100,7 @@ typedef enum { envoy_config_core_v3_HealthCheck_health_checker_custom_health_check = 13, envoy_config_core_v3_HealthCheck_health_checker_NOT_SET = 0 } envoy_config_core_v3_HealthCheck_health_checker_oneofcases; -UPB_INLINE envoy_config_core_v3_HealthCheck_health_checker_oneofcases envoy_config_core_v3_HealthCheck_health_checker_case(const envoy_config_core_v3_HealthCheck* msg) { return (envoy_config_core_v3_HealthCheck_health_checker_oneofcases)*UPB_PTR_AT(msg, UPB_SIZE(84, 160), int32_t); } +UPB_INLINE envoy_config_core_v3_HealthCheck_health_checker_oneofcases envoy_config_core_v3_HealthCheck_health_checker_case(const envoy_config_core_v3_HealthCheck* msg) { return (envoy_config_core_v3_HealthCheck_health_checker_oneofcases)*UPB_PTR_AT(msg, UPB_SIZE(88, 168), int32_t); } UPB_INLINE bool envoy_config_core_v3_HealthCheck_has_timeout(const envoy_config_core_v3_HealthCheck *msg) { return _upb_hasbit(msg, 1); } UPB_INLINE const struct google_protobuf_Duration* envoy_config_core_v3_HealthCheck_timeout(const envoy_config_core_v3_HealthCheck *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(20, 32), const struct google_protobuf_Duration*); } @@ -116,16 +116,16 @@ UPB_INLINE bool envoy_config_core_v3_HealthCheck_has_alt_port(const envoy_config UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_core_v3_HealthCheck_alt_port(const envoy_config_core_v3_HealthCheck *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(40, 72), const struct google_protobuf_UInt32Value*); } UPB_INLINE bool envoy_config_core_v3_HealthCheck_has_reuse_connection(const envoy_config_core_v3_HealthCheck *msg) { return _upb_hasbit(msg, 7); } UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_core_v3_HealthCheck_reuse_connection(const envoy_config_core_v3_HealthCheck *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(44, 80), const struct google_protobuf_BoolValue*); } -UPB_INLINE bool envoy_config_core_v3_HealthCheck_has_http_health_check(const envoy_config_core_v3_HealthCheck *msg) { return _upb_getoneofcase(msg, UPB_SIZE(84, 160)) == 8; } -UPB_INLINE const envoy_config_core_v3_HealthCheck_HttpHealthCheck* envoy_config_core_v3_HealthCheck_http_health_check(const envoy_config_core_v3_HealthCheck *msg) { return UPB_READ_ONEOF(msg, const envoy_config_core_v3_HealthCheck_HttpHealthCheck*, UPB_SIZE(80, 152), UPB_SIZE(84, 160), 8, NULL); } -UPB_INLINE bool envoy_config_core_v3_HealthCheck_has_tcp_health_check(const envoy_config_core_v3_HealthCheck *msg) { return _upb_getoneofcase(msg, UPB_SIZE(84, 160)) == 9; } -UPB_INLINE const envoy_config_core_v3_HealthCheck_TcpHealthCheck* envoy_config_core_v3_HealthCheck_tcp_health_check(const envoy_config_core_v3_HealthCheck *msg) { return UPB_READ_ONEOF(msg, const envoy_config_core_v3_HealthCheck_TcpHealthCheck*, UPB_SIZE(80, 152), UPB_SIZE(84, 160), 9, NULL); } -UPB_INLINE bool envoy_config_core_v3_HealthCheck_has_grpc_health_check(const envoy_config_core_v3_HealthCheck *msg) { return _upb_getoneofcase(msg, UPB_SIZE(84, 160)) == 11; } -UPB_INLINE const envoy_config_core_v3_HealthCheck_GrpcHealthCheck* envoy_config_core_v3_HealthCheck_grpc_health_check(const envoy_config_core_v3_HealthCheck *msg) { return UPB_READ_ONEOF(msg, const envoy_config_core_v3_HealthCheck_GrpcHealthCheck*, UPB_SIZE(80, 152), UPB_SIZE(84, 160), 11, NULL); } +UPB_INLINE bool envoy_config_core_v3_HealthCheck_has_http_health_check(const envoy_config_core_v3_HealthCheck *msg) { return _upb_getoneofcase(msg, UPB_SIZE(88, 168)) == 8; } +UPB_INLINE const envoy_config_core_v3_HealthCheck_HttpHealthCheck* envoy_config_core_v3_HealthCheck_http_health_check(const envoy_config_core_v3_HealthCheck *msg) { return UPB_READ_ONEOF(msg, const envoy_config_core_v3_HealthCheck_HttpHealthCheck*, UPB_SIZE(84, 160), UPB_SIZE(88, 168), 8, NULL); } +UPB_INLINE bool envoy_config_core_v3_HealthCheck_has_tcp_health_check(const envoy_config_core_v3_HealthCheck *msg) { return _upb_getoneofcase(msg, UPB_SIZE(88, 168)) == 9; } +UPB_INLINE const envoy_config_core_v3_HealthCheck_TcpHealthCheck* envoy_config_core_v3_HealthCheck_tcp_health_check(const envoy_config_core_v3_HealthCheck *msg) { return UPB_READ_ONEOF(msg, const envoy_config_core_v3_HealthCheck_TcpHealthCheck*, UPB_SIZE(84, 160), UPB_SIZE(88, 168), 9, NULL); } +UPB_INLINE bool envoy_config_core_v3_HealthCheck_has_grpc_health_check(const envoy_config_core_v3_HealthCheck *msg) { return _upb_getoneofcase(msg, UPB_SIZE(88, 168)) == 11; } +UPB_INLINE const envoy_config_core_v3_HealthCheck_GrpcHealthCheck* envoy_config_core_v3_HealthCheck_grpc_health_check(const envoy_config_core_v3_HealthCheck *msg) { return UPB_READ_ONEOF(msg, const envoy_config_core_v3_HealthCheck_GrpcHealthCheck*, UPB_SIZE(84, 160), UPB_SIZE(88, 168), 11, NULL); } UPB_INLINE bool envoy_config_core_v3_HealthCheck_has_no_traffic_interval(const envoy_config_core_v3_HealthCheck *msg) { return _upb_hasbit(msg, 8); } UPB_INLINE const struct google_protobuf_Duration* envoy_config_core_v3_HealthCheck_no_traffic_interval(const envoy_config_core_v3_HealthCheck *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(48, 88), const struct google_protobuf_Duration*); } -UPB_INLINE bool envoy_config_core_v3_HealthCheck_has_custom_health_check(const envoy_config_core_v3_HealthCheck *msg) { return _upb_getoneofcase(msg, UPB_SIZE(84, 160)) == 13; } -UPB_INLINE const envoy_config_core_v3_HealthCheck_CustomHealthCheck* envoy_config_core_v3_HealthCheck_custom_health_check(const envoy_config_core_v3_HealthCheck *msg) { return UPB_READ_ONEOF(msg, const envoy_config_core_v3_HealthCheck_CustomHealthCheck*, UPB_SIZE(80, 152), UPB_SIZE(84, 160), 13, NULL); } +UPB_INLINE bool envoy_config_core_v3_HealthCheck_has_custom_health_check(const envoy_config_core_v3_HealthCheck *msg) { return _upb_getoneofcase(msg, UPB_SIZE(88, 168)) == 13; } +UPB_INLINE const envoy_config_core_v3_HealthCheck_CustomHealthCheck* envoy_config_core_v3_HealthCheck_custom_health_check(const envoy_config_core_v3_HealthCheck *msg) { return UPB_READ_ONEOF(msg, const envoy_config_core_v3_HealthCheck_CustomHealthCheck*, UPB_SIZE(84, 160), UPB_SIZE(88, 168), 13, NULL); } UPB_INLINE bool envoy_config_core_v3_HealthCheck_has_unhealthy_interval(const envoy_config_core_v3_HealthCheck *msg) { return _upb_hasbit(msg, 9); } UPB_INLINE const struct google_protobuf_Duration* envoy_config_core_v3_HealthCheck_unhealthy_interval(const envoy_config_core_v3_HealthCheck *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(52, 96), const struct google_protobuf_Duration*); } UPB_INLINE bool envoy_config_core_v3_HealthCheck_has_unhealthy_edge_interval(const envoy_config_core_v3_HealthCheck *msg) { return _upb_hasbit(msg, 10); } @@ -143,6 +143,8 @@ UPB_INLINE bool envoy_config_core_v3_HealthCheck_has_event_service(const envoy_c UPB_INLINE const struct envoy_config_core_v3_EventServiceConfig* envoy_config_core_v3_HealthCheck_event_service(const envoy_config_core_v3_HealthCheck *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(72, 136), const struct envoy_config_core_v3_EventServiceConfig*); } UPB_INLINE bool envoy_config_core_v3_HealthCheck_has_transport_socket_match_criteria(const envoy_config_core_v3_HealthCheck *msg) { return _upb_hasbit(msg, 15); } UPB_INLINE const struct google_protobuf_Struct* envoy_config_core_v3_HealthCheck_transport_socket_match_criteria(const envoy_config_core_v3_HealthCheck *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(76, 144), const struct google_protobuf_Struct*); } +UPB_INLINE bool envoy_config_core_v3_HealthCheck_has_no_traffic_healthy_interval(const envoy_config_core_v3_HealthCheck *msg) { return _upb_hasbit(msg, 16); } +UPB_INLINE const struct google_protobuf_Duration* envoy_config_core_v3_HealthCheck_no_traffic_healthy_interval(const envoy_config_core_v3_HealthCheck *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(80, 152), const struct google_protobuf_Duration*); } UPB_INLINE void envoy_config_core_v3_HealthCheck_set_timeout(envoy_config_core_v3_HealthCheck *msg, struct google_protobuf_Duration* value) { _upb_sethas(msg, 1); @@ -236,7 +238,7 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_core_v3_HealthCheck_mu return sub; } UPB_INLINE void envoy_config_core_v3_HealthCheck_set_http_health_check(envoy_config_core_v3_HealthCheck *msg, envoy_config_core_v3_HealthCheck_HttpHealthCheck* value) { - UPB_WRITE_ONEOF(msg, envoy_config_core_v3_HealthCheck_HttpHealthCheck*, UPB_SIZE(80, 152), value, UPB_SIZE(84, 160), 8); + UPB_WRITE_ONEOF(msg, envoy_config_core_v3_HealthCheck_HttpHealthCheck*, UPB_SIZE(84, 160), value, UPB_SIZE(88, 168), 8); } UPB_INLINE struct envoy_config_core_v3_HealthCheck_HttpHealthCheck* envoy_config_core_v3_HealthCheck_mutable_http_health_check(envoy_config_core_v3_HealthCheck *msg, upb_arena *arena) { struct envoy_config_core_v3_HealthCheck_HttpHealthCheck* sub = (struct envoy_config_core_v3_HealthCheck_HttpHealthCheck*)envoy_config_core_v3_HealthCheck_http_health_check(msg); @@ -248,7 +250,7 @@ UPB_INLINE struct envoy_config_core_v3_HealthCheck_HttpHealthCheck* envoy_config return sub; } UPB_INLINE void envoy_config_core_v3_HealthCheck_set_tcp_health_check(envoy_config_core_v3_HealthCheck *msg, envoy_config_core_v3_HealthCheck_TcpHealthCheck* value) { - UPB_WRITE_ONEOF(msg, envoy_config_core_v3_HealthCheck_TcpHealthCheck*, UPB_SIZE(80, 152), value, UPB_SIZE(84, 160), 9); + UPB_WRITE_ONEOF(msg, envoy_config_core_v3_HealthCheck_TcpHealthCheck*, UPB_SIZE(84, 160), value, UPB_SIZE(88, 168), 9); } UPB_INLINE struct envoy_config_core_v3_HealthCheck_TcpHealthCheck* envoy_config_core_v3_HealthCheck_mutable_tcp_health_check(envoy_config_core_v3_HealthCheck *msg, upb_arena *arena) { struct envoy_config_core_v3_HealthCheck_TcpHealthCheck* sub = (struct envoy_config_core_v3_HealthCheck_TcpHealthCheck*)envoy_config_core_v3_HealthCheck_tcp_health_check(msg); @@ -260,7 +262,7 @@ UPB_INLINE struct envoy_config_core_v3_HealthCheck_TcpHealthCheck* envoy_config_ return sub; } UPB_INLINE void envoy_config_core_v3_HealthCheck_set_grpc_health_check(envoy_config_core_v3_HealthCheck *msg, envoy_config_core_v3_HealthCheck_GrpcHealthCheck* value) { - UPB_WRITE_ONEOF(msg, envoy_config_core_v3_HealthCheck_GrpcHealthCheck*, UPB_SIZE(80, 152), value, UPB_SIZE(84, 160), 11); + UPB_WRITE_ONEOF(msg, envoy_config_core_v3_HealthCheck_GrpcHealthCheck*, UPB_SIZE(84, 160), value, UPB_SIZE(88, 168), 11); } UPB_INLINE struct envoy_config_core_v3_HealthCheck_GrpcHealthCheck* envoy_config_core_v3_HealthCheck_mutable_grpc_health_check(envoy_config_core_v3_HealthCheck *msg, upb_arena *arena) { struct envoy_config_core_v3_HealthCheck_GrpcHealthCheck* sub = (struct envoy_config_core_v3_HealthCheck_GrpcHealthCheck*)envoy_config_core_v3_HealthCheck_grpc_health_check(msg); @@ -285,7 +287,7 @@ UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HealthCheck_mut return sub; } UPB_INLINE void envoy_config_core_v3_HealthCheck_set_custom_health_check(envoy_config_core_v3_HealthCheck *msg, envoy_config_core_v3_HealthCheck_CustomHealthCheck* value) { - UPB_WRITE_ONEOF(msg, envoy_config_core_v3_HealthCheck_CustomHealthCheck*, UPB_SIZE(80, 152), value, UPB_SIZE(84, 160), 13); + UPB_WRITE_ONEOF(msg, envoy_config_core_v3_HealthCheck_CustomHealthCheck*, UPB_SIZE(84, 160), value, UPB_SIZE(88, 168), 13); } UPB_INLINE struct envoy_config_core_v3_HealthCheck_CustomHealthCheck* envoy_config_core_v3_HealthCheck_mutable_custom_health_check(envoy_config_core_v3_HealthCheck *msg, upb_arena *arena) { struct envoy_config_core_v3_HealthCheck_CustomHealthCheck* sub = (struct envoy_config_core_v3_HealthCheck_CustomHealthCheck*)envoy_config_core_v3_HealthCheck_custom_health_check(msg); @@ -396,6 +398,19 @@ UPB_INLINE struct google_protobuf_Struct* envoy_config_core_v3_HealthCheck_mutab } return sub; } +UPB_INLINE void envoy_config_core_v3_HealthCheck_set_no_traffic_healthy_interval(envoy_config_core_v3_HealthCheck *msg, struct google_protobuf_Duration* value) { + _upb_sethas(msg, 16); + *UPB_PTR_AT(msg, UPB_SIZE(80, 152), struct google_protobuf_Duration*) = value; +} +UPB_INLINE struct google_protobuf_Duration* envoy_config_core_v3_HealthCheck_mutable_no_traffic_healthy_interval(envoy_config_core_v3_HealthCheck *msg, upb_arena *arena) { + struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_core_v3_HealthCheck_no_traffic_healthy_interval(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Duration*)_upb_msg_new(&google_protobuf_Duration_msginit, arena); + if (!sub) return NULL; + envoy_config_core_v3_HealthCheck_set_no_traffic_healthy_interval(msg, sub); + } + return sub; +} /* envoy.config.core.v3.HealthCheck.Payload */ diff --git a/grpc/src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.c b/grpc/src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.c index 28250118..67c9b102 100644 --- a/grpc/src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.c +++ b/grpc/src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.c @@ -172,5 +172,11 @@ const upb_msglayout envoy_config_core_v3_GrpcProtocolOptions_msginit = { UPB_SIZE(8, 16), 1, false, 255, }; +const upb_msglayout envoy_config_core_v3_Http3ProtocolOptions_msginit = { + NULL, + NULL, + UPB_SIZE(0, 0), 0, false, 255, +}; + #include "upb/port_undef.inc" diff --git a/grpc/src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.h b/grpc/src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.h index c6906933..8bfcae6c 100644 --- a/grpc/src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.h +++ b/grpc/src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.h @@ -30,6 +30,7 @@ struct envoy_config_core_v3_KeepaliveSettings; struct envoy_config_core_v3_Http2ProtocolOptions; struct envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter; struct envoy_config_core_v3_GrpcProtocolOptions; +struct envoy_config_core_v3_Http3ProtocolOptions; typedef struct envoy_config_core_v3_TcpProtocolOptions envoy_config_core_v3_TcpProtocolOptions; typedef struct envoy_config_core_v3_UpstreamHttpProtocolOptions envoy_config_core_v3_UpstreamHttpProtocolOptions; typedef struct envoy_config_core_v3_HttpProtocolOptions envoy_config_core_v3_HttpProtocolOptions; @@ -40,6 +41,7 @@ typedef struct envoy_config_core_v3_KeepaliveSettings envoy_config_core_v3_Keepa typedef struct envoy_config_core_v3_Http2ProtocolOptions envoy_config_core_v3_Http2ProtocolOptions; typedef struct envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter; typedef struct envoy_config_core_v3_GrpcProtocolOptions envoy_config_core_v3_GrpcProtocolOptions; +typedef struct envoy_config_core_v3_Http3ProtocolOptions envoy_config_core_v3_Http3ProtocolOptions; extern const upb_msglayout envoy_config_core_v3_TcpProtocolOptions_msginit; extern const upb_msglayout envoy_config_core_v3_UpstreamHttpProtocolOptions_msginit; extern const upb_msglayout envoy_config_core_v3_HttpProtocolOptions_msginit; @@ -50,6 +52,7 @@ extern const upb_msglayout envoy_config_core_v3_KeepaliveSettings_msginit; extern const upb_msglayout envoy_config_core_v3_Http2ProtocolOptions_msginit; extern const upb_msglayout envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_msginit; extern const upb_msglayout envoy_config_core_v3_GrpcProtocolOptions_msginit; +extern const upb_msglayout envoy_config_core_v3_Http3ProtocolOptions_msginit; struct envoy_type_v3_Percent; struct google_protobuf_BoolValue; struct google_protobuf_Duration; @@ -721,6 +724,28 @@ UPB_INLINE struct envoy_config_core_v3_Http2ProtocolOptions* envoy_config_core_v return sub; } +/* envoy.config.core.v3.Http3ProtocolOptions */ + +UPB_INLINE envoy_config_core_v3_Http3ProtocolOptions *envoy_config_core_v3_Http3ProtocolOptions_new(upb_arena *arena) { + return (envoy_config_core_v3_Http3ProtocolOptions *)_upb_msg_new(&envoy_config_core_v3_Http3ProtocolOptions_msginit, arena); +} +UPB_INLINE envoy_config_core_v3_Http3ProtocolOptions *envoy_config_core_v3_Http3ProtocolOptions_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_config_core_v3_Http3ProtocolOptions *ret = envoy_config_core_v3_Http3ProtocolOptions_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_config_core_v3_Http3ProtocolOptions_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_config_core_v3_Http3ProtocolOptions *envoy_config_core_v3_Http3ProtocolOptions_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_config_core_v3_Http3ProtocolOptions *ret = envoy_config_core_v3_Http3ProtocolOptions_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_config_core_v3_Http3ProtocolOptions_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_config_core_v3_Http3ProtocolOptions_serialize(const envoy_config_core_v3_Http3ProtocolOptions *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_config_core_v3_Http3ProtocolOptions_msginit, arena, len); +} + + + #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/grpc/src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.c b/grpc/src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.c index 34344391..4c56e07b 100644 --- a/grpc/src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.c +++ b/grpc/src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.c @@ -10,7 +10,6 @@ #include "upb/msg.h" #include "envoy/config/core/v3/proxy_protocol.upb.h" #include "udpa/annotations/status.upb.h" -#include "validate/validate.upb.h" #include "upb/port_def.inc" diff --git a/grpc/src/core/ext/upb-generated/envoy/config/core/v3/substitution_format_string.upb.c b/grpc/src/core/ext/upb-generated/envoy/config/core/v3/substitution_format_string.upb.c index cf568617..71781640 100644 --- a/grpc/src/core/ext/upb-generated/envoy/config/core/v3/substitution_format_string.upb.c +++ b/grpc/src/core/ext/upb-generated/envoy/config/core/v3/substitution_format_string.upb.c @@ -9,27 +9,33 @@ #include <stddef.h> #include "upb/msg.h" #include "envoy/config/core/v3/substitution_format_string.upb.h" +#include "envoy/config/core/v3/base.upb.h" +#include "envoy/config/core/v3/extension.upb.h" #include "google/protobuf/struct.upb.h" #include "udpa/annotations/status.upb.h" #include "validate/validate.upb.h" #include "upb/port_def.inc" -static const upb_msglayout *const envoy_config_core_v3_SubstitutionFormatString_submsgs[1] = { +static const upb_msglayout *const envoy_config_core_v3_SubstitutionFormatString_submsgs[3] = { + &envoy_config_core_v3_DataSource_msginit, + &envoy_config_core_v3_TypedExtensionConfig_msginit, &google_protobuf_Struct_msginit, }; -static const upb_msglayout_field envoy_config_core_v3_SubstitutionFormatString__fields[4] = { - {1, UPB_SIZE(12, 24), UPB_SIZE(-21, -41), 0, 9, 1}, - {2, UPB_SIZE(12, 24), UPB_SIZE(-21, -41), 0, 11, 1}, +static const upb_msglayout_field envoy_config_core_v3_SubstitutionFormatString__fields[6] = { + {1, UPB_SIZE(16, 32), UPB_SIZE(-25, -49), 0, 9, 1}, + {2, UPB_SIZE(16, 32), UPB_SIZE(-25, -49), 2, 11, 1}, {3, UPB_SIZE(0, 0), 0, 0, 8, 1}, {4, UPB_SIZE(4, 8), 0, 0, 9, 1}, + {5, UPB_SIZE(16, 32), UPB_SIZE(-25, -49), 0, 11, 1}, + {6, UPB_SIZE(12, 24), 0, 1, 11, 3}, }; const upb_msglayout envoy_config_core_v3_SubstitutionFormatString_msginit = { &envoy_config_core_v3_SubstitutionFormatString_submsgs[0], &envoy_config_core_v3_SubstitutionFormatString__fields[0], - UPB_SIZE(24, 48), 4, false, 255, + UPB_SIZE(32, 64), 6, false, 255, }; #include "upb/port_undef.inc" diff --git a/grpc/src/core/ext/upb-generated/envoy/config/core/v3/substitution_format_string.upb.h b/grpc/src/core/ext/upb-generated/envoy/config/core/v3/substitution_format_string.upb.h index 439b19fd..3f450e9a 100644 --- a/grpc/src/core/ext/upb-generated/envoy/config/core/v3/substitution_format_string.upb.h +++ b/grpc/src/core/ext/upb-generated/envoy/config/core/v3/substitution_format_string.upb.h @@ -23,7 +23,11 @@ extern "C" { struct envoy_config_core_v3_SubstitutionFormatString; typedef struct envoy_config_core_v3_SubstitutionFormatString envoy_config_core_v3_SubstitutionFormatString; extern const upb_msglayout envoy_config_core_v3_SubstitutionFormatString_msginit; +struct envoy_config_core_v3_DataSource; +struct envoy_config_core_v3_TypedExtensionConfig; struct google_protobuf_Struct; +extern const upb_msglayout envoy_config_core_v3_DataSource_msginit; +extern const upb_msglayout envoy_config_core_v3_TypedExtensionConfig_msginit; extern const upb_msglayout google_protobuf_Struct_msginit; @@ -50,22 +54,27 @@ UPB_INLINE char *envoy_config_core_v3_SubstitutionFormatString_serialize(const e typedef enum { envoy_config_core_v3_SubstitutionFormatString_format_text_format = 1, envoy_config_core_v3_SubstitutionFormatString_format_json_format = 2, + envoy_config_core_v3_SubstitutionFormatString_format_text_format_source = 5, envoy_config_core_v3_SubstitutionFormatString_format_NOT_SET = 0 } envoy_config_core_v3_SubstitutionFormatString_format_oneofcases; -UPB_INLINE envoy_config_core_v3_SubstitutionFormatString_format_oneofcases envoy_config_core_v3_SubstitutionFormatString_format_case(const envoy_config_core_v3_SubstitutionFormatString* msg) { return (envoy_config_core_v3_SubstitutionFormatString_format_oneofcases)*UPB_PTR_AT(msg, UPB_SIZE(20, 40), int32_t); } +UPB_INLINE envoy_config_core_v3_SubstitutionFormatString_format_oneofcases envoy_config_core_v3_SubstitutionFormatString_format_case(const envoy_config_core_v3_SubstitutionFormatString* msg) { return (envoy_config_core_v3_SubstitutionFormatString_format_oneofcases)*UPB_PTR_AT(msg, UPB_SIZE(24, 48), int32_t); } -UPB_INLINE bool envoy_config_core_v3_SubstitutionFormatString_has_text_format(const envoy_config_core_v3_SubstitutionFormatString *msg) { return _upb_getoneofcase(msg, UPB_SIZE(20, 40)) == 1; } -UPB_INLINE upb_strview envoy_config_core_v3_SubstitutionFormatString_text_format(const envoy_config_core_v3_SubstitutionFormatString *msg) { return UPB_READ_ONEOF(msg, upb_strview, UPB_SIZE(12, 24), UPB_SIZE(20, 40), 1, upb_strview_make("", strlen(""))); } -UPB_INLINE bool envoy_config_core_v3_SubstitutionFormatString_has_json_format(const envoy_config_core_v3_SubstitutionFormatString *msg) { return _upb_getoneofcase(msg, UPB_SIZE(20, 40)) == 2; } -UPB_INLINE const struct google_protobuf_Struct* envoy_config_core_v3_SubstitutionFormatString_json_format(const envoy_config_core_v3_SubstitutionFormatString *msg) { return UPB_READ_ONEOF(msg, const struct google_protobuf_Struct*, UPB_SIZE(12, 24), UPB_SIZE(20, 40), 2, NULL); } +UPB_INLINE bool envoy_config_core_v3_SubstitutionFormatString_has_text_format(const envoy_config_core_v3_SubstitutionFormatString *msg) { return _upb_getoneofcase(msg, UPB_SIZE(24, 48)) == 1; } +UPB_INLINE upb_strview envoy_config_core_v3_SubstitutionFormatString_text_format(const envoy_config_core_v3_SubstitutionFormatString *msg) { return UPB_READ_ONEOF(msg, upb_strview, UPB_SIZE(16, 32), UPB_SIZE(24, 48), 1, upb_strview_make("", strlen(""))); } +UPB_INLINE bool envoy_config_core_v3_SubstitutionFormatString_has_json_format(const envoy_config_core_v3_SubstitutionFormatString *msg) { return _upb_getoneofcase(msg, UPB_SIZE(24, 48)) == 2; } +UPB_INLINE const struct google_protobuf_Struct* envoy_config_core_v3_SubstitutionFormatString_json_format(const envoy_config_core_v3_SubstitutionFormatString *msg) { return UPB_READ_ONEOF(msg, const struct google_protobuf_Struct*, UPB_SIZE(16, 32), UPB_SIZE(24, 48), 2, NULL); } UPB_INLINE bool envoy_config_core_v3_SubstitutionFormatString_omit_empty_values(const envoy_config_core_v3_SubstitutionFormatString *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(0, 0), bool); } UPB_INLINE upb_strview envoy_config_core_v3_SubstitutionFormatString_content_type(const envoy_config_core_v3_SubstitutionFormatString *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview); } +UPB_INLINE bool envoy_config_core_v3_SubstitutionFormatString_has_text_format_source(const envoy_config_core_v3_SubstitutionFormatString *msg) { return _upb_getoneofcase(msg, UPB_SIZE(24, 48)) == 5; } +UPB_INLINE const struct envoy_config_core_v3_DataSource* envoy_config_core_v3_SubstitutionFormatString_text_format_source(const envoy_config_core_v3_SubstitutionFormatString *msg) { return UPB_READ_ONEOF(msg, const struct envoy_config_core_v3_DataSource*, UPB_SIZE(16, 32), UPB_SIZE(24, 48), 5, NULL); } +UPB_INLINE bool envoy_config_core_v3_SubstitutionFormatString_has_formatters(const envoy_config_core_v3_SubstitutionFormatString *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(12, 24)); } +UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* const* envoy_config_core_v3_SubstitutionFormatString_formatters(const envoy_config_core_v3_SubstitutionFormatString *msg, size_t *len) { return (const struct envoy_config_core_v3_TypedExtensionConfig* const*)_upb_array_accessor(msg, UPB_SIZE(12, 24), len); } UPB_INLINE void envoy_config_core_v3_SubstitutionFormatString_set_text_format(envoy_config_core_v3_SubstitutionFormatString *msg, upb_strview value) { - UPB_WRITE_ONEOF(msg, upb_strview, UPB_SIZE(12, 24), value, UPB_SIZE(20, 40), 1); + UPB_WRITE_ONEOF(msg, upb_strview, UPB_SIZE(16, 32), value, UPB_SIZE(24, 48), 1); } UPB_INLINE void envoy_config_core_v3_SubstitutionFormatString_set_json_format(envoy_config_core_v3_SubstitutionFormatString *msg, struct google_protobuf_Struct* value) { - UPB_WRITE_ONEOF(msg, struct google_protobuf_Struct*, UPB_SIZE(12, 24), value, UPB_SIZE(20, 40), 2); + UPB_WRITE_ONEOF(msg, struct google_protobuf_Struct*, UPB_SIZE(16, 32), value, UPB_SIZE(24, 48), 2); } UPB_INLINE struct google_protobuf_Struct* envoy_config_core_v3_SubstitutionFormatString_mutable_json_format(envoy_config_core_v3_SubstitutionFormatString *msg, upb_arena *arena) { struct google_protobuf_Struct* sub = (struct google_protobuf_Struct*)envoy_config_core_v3_SubstitutionFormatString_json_format(msg); @@ -82,6 +91,31 @@ UPB_INLINE void envoy_config_core_v3_SubstitutionFormatString_set_omit_empty_val UPB_INLINE void envoy_config_core_v3_SubstitutionFormatString_set_content_type(envoy_config_core_v3_SubstitutionFormatString *msg, upb_strview value) { *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview) = value; } +UPB_INLINE void envoy_config_core_v3_SubstitutionFormatString_set_text_format_source(envoy_config_core_v3_SubstitutionFormatString *msg, struct envoy_config_core_v3_DataSource* value) { + UPB_WRITE_ONEOF(msg, struct envoy_config_core_v3_DataSource*, UPB_SIZE(16, 32), value, UPB_SIZE(24, 48), 5); +} +UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_config_core_v3_SubstitutionFormatString_mutable_text_format_source(envoy_config_core_v3_SubstitutionFormatString *msg, upb_arena *arena) { + struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)envoy_config_core_v3_SubstitutionFormatString_text_format_source(msg); + if (sub == NULL) { + sub = (struct envoy_config_core_v3_DataSource*)_upb_msg_new(&envoy_config_core_v3_DataSource_msginit, arena); + if (!sub) return NULL; + envoy_config_core_v3_SubstitutionFormatString_set_text_format_source(msg, sub); + } + return sub; +} +UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig** envoy_config_core_v3_SubstitutionFormatString_mutable_formatters(envoy_config_core_v3_SubstitutionFormatString *msg, size_t *len) { + return (struct envoy_config_core_v3_TypedExtensionConfig**)_upb_array_mutable_accessor(msg, UPB_SIZE(12, 24), len); +} +UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig** envoy_config_core_v3_SubstitutionFormatString_resize_formatters(envoy_config_core_v3_SubstitutionFormatString *msg, size_t len, upb_arena *arena) { + return (struct envoy_config_core_v3_TypedExtensionConfig**)_upb_array_resize_accessor2(msg, UPB_SIZE(12, 24), len, UPB_SIZE(2, 3), arena); +} +UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_core_v3_SubstitutionFormatString_add_formatters(envoy_config_core_v3_SubstitutionFormatString *msg, upb_arena *arena) { + struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_msg_new(&envoy_config_core_v3_TypedExtensionConfig_msginit, arena); + bool ok = _upb_array_append_accessor2( + msg, UPB_SIZE(12, 24), UPB_SIZE(2, 3), &sub, arena); + if (!ok) return NULL; + return sub; +} #ifdef __cplusplus } /* extern "C" */ diff --git a/grpc/src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint.upb.c b/grpc/src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint.upb.c index b53f7260..3f9c789b 100644 --- a/grpc/src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint.upb.c +++ b/grpc/src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint.upb.c @@ -11,7 +11,6 @@ #include "envoy/config/endpoint/v3/endpoint.upb.h" #include "envoy/config/endpoint/v3/endpoint_components.upb.h" #include "envoy/type/v3/percent.upb.h" -#include "google/api/annotations.upb.h" #include "google/protobuf/duration.upb.h" #include "google/protobuf/wrappers.upb.h" #include "udpa/annotations/status.upb.h" diff --git a/grpc/src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.c b/grpc/src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.c index 6a8a8373..e7e0cad8 100644 --- a/grpc/src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.c +++ b/grpc/src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.c @@ -17,10 +17,9 @@ #include "envoy/config/listener/v3/api_listener.upb.h" #include "envoy/config/listener/v3/listener_components.upb.h" #include "envoy/config/listener/v3/udp_listener_config.upb.h" -#include "google/api/annotations.upb.h" #include "google/protobuf/duration.upb.h" #include "google/protobuf/wrappers.upb.h" -#include "udpa/core/v1/collection_entry.upb.h" +#include "xds/core/v3/collection_entry.upb.h" #include "udpa/annotations/security.upb.h" #include "udpa/annotations/status.upb.h" #include "udpa/annotations/versioning.upb.h" @@ -29,7 +28,7 @@ #include "upb/port_def.inc" static const upb_msglayout *const envoy_config_listener_v3_ListenerCollection_submsgs[1] = { - &udpa_core_v1_CollectionEntry_msginit, + &xds_core_v3_CollectionEntry_msginit, }; static const upb_msglayout_field envoy_config_listener_v3_ListenerCollection__fields[1] = { @@ -59,35 +58,38 @@ static const upb_msglayout *const envoy_config_listener_v3_Listener_submsgs[14] &google_protobuf_UInt32Value_msginit, }; -static const upb_msglayout_field envoy_config_listener_v3_Listener__fields[22] = { +static const upb_msglayout_field envoy_config_listener_v3_Listener__fields[25] = { {1, UPB_SIZE(16, 16), 0, 0, 9, 1}, {2, UPB_SIZE(24, 32), 1, 1, 11, 1}, - {3, UPB_SIZE(76, 136), 0, 6, 11, 3}, - {5, UPB_SIZE(28, 40), 2, 13, 11, 1}, - {6, UPB_SIZE(32, 48), 3, 2, 11, 1}, - {7, UPB_SIZE(36, 56), 4, 8, 11, 1}, + {3, UPB_SIZE(88, 160), 0, 6, 11, 3}, + {4, UPB_SIZE(28, 40), 2, 11, 11, 1}, + {5, UPB_SIZE(32, 48), 3, 13, 11, 1}, + {6, UPB_SIZE(36, 56), 4, 2, 11, 1}, + {7, UPB_SIZE(40, 64), 5, 8, 11, 1}, {8, UPB_SIZE(4, 4), 0, 0, 14, 1}, - {9, UPB_SIZE(80, 144), 0, 9, 11, 3}, - {10, UPB_SIZE(40, 64), 5, 11, 11, 1}, - {11, UPB_SIZE(44, 72), 6, 11, 11, 1}, - {12, UPB_SIZE(48, 80), 7, 13, 11, 1}, - {13, UPB_SIZE(84, 152), 0, 3, 11, 3}, - {15, UPB_SIZE(52, 88), 8, 12, 11, 1}, + {9, UPB_SIZE(92, 168), 0, 9, 11, 3}, + {10, UPB_SIZE(44, 72), 6, 11, 11, 1}, + {11, UPB_SIZE(48, 80), 7, 11, 11, 1}, + {12, UPB_SIZE(52, 88), 8, 13, 11, 1}, + {13, UPB_SIZE(96, 176), 0, 3, 11, 3}, + {15, UPB_SIZE(56, 96), 9, 12, 11, 1}, {16, UPB_SIZE(8, 8), 0, 0, 14, 1}, {17, UPB_SIZE(12, 12), 0, 0, 8, 1}, - {18, UPB_SIZE(56, 96), 9, 10, 11, 1}, - {19, UPB_SIZE(60, 104), 10, 5, 11, 1}, - {20, UPB_SIZE(64, 112), 11, 7, 11, 1}, + {18, UPB_SIZE(60, 104), 10, 10, 11, 1}, + {19, UPB_SIZE(64, 112), 11, 5, 11, 1}, + {20, UPB_SIZE(68, 120), 12, 7, 11, 1}, {21, UPB_SIZE(13, 13), 0, 0, 8, 1}, - {22, UPB_SIZE(88, 160), 0, 0, 11, 3}, - {23, UPB_SIZE(68, 120), 12, 4, 11, 1}, - {24, UPB_SIZE(72, 128), 13, 13, 11, 1}, + {22, UPB_SIZE(100, 184), 0, 0, 11, 3}, + {23, UPB_SIZE(72, 128), 13, 4, 11, 1}, + {24, UPB_SIZE(76, 136), 14, 13, 11, 1}, + {25, UPB_SIZE(80, 144), 15, 6, 11, 1}, + {26, UPB_SIZE(84, 152), 16, 11, 11, 1}, }; const upb_msglayout envoy_config_listener_v3_Listener_msginit = { &envoy_config_listener_v3_Listener_submsgs[0], &envoy_config_listener_v3_Listener__fields[0], - UPB_SIZE(96, 176), 22, false, 255, + UPB_SIZE(104, 192), 25, false, 255, }; static const upb_msglayout *const envoy_config_listener_v3_Listener_DeprecatedV1_submsgs[1] = { diff --git a/grpc/src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.h b/grpc/src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.h index 7f97584d..1d133733 100644 --- a/grpc/src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.h +++ b/grpc/src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.h @@ -47,7 +47,7 @@ struct envoy_config_listener_v3_UdpListenerConfig; struct google_protobuf_BoolValue; struct google_protobuf_Duration; struct google_protobuf_UInt32Value; -struct udpa_core_v1_CollectionEntry; +struct xds_core_v3_CollectionEntry; extern const upb_msglayout envoy_config_accesslog_v3_AccessLog_msginit; extern const upb_msglayout envoy_config_core_v3_Address_msginit; extern const upb_msglayout envoy_config_core_v3_Metadata_msginit; @@ -60,7 +60,7 @@ extern const upb_msglayout envoy_config_listener_v3_UdpListenerConfig_msginit; extern const upb_msglayout google_protobuf_BoolValue_msginit; extern const upb_msglayout google_protobuf_Duration_msginit; extern const upb_msglayout google_protobuf_UInt32Value_msginit; -extern const upb_msglayout udpa_core_v1_CollectionEntry_msginit; +extern const upb_msglayout xds_core_v3_CollectionEntry_msginit; typedef enum { envoy_config_listener_v3_Listener_DEFAULT = 0, @@ -89,16 +89,16 @@ UPB_INLINE char *envoy_config_listener_v3_ListenerCollection_serialize(const env } UPB_INLINE bool envoy_config_listener_v3_ListenerCollection_has_entries(const envoy_config_listener_v3_ListenerCollection *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(0, 0)); } -UPB_INLINE const struct udpa_core_v1_CollectionEntry* const* envoy_config_listener_v3_ListenerCollection_entries(const envoy_config_listener_v3_ListenerCollection *msg, size_t *len) { return (const struct udpa_core_v1_CollectionEntry* const*)_upb_array_accessor(msg, UPB_SIZE(0, 0), len); } +UPB_INLINE const struct xds_core_v3_CollectionEntry* const* envoy_config_listener_v3_ListenerCollection_entries(const envoy_config_listener_v3_ListenerCollection *msg, size_t *len) { return (const struct xds_core_v3_CollectionEntry* const*)_upb_array_accessor(msg, UPB_SIZE(0, 0), len); } -UPB_INLINE struct udpa_core_v1_CollectionEntry** envoy_config_listener_v3_ListenerCollection_mutable_entries(envoy_config_listener_v3_ListenerCollection *msg, size_t *len) { - return (struct udpa_core_v1_CollectionEntry**)_upb_array_mutable_accessor(msg, UPB_SIZE(0, 0), len); +UPB_INLINE struct xds_core_v3_CollectionEntry** envoy_config_listener_v3_ListenerCollection_mutable_entries(envoy_config_listener_v3_ListenerCollection *msg, size_t *len) { + return (struct xds_core_v3_CollectionEntry**)_upb_array_mutable_accessor(msg, UPB_SIZE(0, 0), len); } -UPB_INLINE struct udpa_core_v1_CollectionEntry** envoy_config_listener_v3_ListenerCollection_resize_entries(envoy_config_listener_v3_ListenerCollection *msg, size_t len, upb_arena *arena) { - return (struct udpa_core_v1_CollectionEntry**)_upb_array_resize_accessor2(msg, UPB_SIZE(0, 0), len, UPB_SIZE(2, 3), arena); +UPB_INLINE struct xds_core_v3_CollectionEntry** envoy_config_listener_v3_ListenerCollection_resize_entries(envoy_config_listener_v3_ListenerCollection *msg, size_t len, upb_arena *arena) { + return (struct xds_core_v3_CollectionEntry**)_upb_array_resize_accessor2(msg, UPB_SIZE(0, 0), len, UPB_SIZE(2, 3), arena); } -UPB_INLINE struct udpa_core_v1_CollectionEntry* envoy_config_listener_v3_ListenerCollection_add_entries(envoy_config_listener_v3_ListenerCollection *msg, upb_arena *arena) { - struct udpa_core_v1_CollectionEntry* sub = (struct udpa_core_v1_CollectionEntry*)_upb_msg_new(&udpa_core_v1_CollectionEntry_msginit, arena); +UPB_INLINE struct xds_core_v3_CollectionEntry* envoy_config_listener_v3_ListenerCollection_add_entries(envoy_config_listener_v3_ListenerCollection *msg, upb_arena *arena) { + struct xds_core_v3_CollectionEntry* sub = (struct xds_core_v3_CollectionEntry*)_upb_msg_new(&xds_core_v3_CollectionEntry_msginit, arena); bool ok = _upb_array_append_accessor2( msg, UPB_SIZE(0, 0), UPB_SIZE(2, 3), &sub, arena); if (!ok) return NULL; @@ -128,42 +128,48 @@ UPB_INLINE char *envoy_config_listener_v3_Listener_serialize(const envoy_config_ UPB_INLINE upb_strview envoy_config_listener_v3_Listener_name(const envoy_config_listener_v3_Listener *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(16, 16), upb_strview); } UPB_INLINE bool envoy_config_listener_v3_Listener_has_address(const envoy_config_listener_v3_Listener *msg) { return _upb_hasbit(msg, 1); } UPB_INLINE const struct envoy_config_core_v3_Address* envoy_config_listener_v3_Listener_address(const envoy_config_listener_v3_Listener *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(24, 32), const struct envoy_config_core_v3_Address*); } -UPB_INLINE bool envoy_config_listener_v3_Listener_has_filter_chains(const envoy_config_listener_v3_Listener *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(76, 136)); } -UPB_INLINE const struct envoy_config_listener_v3_FilterChain* const* envoy_config_listener_v3_Listener_filter_chains(const envoy_config_listener_v3_Listener *msg, size_t *len) { return (const struct envoy_config_listener_v3_FilterChain* const*)_upb_array_accessor(msg, UPB_SIZE(76, 136), len); } -UPB_INLINE bool envoy_config_listener_v3_Listener_has_per_connection_buffer_limit_bytes(const envoy_config_listener_v3_Listener *msg) { return _upb_hasbit(msg, 2); } -UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_listener_v3_Listener_per_connection_buffer_limit_bytes(const envoy_config_listener_v3_Listener *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(28, 40), const struct google_protobuf_UInt32Value*); } -UPB_INLINE bool envoy_config_listener_v3_Listener_has_metadata(const envoy_config_listener_v3_Listener *msg) { return _upb_hasbit(msg, 3); } -UPB_INLINE const struct envoy_config_core_v3_Metadata* envoy_config_listener_v3_Listener_metadata(const envoy_config_listener_v3_Listener *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(32, 48), const struct envoy_config_core_v3_Metadata*); } -UPB_INLINE bool envoy_config_listener_v3_Listener_has_deprecated_v1(const envoy_config_listener_v3_Listener *msg) { return _upb_hasbit(msg, 4); } -UPB_INLINE const envoy_config_listener_v3_Listener_DeprecatedV1* envoy_config_listener_v3_Listener_deprecated_v1(const envoy_config_listener_v3_Listener *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(36, 56), const envoy_config_listener_v3_Listener_DeprecatedV1*); } +UPB_INLINE bool envoy_config_listener_v3_Listener_has_filter_chains(const envoy_config_listener_v3_Listener *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(88, 160)); } +UPB_INLINE const struct envoy_config_listener_v3_FilterChain* const* envoy_config_listener_v3_Listener_filter_chains(const envoy_config_listener_v3_Listener *msg, size_t *len) { return (const struct envoy_config_listener_v3_FilterChain* const*)_upb_array_accessor(msg, UPB_SIZE(88, 160), len); } +UPB_INLINE bool envoy_config_listener_v3_Listener_has_use_original_dst(const envoy_config_listener_v3_Listener *msg) { return _upb_hasbit(msg, 2); } +UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_listener_v3_Listener_use_original_dst(const envoy_config_listener_v3_Listener *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(28, 40), const struct google_protobuf_BoolValue*); } +UPB_INLINE bool envoy_config_listener_v3_Listener_has_per_connection_buffer_limit_bytes(const envoy_config_listener_v3_Listener *msg) { return _upb_hasbit(msg, 3); } +UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_listener_v3_Listener_per_connection_buffer_limit_bytes(const envoy_config_listener_v3_Listener *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(32, 48), const struct google_protobuf_UInt32Value*); } +UPB_INLINE bool envoy_config_listener_v3_Listener_has_metadata(const envoy_config_listener_v3_Listener *msg) { return _upb_hasbit(msg, 4); } +UPB_INLINE const struct envoy_config_core_v3_Metadata* envoy_config_listener_v3_Listener_metadata(const envoy_config_listener_v3_Listener *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(36, 56), const struct envoy_config_core_v3_Metadata*); } +UPB_INLINE bool envoy_config_listener_v3_Listener_has_deprecated_v1(const envoy_config_listener_v3_Listener *msg) { return _upb_hasbit(msg, 5); } +UPB_INLINE const envoy_config_listener_v3_Listener_DeprecatedV1* envoy_config_listener_v3_Listener_deprecated_v1(const envoy_config_listener_v3_Listener *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(40, 64), const envoy_config_listener_v3_Listener_DeprecatedV1*); } UPB_INLINE int32_t envoy_config_listener_v3_Listener_drain_type(const envoy_config_listener_v3_Listener *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t); } -UPB_INLINE bool envoy_config_listener_v3_Listener_has_listener_filters(const envoy_config_listener_v3_Listener *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(80, 144)); } -UPB_INLINE const struct envoy_config_listener_v3_ListenerFilter* const* envoy_config_listener_v3_Listener_listener_filters(const envoy_config_listener_v3_Listener *msg, size_t *len) { return (const struct envoy_config_listener_v3_ListenerFilter* const*)_upb_array_accessor(msg, UPB_SIZE(80, 144), len); } -UPB_INLINE bool envoy_config_listener_v3_Listener_has_transparent(const envoy_config_listener_v3_Listener *msg) { return _upb_hasbit(msg, 5); } -UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_listener_v3_Listener_transparent(const envoy_config_listener_v3_Listener *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(40, 64), const struct google_protobuf_BoolValue*); } -UPB_INLINE bool envoy_config_listener_v3_Listener_has_freebind(const envoy_config_listener_v3_Listener *msg) { return _upb_hasbit(msg, 6); } -UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_listener_v3_Listener_freebind(const envoy_config_listener_v3_Listener *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(44, 72), const struct google_protobuf_BoolValue*); } -UPB_INLINE bool envoy_config_listener_v3_Listener_has_tcp_fast_open_queue_length(const envoy_config_listener_v3_Listener *msg) { return _upb_hasbit(msg, 7); } -UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_listener_v3_Listener_tcp_fast_open_queue_length(const envoy_config_listener_v3_Listener *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(48, 80), const struct google_protobuf_UInt32Value*); } -UPB_INLINE bool envoy_config_listener_v3_Listener_has_socket_options(const envoy_config_listener_v3_Listener *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(84, 152)); } -UPB_INLINE const struct envoy_config_core_v3_SocketOption* const* envoy_config_listener_v3_Listener_socket_options(const envoy_config_listener_v3_Listener *msg, size_t *len) { return (const struct envoy_config_core_v3_SocketOption* const*)_upb_array_accessor(msg, UPB_SIZE(84, 152), len); } -UPB_INLINE bool envoy_config_listener_v3_Listener_has_listener_filters_timeout(const envoy_config_listener_v3_Listener *msg) { return _upb_hasbit(msg, 8); } -UPB_INLINE const struct google_protobuf_Duration* envoy_config_listener_v3_Listener_listener_filters_timeout(const envoy_config_listener_v3_Listener *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(52, 88), const struct google_protobuf_Duration*); } +UPB_INLINE bool envoy_config_listener_v3_Listener_has_listener_filters(const envoy_config_listener_v3_Listener *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(92, 168)); } +UPB_INLINE const struct envoy_config_listener_v3_ListenerFilter* const* envoy_config_listener_v3_Listener_listener_filters(const envoy_config_listener_v3_Listener *msg, size_t *len) { return (const struct envoy_config_listener_v3_ListenerFilter* const*)_upb_array_accessor(msg, UPB_SIZE(92, 168), len); } +UPB_INLINE bool envoy_config_listener_v3_Listener_has_transparent(const envoy_config_listener_v3_Listener *msg) { return _upb_hasbit(msg, 6); } +UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_listener_v3_Listener_transparent(const envoy_config_listener_v3_Listener *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(44, 72), const struct google_protobuf_BoolValue*); } +UPB_INLINE bool envoy_config_listener_v3_Listener_has_freebind(const envoy_config_listener_v3_Listener *msg) { return _upb_hasbit(msg, 7); } +UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_listener_v3_Listener_freebind(const envoy_config_listener_v3_Listener *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(48, 80), const struct google_protobuf_BoolValue*); } +UPB_INLINE bool envoy_config_listener_v3_Listener_has_tcp_fast_open_queue_length(const envoy_config_listener_v3_Listener *msg) { return _upb_hasbit(msg, 8); } +UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_listener_v3_Listener_tcp_fast_open_queue_length(const envoy_config_listener_v3_Listener *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(52, 88), const struct google_protobuf_UInt32Value*); } +UPB_INLINE bool envoy_config_listener_v3_Listener_has_socket_options(const envoy_config_listener_v3_Listener *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(96, 176)); } +UPB_INLINE const struct envoy_config_core_v3_SocketOption* const* envoy_config_listener_v3_Listener_socket_options(const envoy_config_listener_v3_Listener *msg, size_t *len) { return (const struct envoy_config_core_v3_SocketOption* const*)_upb_array_accessor(msg, UPB_SIZE(96, 176), len); } +UPB_INLINE bool envoy_config_listener_v3_Listener_has_listener_filters_timeout(const envoy_config_listener_v3_Listener *msg) { return _upb_hasbit(msg, 9); } +UPB_INLINE const struct google_protobuf_Duration* envoy_config_listener_v3_Listener_listener_filters_timeout(const envoy_config_listener_v3_Listener *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(56, 96), const struct google_protobuf_Duration*); } UPB_INLINE int32_t envoy_config_listener_v3_Listener_traffic_direction(const envoy_config_listener_v3_Listener *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(8, 8), int32_t); } UPB_INLINE bool envoy_config_listener_v3_Listener_continue_on_listener_filters_timeout(const envoy_config_listener_v3_Listener *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(12, 12), bool); } -UPB_INLINE bool envoy_config_listener_v3_Listener_has_udp_listener_config(const envoy_config_listener_v3_Listener *msg) { return _upb_hasbit(msg, 9); } -UPB_INLINE const struct envoy_config_listener_v3_UdpListenerConfig* envoy_config_listener_v3_Listener_udp_listener_config(const envoy_config_listener_v3_Listener *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(56, 96), const struct envoy_config_listener_v3_UdpListenerConfig*); } -UPB_INLINE bool envoy_config_listener_v3_Listener_has_api_listener(const envoy_config_listener_v3_Listener *msg) { return _upb_hasbit(msg, 10); } -UPB_INLINE const struct envoy_config_listener_v3_ApiListener* envoy_config_listener_v3_Listener_api_listener(const envoy_config_listener_v3_Listener *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(60, 104), const struct envoy_config_listener_v3_ApiListener*); } -UPB_INLINE bool envoy_config_listener_v3_Listener_has_connection_balance_config(const envoy_config_listener_v3_Listener *msg) { return _upb_hasbit(msg, 11); } -UPB_INLINE const envoy_config_listener_v3_Listener_ConnectionBalanceConfig* envoy_config_listener_v3_Listener_connection_balance_config(const envoy_config_listener_v3_Listener *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(64, 112), const envoy_config_listener_v3_Listener_ConnectionBalanceConfig*); } +UPB_INLINE bool envoy_config_listener_v3_Listener_has_udp_listener_config(const envoy_config_listener_v3_Listener *msg) { return _upb_hasbit(msg, 10); } +UPB_INLINE const struct envoy_config_listener_v3_UdpListenerConfig* envoy_config_listener_v3_Listener_udp_listener_config(const envoy_config_listener_v3_Listener *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(60, 104), const struct envoy_config_listener_v3_UdpListenerConfig*); } +UPB_INLINE bool envoy_config_listener_v3_Listener_has_api_listener(const envoy_config_listener_v3_Listener *msg) { return _upb_hasbit(msg, 11); } +UPB_INLINE const struct envoy_config_listener_v3_ApiListener* envoy_config_listener_v3_Listener_api_listener(const envoy_config_listener_v3_Listener *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(64, 112), const struct envoy_config_listener_v3_ApiListener*); } +UPB_INLINE bool envoy_config_listener_v3_Listener_has_connection_balance_config(const envoy_config_listener_v3_Listener *msg) { return _upb_hasbit(msg, 12); } +UPB_INLINE const envoy_config_listener_v3_Listener_ConnectionBalanceConfig* envoy_config_listener_v3_Listener_connection_balance_config(const envoy_config_listener_v3_Listener *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(68, 120), const envoy_config_listener_v3_Listener_ConnectionBalanceConfig*); } UPB_INLINE bool envoy_config_listener_v3_Listener_reuse_port(const envoy_config_listener_v3_Listener *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(13, 13), bool); } -UPB_INLINE bool envoy_config_listener_v3_Listener_has_access_log(const envoy_config_listener_v3_Listener *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(88, 160)); } -UPB_INLINE const struct envoy_config_accesslog_v3_AccessLog* const* envoy_config_listener_v3_Listener_access_log(const envoy_config_listener_v3_Listener *msg, size_t *len) { return (const struct envoy_config_accesslog_v3_AccessLog* const*)_upb_array_accessor(msg, UPB_SIZE(88, 160), len); } -UPB_INLINE bool envoy_config_listener_v3_Listener_has_udp_writer_config(const envoy_config_listener_v3_Listener *msg) { return _upb_hasbit(msg, 12); } -UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_listener_v3_Listener_udp_writer_config(const envoy_config_listener_v3_Listener *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(68, 120), const struct envoy_config_core_v3_TypedExtensionConfig*); } -UPB_INLINE bool envoy_config_listener_v3_Listener_has_tcp_backlog_size(const envoy_config_listener_v3_Listener *msg) { return _upb_hasbit(msg, 13); } -UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_listener_v3_Listener_tcp_backlog_size(const envoy_config_listener_v3_Listener *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(72, 128), const struct google_protobuf_UInt32Value*); } +UPB_INLINE bool envoy_config_listener_v3_Listener_has_access_log(const envoy_config_listener_v3_Listener *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(100, 184)); } +UPB_INLINE const struct envoy_config_accesslog_v3_AccessLog* const* envoy_config_listener_v3_Listener_access_log(const envoy_config_listener_v3_Listener *msg, size_t *len) { return (const struct envoy_config_accesslog_v3_AccessLog* const*)_upb_array_accessor(msg, UPB_SIZE(100, 184), len); } +UPB_INLINE bool envoy_config_listener_v3_Listener_has_udp_writer_config(const envoy_config_listener_v3_Listener *msg) { return _upb_hasbit(msg, 13); } +UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_listener_v3_Listener_udp_writer_config(const envoy_config_listener_v3_Listener *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(72, 128), const struct envoy_config_core_v3_TypedExtensionConfig*); } +UPB_INLINE bool envoy_config_listener_v3_Listener_has_tcp_backlog_size(const envoy_config_listener_v3_Listener *msg) { return _upb_hasbit(msg, 14); } +UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_listener_v3_Listener_tcp_backlog_size(const envoy_config_listener_v3_Listener *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(76, 136), const struct google_protobuf_UInt32Value*); } +UPB_INLINE bool envoy_config_listener_v3_Listener_has_default_filter_chain(const envoy_config_listener_v3_Listener *msg) { return _upb_hasbit(msg, 15); } +UPB_INLINE const struct envoy_config_listener_v3_FilterChain* envoy_config_listener_v3_Listener_default_filter_chain(const envoy_config_listener_v3_Listener *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(80, 144), const struct envoy_config_listener_v3_FilterChain*); } +UPB_INLINE bool envoy_config_listener_v3_Listener_has_bind_to_port(const envoy_config_listener_v3_Listener *msg) { return _upb_hasbit(msg, 16); } +UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_listener_v3_Listener_bind_to_port(const envoy_config_listener_v3_Listener *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(84, 152), const struct google_protobuf_BoolValue*); } UPB_INLINE void envoy_config_listener_v3_Listener_set_name(envoy_config_listener_v3_Listener *msg, upb_strview value) { *UPB_PTR_AT(msg, UPB_SIZE(16, 16), upb_strview) = value; @@ -182,21 +188,34 @@ UPB_INLINE struct envoy_config_core_v3_Address* envoy_config_listener_v3_Listene return sub; } UPB_INLINE struct envoy_config_listener_v3_FilterChain** envoy_config_listener_v3_Listener_mutable_filter_chains(envoy_config_listener_v3_Listener *msg, size_t *len) { - return (struct envoy_config_listener_v3_FilterChain**)_upb_array_mutable_accessor(msg, UPB_SIZE(76, 136), len); + return (struct envoy_config_listener_v3_FilterChain**)_upb_array_mutable_accessor(msg, UPB_SIZE(88, 160), len); } UPB_INLINE struct envoy_config_listener_v3_FilterChain** envoy_config_listener_v3_Listener_resize_filter_chains(envoy_config_listener_v3_Listener *msg, size_t len, upb_arena *arena) { - return (struct envoy_config_listener_v3_FilterChain**)_upb_array_resize_accessor2(msg, UPB_SIZE(76, 136), len, UPB_SIZE(2, 3), arena); + return (struct envoy_config_listener_v3_FilterChain**)_upb_array_resize_accessor2(msg, UPB_SIZE(88, 160), len, UPB_SIZE(2, 3), arena); } UPB_INLINE struct envoy_config_listener_v3_FilterChain* envoy_config_listener_v3_Listener_add_filter_chains(envoy_config_listener_v3_Listener *msg, upb_arena *arena) { struct envoy_config_listener_v3_FilterChain* sub = (struct envoy_config_listener_v3_FilterChain*)_upb_msg_new(&envoy_config_listener_v3_FilterChain_msginit, arena); bool ok = _upb_array_append_accessor2( - msg, UPB_SIZE(76, 136), UPB_SIZE(2, 3), &sub, arena); + msg, UPB_SIZE(88, 160), UPB_SIZE(2, 3), &sub, arena); if (!ok) return NULL; return sub; } -UPB_INLINE void envoy_config_listener_v3_Listener_set_per_connection_buffer_limit_bytes(envoy_config_listener_v3_Listener *msg, struct google_protobuf_UInt32Value* value) { +UPB_INLINE void envoy_config_listener_v3_Listener_set_use_original_dst(envoy_config_listener_v3_Listener *msg, struct google_protobuf_BoolValue* value) { _upb_sethas(msg, 2); - *UPB_PTR_AT(msg, UPB_SIZE(28, 40), struct google_protobuf_UInt32Value*) = value; + *UPB_PTR_AT(msg, UPB_SIZE(28, 40), struct google_protobuf_BoolValue*) = value; +} +UPB_INLINE struct google_protobuf_BoolValue* envoy_config_listener_v3_Listener_mutable_use_original_dst(envoy_config_listener_v3_Listener *msg, upb_arena *arena) { + struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_listener_v3_Listener_use_original_dst(msg); + if (sub == NULL) { + sub = (struct google_protobuf_BoolValue*)_upb_msg_new(&google_protobuf_BoolValue_msginit, arena); + if (!sub) return NULL; + envoy_config_listener_v3_Listener_set_use_original_dst(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_config_listener_v3_Listener_set_per_connection_buffer_limit_bytes(envoy_config_listener_v3_Listener *msg, struct google_protobuf_UInt32Value* value) { + _upb_sethas(msg, 3); + *UPB_PTR_AT(msg, UPB_SIZE(32, 48), struct google_protobuf_UInt32Value*) = value; } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_listener_v3_Listener_mutable_per_connection_buffer_limit_bytes(envoy_config_listener_v3_Listener *msg, upb_arena *arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_listener_v3_Listener_per_connection_buffer_limit_bytes(msg); @@ -208,8 +227,8 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_listener_v3_Listener return sub; } UPB_INLINE void envoy_config_listener_v3_Listener_set_metadata(envoy_config_listener_v3_Listener *msg, struct envoy_config_core_v3_Metadata* value) { - _upb_sethas(msg, 3); - *UPB_PTR_AT(msg, UPB_SIZE(32, 48), struct envoy_config_core_v3_Metadata*) = value; + _upb_sethas(msg, 4); + *UPB_PTR_AT(msg, UPB_SIZE(36, 56), struct envoy_config_core_v3_Metadata*) = value; } UPB_INLINE struct envoy_config_core_v3_Metadata* envoy_config_listener_v3_Listener_mutable_metadata(envoy_config_listener_v3_Listener *msg, upb_arena *arena) { struct envoy_config_core_v3_Metadata* sub = (struct envoy_config_core_v3_Metadata*)envoy_config_listener_v3_Listener_metadata(msg); @@ -221,8 +240,8 @@ UPB_INLINE struct envoy_config_core_v3_Metadata* envoy_config_listener_v3_Listen return sub; } UPB_INLINE void envoy_config_listener_v3_Listener_set_deprecated_v1(envoy_config_listener_v3_Listener *msg, envoy_config_listener_v3_Listener_DeprecatedV1* value) { - _upb_sethas(msg, 4); - *UPB_PTR_AT(msg, UPB_SIZE(36, 56), envoy_config_listener_v3_Listener_DeprecatedV1*) = value; + _upb_sethas(msg, 5); + *UPB_PTR_AT(msg, UPB_SIZE(40, 64), envoy_config_listener_v3_Listener_DeprecatedV1*) = value; } UPB_INLINE struct envoy_config_listener_v3_Listener_DeprecatedV1* envoy_config_listener_v3_Listener_mutable_deprecated_v1(envoy_config_listener_v3_Listener *msg, upb_arena *arena) { struct envoy_config_listener_v3_Listener_DeprecatedV1* sub = (struct envoy_config_listener_v3_Listener_DeprecatedV1*)envoy_config_listener_v3_Listener_deprecated_v1(msg); @@ -237,21 +256,21 @@ UPB_INLINE void envoy_config_listener_v3_Listener_set_drain_type(envoy_config_li *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t) = value; } UPB_INLINE struct envoy_config_listener_v3_ListenerFilter** envoy_config_listener_v3_Listener_mutable_listener_filters(envoy_config_listener_v3_Listener *msg, size_t *len) { - return (struct envoy_config_listener_v3_ListenerFilter**)_upb_array_mutable_accessor(msg, UPB_SIZE(80, 144), len); + return (struct envoy_config_listener_v3_ListenerFilter**)_upb_array_mutable_accessor(msg, UPB_SIZE(92, 168), len); } UPB_INLINE struct envoy_config_listener_v3_ListenerFilter** envoy_config_listener_v3_Listener_resize_listener_filters(envoy_config_listener_v3_Listener *msg, size_t len, upb_arena *arena) { - return (struct envoy_config_listener_v3_ListenerFilter**)_upb_array_resize_accessor2(msg, UPB_SIZE(80, 144), len, UPB_SIZE(2, 3), arena); + return (struct envoy_config_listener_v3_ListenerFilter**)_upb_array_resize_accessor2(msg, UPB_SIZE(92, 168), len, UPB_SIZE(2, 3), arena); } UPB_INLINE struct envoy_config_listener_v3_ListenerFilter* envoy_config_listener_v3_Listener_add_listener_filters(envoy_config_listener_v3_Listener *msg, upb_arena *arena) { struct envoy_config_listener_v3_ListenerFilter* sub = (struct envoy_config_listener_v3_ListenerFilter*)_upb_msg_new(&envoy_config_listener_v3_ListenerFilter_msginit, arena); bool ok = _upb_array_append_accessor2( - msg, UPB_SIZE(80, 144), UPB_SIZE(2, 3), &sub, arena); + msg, UPB_SIZE(92, 168), UPB_SIZE(2, 3), &sub, arena); if (!ok) return NULL; return sub; } UPB_INLINE void envoy_config_listener_v3_Listener_set_transparent(envoy_config_listener_v3_Listener *msg, struct google_protobuf_BoolValue* value) { - _upb_sethas(msg, 5); - *UPB_PTR_AT(msg, UPB_SIZE(40, 64), struct google_protobuf_BoolValue*) = value; + _upb_sethas(msg, 6); + *UPB_PTR_AT(msg, UPB_SIZE(44, 72), struct google_protobuf_BoolValue*) = value; } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_listener_v3_Listener_mutable_transparent(envoy_config_listener_v3_Listener *msg, upb_arena *arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_listener_v3_Listener_transparent(msg); @@ -263,8 +282,8 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_listener_v3_Listener_m return sub; } UPB_INLINE void envoy_config_listener_v3_Listener_set_freebind(envoy_config_listener_v3_Listener *msg, struct google_protobuf_BoolValue* value) { - _upb_sethas(msg, 6); - *UPB_PTR_AT(msg, UPB_SIZE(44, 72), struct google_protobuf_BoolValue*) = value; + _upb_sethas(msg, 7); + *UPB_PTR_AT(msg, UPB_SIZE(48, 80), struct google_protobuf_BoolValue*) = value; } UPB_INLINE struct google_protobuf_BoolValue* envoy_config_listener_v3_Listener_mutable_freebind(envoy_config_listener_v3_Listener *msg, upb_arena *arena) { struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_listener_v3_Listener_freebind(msg); @@ -276,8 +295,8 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_listener_v3_Listener_m return sub; } UPB_INLINE void envoy_config_listener_v3_Listener_set_tcp_fast_open_queue_length(envoy_config_listener_v3_Listener *msg, struct google_protobuf_UInt32Value* value) { - _upb_sethas(msg, 7); - *UPB_PTR_AT(msg, UPB_SIZE(48, 80), struct google_protobuf_UInt32Value*) = value; + _upb_sethas(msg, 8); + *UPB_PTR_AT(msg, UPB_SIZE(52, 88), struct google_protobuf_UInt32Value*) = value; } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_listener_v3_Listener_mutable_tcp_fast_open_queue_length(envoy_config_listener_v3_Listener *msg, upb_arena *arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_listener_v3_Listener_tcp_fast_open_queue_length(msg); @@ -289,21 +308,21 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_listener_v3_Listener return sub; } UPB_INLINE struct envoy_config_core_v3_SocketOption** envoy_config_listener_v3_Listener_mutable_socket_options(envoy_config_listener_v3_Listener *msg, size_t *len) { - return (struct envoy_config_core_v3_SocketOption**)_upb_array_mutable_accessor(msg, UPB_SIZE(84, 152), len); + return (struct envoy_config_core_v3_SocketOption**)_upb_array_mutable_accessor(msg, UPB_SIZE(96, 176), len); } UPB_INLINE struct envoy_config_core_v3_SocketOption** envoy_config_listener_v3_Listener_resize_socket_options(envoy_config_listener_v3_Listener *msg, size_t len, upb_arena *arena) { - return (struct envoy_config_core_v3_SocketOption**)_upb_array_resize_accessor2(msg, UPB_SIZE(84, 152), len, UPB_SIZE(2, 3), arena); + return (struct envoy_config_core_v3_SocketOption**)_upb_array_resize_accessor2(msg, UPB_SIZE(96, 176), len, UPB_SIZE(2, 3), arena); } UPB_INLINE struct envoy_config_core_v3_SocketOption* envoy_config_listener_v3_Listener_add_socket_options(envoy_config_listener_v3_Listener *msg, upb_arena *arena) { struct envoy_config_core_v3_SocketOption* sub = (struct envoy_config_core_v3_SocketOption*)_upb_msg_new(&envoy_config_core_v3_SocketOption_msginit, arena); bool ok = _upb_array_append_accessor2( - msg, UPB_SIZE(84, 152), UPB_SIZE(2, 3), &sub, arena); + msg, UPB_SIZE(96, 176), UPB_SIZE(2, 3), &sub, arena); if (!ok) return NULL; return sub; } UPB_INLINE void envoy_config_listener_v3_Listener_set_listener_filters_timeout(envoy_config_listener_v3_Listener *msg, struct google_protobuf_Duration* value) { - _upb_sethas(msg, 8); - *UPB_PTR_AT(msg, UPB_SIZE(52, 88), struct google_protobuf_Duration*) = value; + _upb_sethas(msg, 9); + *UPB_PTR_AT(msg, UPB_SIZE(56, 96), struct google_protobuf_Duration*) = value; } UPB_INLINE struct google_protobuf_Duration* envoy_config_listener_v3_Listener_mutable_listener_filters_timeout(envoy_config_listener_v3_Listener *msg, upb_arena *arena) { struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_listener_v3_Listener_listener_filters_timeout(msg); @@ -321,8 +340,8 @@ UPB_INLINE void envoy_config_listener_v3_Listener_set_continue_on_listener_filte *UPB_PTR_AT(msg, UPB_SIZE(12, 12), bool) = value; } UPB_INLINE void envoy_config_listener_v3_Listener_set_udp_listener_config(envoy_config_listener_v3_Listener *msg, struct envoy_config_listener_v3_UdpListenerConfig* value) { - _upb_sethas(msg, 9); - *UPB_PTR_AT(msg, UPB_SIZE(56, 96), struct envoy_config_listener_v3_UdpListenerConfig*) = value; + _upb_sethas(msg, 10); + *UPB_PTR_AT(msg, UPB_SIZE(60, 104), struct envoy_config_listener_v3_UdpListenerConfig*) = value; } UPB_INLINE struct envoy_config_listener_v3_UdpListenerConfig* envoy_config_listener_v3_Listener_mutable_udp_listener_config(envoy_config_listener_v3_Listener *msg, upb_arena *arena) { struct envoy_config_listener_v3_UdpListenerConfig* sub = (struct envoy_config_listener_v3_UdpListenerConfig*)envoy_config_listener_v3_Listener_udp_listener_config(msg); @@ -334,8 +353,8 @@ UPB_INLINE struct envoy_config_listener_v3_UdpListenerConfig* envoy_config_liste return sub; } UPB_INLINE void envoy_config_listener_v3_Listener_set_api_listener(envoy_config_listener_v3_Listener *msg, struct envoy_config_listener_v3_ApiListener* value) { - _upb_sethas(msg, 10); - *UPB_PTR_AT(msg, UPB_SIZE(60, 104), struct envoy_config_listener_v3_ApiListener*) = value; + _upb_sethas(msg, 11); + *UPB_PTR_AT(msg, UPB_SIZE(64, 112), struct envoy_config_listener_v3_ApiListener*) = value; } UPB_INLINE struct envoy_config_listener_v3_ApiListener* envoy_config_listener_v3_Listener_mutable_api_listener(envoy_config_listener_v3_Listener *msg, upb_arena *arena) { struct envoy_config_listener_v3_ApiListener* sub = (struct envoy_config_listener_v3_ApiListener*)envoy_config_listener_v3_Listener_api_listener(msg); @@ -347,8 +366,8 @@ UPB_INLINE struct envoy_config_listener_v3_ApiListener* envoy_config_listener_v3 return sub; } UPB_INLINE void envoy_config_listener_v3_Listener_set_connection_balance_config(envoy_config_listener_v3_Listener *msg, envoy_config_listener_v3_Listener_ConnectionBalanceConfig* value) { - _upb_sethas(msg, 11); - *UPB_PTR_AT(msg, UPB_SIZE(64, 112), envoy_config_listener_v3_Listener_ConnectionBalanceConfig*) = value; + _upb_sethas(msg, 12); + *UPB_PTR_AT(msg, UPB_SIZE(68, 120), envoy_config_listener_v3_Listener_ConnectionBalanceConfig*) = value; } UPB_INLINE struct envoy_config_listener_v3_Listener_ConnectionBalanceConfig* envoy_config_listener_v3_Listener_mutable_connection_balance_config(envoy_config_listener_v3_Listener *msg, upb_arena *arena) { struct envoy_config_listener_v3_Listener_ConnectionBalanceConfig* sub = (struct envoy_config_listener_v3_Listener_ConnectionBalanceConfig*)envoy_config_listener_v3_Listener_connection_balance_config(msg); @@ -363,21 +382,21 @@ UPB_INLINE void envoy_config_listener_v3_Listener_set_reuse_port(envoy_config_li *UPB_PTR_AT(msg, UPB_SIZE(13, 13), bool) = value; } UPB_INLINE struct envoy_config_accesslog_v3_AccessLog** envoy_config_listener_v3_Listener_mutable_access_log(envoy_config_listener_v3_Listener *msg, size_t *len) { - return (struct envoy_config_accesslog_v3_AccessLog**)_upb_array_mutable_accessor(msg, UPB_SIZE(88, 160), len); + return (struct envoy_config_accesslog_v3_AccessLog**)_upb_array_mutable_accessor(msg, UPB_SIZE(100, 184), len); } UPB_INLINE struct envoy_config_accesslog_v3_AccessLog** envoy_config_listener_v3_Listener_resize_access_log(envoy_config_listener_v3_Listener *msg, size_t len, upb_arena *arena) { - return (struct envoy_config_accesslog_v3_AccessLog**)_upb_array_resize_accessor2(msg, UPB_SIZE(88, 160), len, UPB_SIZE(2, 3), arena); + return (struct envoy_config_accesslog_v3_AccessLog**)_upb_array_resize_accessor2(msg, UPB_SIZE(100, 184), len, UPB_SIZE(2, 3), arena); } UPB_INLINE struct envoy_config_accesslog_v3_AccessLog* envoy_config_listener_v3_Listener_add_access_log(envoy_config_listener_v3_Listener *msg, upb_arena *arena) { struct envoy_config_accesslog_v3_AccessLog* sub = (struct envoy_config_accesslog_v3_AccessLog*)_upb_msg_new(&envoy_config_accesslog_v3_AccessLog_msginit, arena); bool ok = _upb_array_append_accessor2( - msg, UPB_SIZE(88, 160), UPB_SIZE(2, 3), &sub, arena); + msg, UPB_SIZE(100, 184), UPB_SIZE(2, 3), &sub, arena); if (!ok) return NULL; return sub; } UPB_INLINE void envoy_config_listener_v3_Listener_set_udp_writer_config(envoy_config_listener_v3_Listener *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { - _upb_sethas(msg, 12); - *UPB_PTR_AT(msg, UPB_SIZE(68, 120), struct envoy_config_core_v3_TypedExtensionConfig*) = value; + _upb_sethas(msg, 13); + *UPB_PTR_AT(msg, UPB_SIZE(72, 128), struct envoy_config_core_v3_TypedExtensionConfig*) = value; } UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_listener_v3_Listener_mutable_udp_writer_config(envoy_config_listener_v3_Listener *msg, upb_arena *arena) { struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_listener_v3_Listener_udp_writer_config(msg); @@ -389,8 +408,8 @@ UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_listen return sub; } UPB_INLINE void envoy_config_listener_v3_Listener_set_tcp_backlog_size(envoy_config_listener_v3_Listener *msg, struct google_protobuf_UInt32Value* value) { - _upb_sethas(msg, 13); - *UPB_PTR_AT(msg, UPB_SIZE(72, 128), struct google_protobuf_UInt32Value*) = value; + _upb_sethas(msg, 14); + *UPB_PTR_AT(msg, UPB_SIZE(76, 136), struct google_protobuf_UInt32Value*) = value; } UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_listener_v3_Listener_mutable_tcp_backlog_size(envoy_config_listener_v3_Listener *msg, upb_arena *arena) { struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_listener_v3_Listener_tcp_backlog_size(msg); @@ -401,6 +420,32 @@ UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_listener_v3_Listener } return sub; } +UPB_INLINE void envoy_config_listener_v3_Listener_set_default_filter_chain(envoy_config_listener_v3_Listener *msg, struct envoy_config_listener_v3_FilterChain* value) { + _upb_sethas(msg, 15); + *UPB_PTR_AT(msg, UPB_SIZE(80, 144), struct envoy_config_listener_v3_FilterChain*) = value; +} +UPB_INLINE struct envoy_config_listener_v3_FilterChain* envoy_config_listener_v3_Listener_mutable_default_filter_chain(envoy_config_listener_v3_Listener *msg, upb_arena *arena) { + struct envoy_config_listener_v3_FilterChain* sub = (struct envoy_config_listener_v3_FilterChain*)envoy_config_listener_v3_Listener_default_filter_chain(msg); + if (sub == NULL) { + sub = (struct envoy_config_listener_v3_FilterChain*)_upb_msg_new(&envoy_config_listener_v3_FilterChain_msginit, arena); + if (!sub) return NULL; + envoy_config_listener_v3_Listener_set_default_filter_chain(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_config_listener_v3_Listener_set_bind_to_port(envoy_config_listener_v3_Listener *msg, struct google_protobuf_BoolValue* value) { + _upb_sethas(msg, 16); + *UPB_PTR_AT(msg, UPB_SIZE(84, 152), struct google_protobuf_BoolValue*) = value; +} +UPB_INLINE struct google_protobuf_BoolValue* envoy_config_listener_v3_Listener_mutable_bind_to_port(envoy_config_listener_v3_Listener *msg, upb_arena *arena) { + struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_listener_v3_Listener_bind_to_port(msg); + if (sub == NULL) { + sub = (struct google_protobuf_BoolValue*)_upb_msg_new(&google_protobuf_BoolValue_msginit, arena); + if (!sub) return NULL; + envoy_config_listener_v3_Listener_set_bind_to_port(msg, sub); + } + return sub; +} /* envoy.config.listener.v3.Listener.DeprecatedV1 */ diff --git a/grpc/src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.c b/grpc/src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.c index a3cc15e8..303b6ab7 100644 --- a/grpc/src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.c +++ b/grpc/src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.c @@ -11,10 +11,10 @@ #include "envoy/config/listener/v3/listener_components.upb.h" #include "envoy/config/core/v3/address.upb.h" #include "envoy/config/core/v3/base.upb.h" +#include "envoy/config/core/v3/extension.upb.h" #include "envoy/type/v3/range.upb.h" #include "google/protobuf/any.upb.h" #include "google/protobuf/duration.upb.h" -#include "google/protobuf/struct.upb.h" #include "google/protobuf/wrappers.upb.h" #include "udpa/annotations/status.upb.h" #include "udpa/annotations/versioning.upb.h" @@ -22,19 +22,21 @@ #include "upb/port_def.inc" -static const upb_msglayout *const envoy_config_listener_v3_Filter_submsgs[1] = { +static const upb_msglayout *const envoy_config_listener_v3_Filter_submsgs[2] = { + &envoy_config_core_v3_ExtensionConfigSource_msginit, &google_protobuf_Any_msginit, }; -static const upb_msglayout_field envoy_config_listener_v3_Filter__fields[2] = { +static const upb_msglayout_field envoy_config_listener_v3_Filter__fields[3] = { {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, - {4, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 11, 1}, + {4, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 1, 11, 1}, + {5, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 11, 1}, }; const upb_msglayout envoy_config_listener_v3_Filter_msginit = { &envoy_config_listener_v3_Filter_submsgs[0], &envoy_config_listener_v3_Filter__fields[0], - UPB_SIZE(16, 32), 2, false, 255, + UPB_SIZE(16, 32), 3, false, 255, }; static const upb_msglayout *const envoy_config_listener_v3_FilterChainMatch_submsgs[2] = { @@ -61,29 +63,31 @@ const upb_msglayout envoy_config_listener_v3_FilterChainMatch_msginit = { UPB_SIZE(56, 96), 10, false, 255, }; -static const upb_msglayout *const envoy_config_listener_v3_FilterChain_submsgs[6] = { +static const upb_msglayout *const envoy_config_listener_v3_FilterChain_submsgs[7] = { &envoy_config_core_v3_Metadata_msginit, &envoy_config_core_v3_TransportSocket_msginit, &envoy_config_listener_v3_Filter_msginit, &envoy_config_listener_v3_FilterChain_OnDemandConfiguration_msginit, &envoy_config_listener_v3_FilterChainMatch_msginit, &google_protobuf_BoolValue_msginit, + &google_protobuf_Duration_msginit, }; -static const upb_msglayout_field envoy_config_listener_v3_FilterChain__fields[7] = { +static const upb_msglayout_field envoy_config_listener_v3_FilterChain__fields[8] = { {1, UPB_SIZE(12, 24), 1, 4, 11, 1}, - {3, UPB_SIZE(32, 64), 0, 2, 11, 3}, + {3, UPB_SIZE(36, 72), 0, 2, 11, 3}, {4, UPB_SIZE(16, 32), 2, 5, 11, 1}, {5, UPB_SIZE(20, 40), 3, 0, 11, 1}, {6, UPB_SIZE(24, 48), 4, 1, 11, 1}, {7, UPB_SIZE(4, 8), 0, 0, 9, 1}, {8, UPB_SIZE(28, 56), 5, 3, 11, 1}, + {9, UPB_SIZE(32, 64), 6, 6, 11, 1}, }; const upb_msglayout envoy_config_listener_v3_FilterChain_msginit = { &envoy_config_listener_v3_FilterChain_submsgs[0], &envoy_config_listener_v3_FilterChain__fields[0], - UPB_SIZE(40, 80), 7, false, 255, + UPB_SIZE(40, 80), 8, false, 255, }; static const upb_msglayout *const envoy_config_listener_v3_FilterChain_OnDemandConfiguration_submsgs[1] = { diff --git a/grpc/src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.h b/grpc/src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.h index 6c2a503a..b8ef3826 100644 --- a/grpc/src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.h +++ b/grpc/src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.h @@ -42,6 +42,7 @@ extern const upb_msglayout envoy_config_listener_v3_ListenerFilterChainMatchPred extern const upb_msglayout envoy_config_listener_v3_ListenerFilterChainMatchPredicate_MatchSet_msginit; extern const upb_msglayout envoy_config_listener_v3_ListenerFilter_msginit; struct envoy_config_core_v3_CidrRange; +struct envoy_config_core_v3_ExtensionConfigSource; struct envoy_config_core_v3_Metadata; struct envoy_config_core_v3_TransportSocket; struct envoy_type_v3_Int32Range; @@ -50,6 +51,7 @@ struct google_protobuf_BoolValue; struct google_protobuf_Duration; struct google_protobuf_UInt32Value; extern const upb_msglayout envoy_config_core_v3_CidrRange_msginit; +extern const upb_msglayout envoy_config_core_v3_ExtensionConfigSource_msginit; extern const upb_msglayout envoy_config_core_v3_Metadata_msginit; extern const upb_msglayout envoy_config_core_v3_TransportSocket_msginit; extern const upb_msglayout envoy_type_v3_Int32Range_msginit; @@ -87,6 +89,7 @@ UPB_INLINE char *envoy_config_listener_v3_Filter_serialize(const envoy_config_li typedef enum { envoy_config_listener_v3_Filter_config_type_typed_config = 4, + envoy_config_listener_v3_Filter_config_type_config_discovery = 5, envoy_config_listener_v3_Filter_config_type_NOT_SET = 0 } envoy_config_listener_v3_Filter_config_type_oneofcases; UPB_INLINE envoy_config_listener_v3_Filter_config_type_oneofcases envoy_config_listener_v3_Filter_config_type_case(const envoy_config_listener_v3_Filter* msg) { return (envoy_config_listener_v3_Filter_config_type_oneofcases)*UPB_PTR_AT(msg, UPB_SIZE(12, 24), int32_t); } @@ -94,6 +97,8 @@ UPB_INLINE envoy_config_listener_v3_Filter_config_type_oneofcases envoy_config_l UPB_INLINE upb_strview envoy_config_listener_v3_Filter_name(const envoy_config_listener_v3_Filter *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(0, 0), upb_strview); } UPB_INLINE bool envoy_config_listener_v3_Filter_has_typed_config(const envoy_config_listener_v3_Filter *msg) { return _upb_getoneofcase(msg, UPB_SIZE(12, 24)) == 4; } UPB_INLINE const struct google_protobuf_Any* envoy_config_listener_v3_Filter_typed_config(const envoy_config_listener_v3_Filter *msg) { return UPB_READ_ONEOF(msg, const struct google_protobuf_Any*, UPB_SIZE(8, 16), UPB_SIZE(12, 24), 4, NULL); } +UPB_INLINE bool envoy_config_listener_v3_Filter_has_config_discovery(const envoy_config_listener_v3_Filter *msg) { return _upb_getoneofcase(msg, UPB_SIZE(12, 24)) == 5; } +UPB_INLINE const struct envoy_config_core_v3_ExtensionConfigSource* envoy_config_listener_v3_Filter_config_discovery(const envoy_config_listener_v3_Filter *msg) { return UPB_READ_ONEOF(msg, const struct envoy_config_core_v3_ExtensionConfigSource*, UPB_SIZE(8, 16), UPB_SIZE(12, 24), 5, NULL); } UPB_INLINE void envoy_config_listener_v3_Filter_set_name(envoy_config_listener_v3_Filter *msg, upb_strview value) { *UPB_PTR_AT(msg, UPB_SIZE(0, 0), upb_strview) = value; @@ -110,6 +115,18 @@ UPB_INLINE struct google_protobuf_Any* envoy_config_listener_v3_Filter_mutable_t } return sub; } +UPB_INLINE void envoy_config_listener_v3_Filter_set_config_discovery(envoy_config_listener_v3_Filter *msg, struct envoy_config_core_v3_ExtensionConfigSource* value) { + UPB_WRITE_ONEOF(msg, struct envoy_config_core_v3_ExtensionConfigSource*, UPB_SIZE(8, 16), value, UPB_SIZE(12, 24), 5); +} +UPB_INLINE struct envoy_config_core_v3_ExtensionConfigSource* envoy_config_listener_v3_Filter_mutable_config_discovery(envoy_config_listener_v3_Filter *msg, upb_arena *arena) { + struct envoy_config_core_v3_ExtensionConfigSource* sub = (struct envoy_config_core_v3_ExtensionConfigSource*)envoy_config_listener_v3_Filter_config_discovery(msg); + if (sub == NULL) { + sub = (struct envoy_config_core_v3_ExtensionConfigSource*)_upb_msg_new(&envoy_config_core_v3_ExtensionConfigSource_msginit, arena); + if (!sub) return NULL; + envoy_config_listener_v3_Filter_set_config_discovery(msg, sub); + } + return sub; +} /* envoy.config.listener.v3.FilterChainMatch */ @@ -260,8 +277,8 @@ UPB_INLINE char *envoy_config_listener_v3_FilterChain_serialize(const envoy_conf UPB_INLINE bool envoy_config_listener_v3_FilterChain_has_filter_chain_match(const envoy_config_listener_v3_FilterChain *msg) { return _upb_hasbit(msg, 1); } UPB_INLINE const envoy_config_listener_v3_FilterChainMatch* envoy_config_listener_v3_FilterChain_filter_chain_match(const envoy_config_listener_v3_FilterChain *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(12, 24), const envoy_config_listener_v3_FilterChainMatch*); } -UPB_INLINE bool envoy_config_listener_v3_FilterChain_has_filters(const envoy_config_listener_v3_FilterChain *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(32, 64)); } -UPB_INLINE const envoy_config_listener_v3_Filter* const* envoy_config_listener_v3_FilterChain_filters(const envoy_config_listener_v3_FilterChain *msg, size_t *len) { return (const envoy_config_listener_v3_Filter* const*)_upb_array_accessor(msg, UPB_SIZE(32, 64), len); } +UPB_INLINE bool envoy_config_listener_v3_FilterChain_has_filters(const envoy_config_listener_v3_FilterChain *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(36, 72)); } +UPB_INLINE const envoy_config_listener_v3_Filter* const* envoy_config_listener_v3_FilterChain_filters(const envoy_config_listener_v3_FilterChain *msg, size_t *len) { return (const envoy_config_listener_v3_Filter* const*)_upb_array_accessor(msg, UPB_SIZE(36, 72), len); } UPB_INLINE bool envoy_config_listener_v3_FilterChain_has_use_proxy_proto(const envoy_config_listener_v3_FilterChain *msg) { return _upb_hasbit(msg, 2); } UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_listener_v3_FilterChain_use_proxy_proto(const envoy_config_listener_v3_FilterChain *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(16, 32), const struct google_protobuf_BoolValue*); } UPB_INLINE bool envoy_config_listener_v3_FilterChain_has_metadata(const envoy_config_listener_v3_FilterChain *msg) { return _upb_hasbit(msg, 3); } @@ -271,6 +288,8 @@ UPB_INLINE const struct envoy_config_core_v3_TransportSocket* envoy_config_liste UPB_INLINE upb_strview envoy_config_listener_v3_FilterChain_name(const envoy_config_listener_v3_FilterChain *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview); } UPB_INLINE bool envoy_config_listener_v3_FilterChain_has_on_demand_configuration(const envoy_config_listener_v3_FilterChain *msg) { return _upb_hasbit(msg, 5); } UPB_INLINE const envoy_config_listener_v3_FilterChain_OnDemandConfiguration* envoy_config_listener_v3_FilterChain_on_demand_configuration(const envoy_config_listener_v3_FilterChain *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(28, 56), const envoy_config_listener_v3_FilterChain_OnDemandConfiguration*); } +UPB_INLINE bool envoy_config_listener_v3_FilterChain_has_transport_socket_connect_timeout(const envoy_config_listener_v3_FilterChain *msg) { return _upb_hasbit(msg, 6); } +UPB_INLINE const struct google_protobuf_Duration* envoy_config_listener_v3_FilterChain_transport_socket_connect_timeout(const envoy_config_listener_v3_FilterChain *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(32, 64), const struct google_protobuf_Duration*); } UPB_INLINE void envoy_config_listener_v3_FilterChain_set_filter_chain_match(envoy_config_listener_v3_FilterChain *msg, envoy_config_listener_v3_FilterChainMatch* value) { _upb_sethas(msg, 1); @@ -286,15 +305,15 @@ UPB_INLINE struct envoy_config_listener_v3_FilterChainMatch* envoy_config_listen return sub; } UPB_INLINE envoy_config_listener_v3_Filter** envoy_config_listener_v3_FilterChain_mutable_filters(envoy_config_listener_v3_FilterChain *msg, size_t *len) { - return (envoy_config_listener_v3_Filter**)_upb_array_mutable_accessor(msg, UPB_SIZE(32, 64), len); + return (envoy_config_listener_v3_Filter**)_upb_array_mutable_accessor(msg, UPB_SIZE(36, 72), len); } UPB_INLINE envoy_config_listener_v3_Filter** envoy_config_listener_v3_FilterChain_resize_filters(envoy_config_listener_v3_FilterChain *msg, size_t len, upb_arena *arena) { - return (envoy_config_listener_v3_Filter**)_upb_array_resize_accessor2(msg, UPB_SIZE(32, 64), len, UPB_SIZE(2, 3), arena); + return (envoy_config_listener_v3_Filter**)_upb_array_resize_accessor2(msg, UPB_SIZE(36, 72), len, UPB_SIZE(2, 3), arena); } UPB_INLINE struct envoy_config_listener_v3_Filter* envoy_config_listener_v3_FilterChain_add_filters(envoy_config_listener_v3_FilterChain *msg, upb_arena *arena) { struct envoy_config_listener_v3_Filter* sub = (struct envoy_config_listener_v3_Filter*)_upb_msg_new(&envoy_config_listener_v3_Filter_msginit, arena); bool ok = _upb_array_append_accessor2( - msg, UPB_SIZE(32, 64), UPB_SIZE(2, 3), &sub, arena); + msg, UPB_SIZE(36, 72), UPB_SIZE(2, 3), &sub, arena); if (!ok) return NULL; return sub; } @@ -353,6 +372,19 @@ UPB_INLINE struct envoy_config_listener_v3_FilterChain_OnDemandConfiguration* en } return sub; } +UPB_INLINE void envoy_config_listener_v3_FilterChain_set_transport_socket_connect_timeout(envoy_config_listener_v3_FilterChain *msg, struct google_protobuf_Duration* value) { + _upb_sethas(msg, 6); + *UPB_PTR_AT(msg, UPB_SIZE(32, 64), struct google_protobuf_Duration*) = value; +} +UPB_INLINE struct google_protobuf_Duration* envoy_config_listener_v3_FilterChain_mutable_transport_socket_connect_timeout(envoy_config_listener_v3_FilterChain *msg, upb_arena *arena) { + struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_listener_v3_FilterChain_transport_socket_connect_timeout(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Duration*)_upb_msg_new(&google_protobuf_Duration_msginit, arena); + if (!sub) return NULL; + envoy_config_listener_v3_FilterChain_set_transport_socket_connect_timeout(msg, sub); + } + return sub; +} /* envoy.config.listener.v3.FilterChain.OnDemandConfiguration */ diff --git a/grpc/src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.c b/grpc/src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.c index e13d3e44..34696f6c 100644 --- a/grpc/src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.c +++ b/grpc/src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.c @@ -10,7 +10,6 @@ #include "upb/msg.h" #include "envoy/config/listener/v3/udp_listener_config.upb.h" #include "google/protobuf/any.upb.h" -#include "google/protobuf/struct.upb.h" #include "udpa/annotations/status.upb.h" #include "udpa/annotations/versioning.upb.h" diff --git a/grpc/src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.c b/grpc/src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.c new file mode 100644 index 00000000..26d00f14 --- /dev/null +++ b/grpc/src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.c @@ -0,0 +1,144 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * envoy/config/metrics/v3/stats.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#include <stddef.h> +#include "upb/msg.h" +#include "envoy/config/metrics/v3/stats.upb.h" +#include "envoy/config/core/v3/address.upb.h" +#include "envoy/type/matcher/v3/string.upb.h" +#include "google/protobuf/any.upb.h" +#include "google/protobuf/wrappers.upb.h" +#include "udpa/annotations/status.upb.h" +#include "udpa/annotations/versioning.upb.h" +#include "validate/validate.upb.h" + +#include "upb/port_def.inc" + +static const upb_msglayout *const envoy_config_metrics_v3_StatsSink_submsgs[1] = { + &google_protobuf_Any_msginit, +}; + +static const upb_msglayout_field envoy_config_metrics_v3_StatsSink__fields[2] = { + {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, + {3, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 11, 1}, +}; + +const upb_msglayout envoy_config_metrics_v3_StatsSink_msginit = { + &envoy_config_metrics_v3_StatsSink_submsgs[0], + &envoy_config_metrics_v3_StatsSink__fields[0], + UPB_SIZE(16, 32), 2, false, 255, +}; + +static const upb_msglayout *const envoy_config_metrics_v3_StatsConfig_submsgs[4] = { + &envoy_config_metrics_v3_HistogramBucketSettings_msginit, + &envoy_config_metrics_v3_StatsMatcher_msginit, + &envoy_config_metrics_v3_TagSpecifier_msginit, + &google_protobuf_BoolValue_msginit, +}; + +static const upb_msglayout_field envoy_config_metrics_v3_StatsConfig__fields[4] = { + {1, UPB_SIZE(12, 24), 0, 2, 11, 3}, + {2, UPB_SIZE(4, 8), 1, 3, 11, 1}, + {3, UPB_SIZE(8, 16), 2, 1, 11, 1}, + {4, UPB_SIZE(16, 32), 0, 0, 11, 3}, +}; + +const upb_msglayout envoy_config_metrics_v3_StatsConfig_msginit = { + &envoy_config_metrics_v3_StatsConfig_submsgs[0], + &envoy_config_metrics_v3_StatsConfig__fields[0], + UPB_SIZE(24, 40), 4, false, 255, +}; + +static const upb_msglayout *const envoy_config_metrics_v3_StatsMatcher_submsgs[1] = { + &envoy_type_matcher_v3_ListStringMatcher_msginit, +}; + +static const upb_msglayout_field envoy_config_metrics_v3_StatsMatcher__fields[3] = { + {1, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 8, 1}, + {2, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 11, 1}, + {3, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 11, 1}, +}; + +const upb_msglayout envoy_config_metrics_v3_StatsMatcher_msginit = { + &envoy_config_metrics_v3_StatsMatcher_submsgs[0], + &envoy_config_metrics_v3_StatsMatcher__fields[0], + UPB_SIZE(8, 16), 3, false, 255, +}; + +static const upb_msglayout_field envoy_config_metrics_v3_TagSpecifier__fields[3] = { + {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, + {2, UPB_SIZE(8, 16), UPB_SIZE(-17, -33), 0, 9, 1}, + {3, UPB_SIZE(8, 16), UPB_SIZE(-17, -33), 0, 9, 1}, +}; + +const upb_msglayout envoy_config_metrics_v3_TagSpecifier_msginit = { + NULL, + &envoy_config_metrics_v3_TagSpecifier__fields[0], + UPB_SIZE(24, 48), 3, false, 255, +}; + +static const upb_msglayout *const envoy_config_metrics_v3_HistogramBucketSettings_submsgs[1] = { + &envoy_type_matcher_v3_StringMatcher_msginit, +}; + +static const upb_msglayout_field envoy_config_metrics_v3_HistogramBucketSettings__fields[2] = { + {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, + {2, UPB_SIZE(8, 16), 0, 0, 1, _UPB_LABEL_PACKED}, +}; + +const upb_msglayout envoy_config_metrics_v3_HistogramBucketSettings_msginit = { + &envoy_config_metrics_v3_HistogramBucketSettings_submsgs[0], + &envoy_config_metrics_v3_HistogramBucketSettings__fields[0], + UPB_SIZE(16, 24), 2, false, 255, +}; + +static const upb_msglayout *const envoy_config_metrics_v3_StatsdSink_submsgs[1] = { + &envoy_config_core_v3_Address_msginit, +}; + +static const upb_msglayout_field envoy_config_metrics_v3_StatsdSink__fields[3] = { + {1, UPB_SIZE(8, 16), UPB_SIZE(-17, -33), 0, 11, 1}, + {2, UPB_SIZE(8, 16), UPB_SIZE(-17, -33), 0, 9, 1}, + {3, UPB_SIZE(0, 0), 0, 0, 9, 1}, +}; + +const upb_msglayout envoy_config_metrics_v3_StatsdSink_msginit = { + &envoy_config_metrics_v3_StatsdSink_submsgs[0], + &envoy_config_metrics_v3_StatsdSink__fields[0], + UPB_SIZE(24, 48), 3, false, 255, +}; + +static const upb_msglayout *const envoy_config_metrics_v3_DogStatsdSink_submsgs[2] = { + &envoy_config_core_v3_Address_msginit, + &google_protobuf_UInt64Value_msginit, +}; + +static const upb_msglayout_field envoy_config_metrics_v3_DogStatsdSink__fields[3] = { + {1, UPB_SIZE(16, 32), UPB_SIZE(-21, -41), 0, 11, 1}, + {3, UPB_SIZE(4, 8), 0, 0, 9, 1}, + {4, UPB_SIZE(12, 24), 1, 1, 11, 1}, +}; + +const upb_msglayout envoy_config_metrics_v3_DogStatsdSink_msginit = { + &envoy_config_metrics_v3_DogStatsdSink_submsgs[0], + &envoy_config_metrics_v3_DogStatsdSink__fields[0], + UPB_SIZE(24, 48), 3, false, 255, +}; + +static const upb_msglayout_field envoy_config_metrics_v3_HystrixSink__fields[1] = { + {1, UPB_SIZE(0, 0), 0, 0, 3, 1}, +}; + +const upb_msglayout envoy_config_metrics_v3_HystrixSink_msginit = { + NULL, + &envoy_config_metrics_v3_HystrixSink__fields[0], + UPB_SIZE(8, 8), 1, false, 255, +}; + +#include "upb/port_undef.inc" + diff --git a/grpc/src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.h b/grpc/src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.h new file mode 100644 index 00000000..dab0415e --- /dev/null +++ b/grpc/src/core/ext/upb-generated/envoy/config/metrics/v3/stats.upb.h @@ -0,0 +1,488 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * envoy/config/metrics/v3/stats.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#ifndef ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPB_H_ +#define ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPB_H_ + +#include "upb/msg.h" +#include "upb/decode.h" +#include "upb/decode_fast.h" +#include "upb/encode.h" + +#include "upb/port_def.inc" + +#ifdef __cplusplus +extern "C" { +#endif + +struct envoy_config_metrics_v3_StatsSink; +struct envoy_config_metrics_v3_StatsConfig; +struct envoy_config_metrics_v3_StatsMatcher; +struct envoy_config_metrics_v3_TagSpecifier; +struct envoy_config_metrics_v3_HistogramBucketSettings; +struct envoy_config_metrics_v3_StatsdSink; +struct envoy_config_metrics_v3_DogStatsdSink; +struct envoy_config_metrics_v3_HystrixSink; +typedef struct envoy_config_metrics_v3_StatsSink envoy_config_metrics_v3_StatsSink; +typedef struct envoy_config_metrics_v3_StatsConfig envoy_config_metrics_v3_StatsConfig; +typedef struct envoy_config_metrics_v3_StatsMatcher envoy_config_metrics_v3_StatsMatcher; +typedef struct envoy_config_metrics_v3_TagSpecifier envoy_config_metrics_v3_TagSpecifier; +typedef struct envoy_config_metrics_v3_HistogramBucketSettings envoy_config_metrics_v3_HistogramBucketSettings; +typedef struct envoy_config_metrics_v3_StatsdSink envoy_config_metrics_v3_StatsdSink; +typedef struct envoy_config_metrics_v3_DogStatsdSink envoy_config_metrics_v3_DogStatsdSink; +typedef struct envoy_config_metrics_v3_HystrixSink envoy_config_metrics_v3_HystrixSink; +extern const upb_msglayout envoy_config_metrics_v3_StatsSink_msginit; +extern const upb_msglayout envoy_config_metrics_v3_StatsConfig_msginit; +extern const upb_msglayout envoy_config_metrics_v3_StatsMatcher_msginit; +extern const upb_msglayout envoy_config_metrics_v3_TagSpecifier_msginit; +extern const upb_msglayout envoy_config_metrics_v3_HistogramBucketSettings_msginit; +extern const upb_msglayout envoy_config_metrics_v3_StatsdSink_msginit; +extern const upb_msglayout envoy_config_metrics_v3_DogStatsdSink_msginit; +extern const upb_msglayout envoy_config_metrics_v3_HystrixSink_msginit; +struct envoy_config_core_v3_Address; +struct envoy_type_matcher_v3_ListStringMatcher; +struct envoy_type_matcher_v3_StringMatcher; +struct google_protobuf_Any; +struct google_protobuf_BoolValue; +struct google_protobuf_UInt64Value; +extern const upb_msglayout envoy_config_core_v3_Address_msginit; +extern const upb_msglayout envoy_type_matcher_v3_ListStringMatcher_msginit; +extern const upb_msglayout envoy_type_matcher_v3_StringMatcher_msginit; +extern const upb_msglayout google_protobuf_Any_msginit; +extern const upb_msglayout google_protobuf_BoolValue_msginit; +extern const upb_msglayout google_protobuf_UInt64Value_msginit; + + +/* envoy.config.metrics.v3.StatsSink */ + +UPB_INLINE envoy_config_metrics_v3_StatsSink *envoy_config_metrics_v3_StatsSink_new(upb_arena *arena) { + return (envoy_config_metrics_v3_StatsSink *)_upb_msg_new(&envoy_config_metrics_v3_StatsSink_msginit, arena); +} +UPB_INLINE envoy_config_metrics_v3_StatsSink *envoy_config_metrics_v3_StatsSink_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_config_metrics_v3_StatsSink *ret = envoy_config_metrics_v3_StatsSink_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_config_metrics_v3_StatsSink_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_config_metrics_v3_StatsSink *envoy_config_metrics_v3_StatsSink_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_config_metrics_v3_StatsSink *ret = envoy_config_metrics_v3_StatsSink_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_config_metrics_v3_StatsSink_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_config_metrics_v3_StatsSink_serialize(const envoy_config_metrics_v3_StatsSink *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_config_metrics_v3_StatsSink_msginit, arena, len); +} + +typedef enum { + envoy_config_metrics_v3_StatsSink_config_type_typed_config = 3, + envoy_config_metrics_v3_StatsSink_config_type_NOT_SET = 0 +} envoy_config_metrics_v3_StatsSink_config_type_oneofcases; +UPB_INLINE envoy_config_metrics_v3_StatsSink_config_type_oneofcases envoy_config_metrics_v3_StatsSink_config_type_case(const envoy_config_metrics_v3_StatsSink* msg) { return (envoy_config_metrics_v3_StatsSink_config_type_oneofcases)*UPB_PTR_AT(msg, UPB_SIZE(12, 24), int32_t); } + +UPB_INLINE upb_strview envoy_config_metrics_v3_StatsSink_name(const envoy_config_metrics_v3_StatsSink *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(0, 0), upb_strview); } +UPB_INLINE bool envoy_config_metrics_v3_StatsSink_has_typed_config(const envoy_config_metrics_v3_StatsSink *msg) { return _upb_getoneofcase(msg, UPB_SIZE(12, 24)) == 3; } +UPB_INLINE const struct google_protobuf_Any* envoy_config_metrics_v3_StatsSink_typed_config(const envoy_config_metrics_v3_StatsSink *msg) { return UPB_READ_ONEOF(msg, const struct google_protobuf_Any*, UPB_SIZE(8, 16), UPB_SIZE(12, 24), 3, NULL); } + +UPB_INLINE void envoy_config_metrics_v3_StatsSink_set_name(envoy_config_metrics_v3_StatsSink *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(0, 0), upb_strview) = value; +} +UPB_INLINE void envoy_config_metrics_v3_StatsSink_set_typed_config(envoy_config_metrics_v3_StatsSink *msg, struct google_protobuf_Any* value) { + UPB_WRITE_ONEOF(msg, struct google_protobuf_Any*, UPB_SIZE(8, 16), value, UPB_SIZE(12, 24), 3); +} +UPB_INLINE struct google_protobuf_Any* envoy_config_metrics_v3_StatsSink_mutable_typed_config(envoy_config_metrics_v3_StatsSink *msg, upb_arena *arena) { + struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_metrics_v3_StatsSink_typed_config(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Any*)_upb_msg_new(&google_protobuf_Any_msginit, arena); + if (!sub) return NULL; + envoy_config_metrics_v3_StatsSink_set_typed_config(msg, sub); + } + return sub; +} + +/* envoy.config.metrics.v3.StatsConfig */ + +UPB_INLINE envoy_config_metrics_v3_StatsConfig *envoy_config_metrics_v3_StatsConfig_new(upb_arena *arena) { + return (envoy_config_metrics_v3_StatsConfig *)_upb_msg_new(&envoy_config_metrics_v3_StatsConfig_msginit, arena); +} +UPB_INLINE envoy_config_metrics_v3_StatsConfig *envoy_config_metrics_v3_StatsConfig_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_config_metrics_v3_StatsConfig *ret = envoy_config_metrics_v3_StatsConfig_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_config_metrics_v3_StatsConfig_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_config_metrics_v3_StatsConfig *envoy_config_metrics_v3_StatsConfig_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_config_metrics_v3_StatsConfig *ret = envoy_config_metrics_v3_StatsConfig_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_config_metrics_v3_StatsConfig_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_config_metrics_v3_StatsConfig_serialize(const envoy_config_metrics_v3_StatsConfig *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_config_metrics_v3_StatsConfig_msginit, arena, len); +} + +UPB_INLINE bool envoy_config_metrics_v3_StatsConfig_has_stats_tags(const envoy_config_metrics_v3_StatsConfig *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(12, 24)); } +UPB_INLINE const envoy_config_metrics_v3_TagSpecifier* const* envoy_config_metrics_v3_StatsConfig_stats_tags(const envoy_config_metrics_v3_StatsConfig *msg, size_t *len) { return (const envoy_config_metrics_v3_TagSpecifier* const*)_upb_array_accessor(msg, UPB_SIZE(12, 24), len); } +UPB_INLINE bool envoy_config_metrics_v3_StatsConfig_has_use_all_default_tags(const envoy_config_metrics_v3_StatsConfig *msg) { return _upb_hasbit(msg, 1); } +UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_metrics_v3_StatsConfig_use_all_default_tags(const envoy_config_metrics_v3_StatsConfig *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), const struct google_protobuf_BoolValue*); } +UPB_INLINE bool envoy_config_metrics_v3_StatsConfig_has_stats_matcher(const envoy_config_metrics_v3_StatsConfig *msg) { return _upb_hasbit(msg, 2); } +UPB_INLINE const envoy_config_metrics_v3_StatsMatcher* envoy_config_metrics_v3_StatsConfig_stats_matcher(const envoy_config_metrics_v3_StatsConfig *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(8, 16), const envoy_config_metrics_v3_StatsMatcher*); } +UPB_INLINE bool envoy_config_metrics_v3_StatsConfig_has_histogram_bucket_settings(const envoy_config_metrics_v3_StatsConfig *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(16, 32)); } +UPB_INLINE const envoy_config_metrics_v3_HistogramBucketSettings* const* envoy_config_metrics_v3_StatsConfig_histogram_bucket_settings(const envoy_config_metrics_v3_StatsConfig *msg, size_t *len) { return (const envoy_config_metrics_v3_HistogramBucketSettings* const*)_upb_array_accessor(msg, UPB_SIZE(16, 32), len); } + +UPB_INLINE envoy_config_metrics_v3_TagSpecifier** envoy_config_metrics_v3_StatsConfig_mutable_stats_tags(envoy_config_metrics_v3_StatsConfig *msg, size_t *len) { + return (envoy_config_metrics_v3_TagSpecifier**)_upb_array_mutable_accessor(msg, UPB_SIZE(12, 24), len); +} +UPB_INLINE envoy_config_metrics_v3_TagSpecifier** envoy_config_metrics_v3_StatsConfig_resize_stats_tags(envoy_config_metrics_v3_StatsConfig *msg, size_t len, upb_arena *arena) { + return (envoy_config_metrics_v3_TagSpecifier**)_upb_array_resize_accessor2(msg, UPB_SIZE(12, 24), len, UPB_SIZE(2, 3), arena); +} +UPB_INLINE struct envoy_config_metrics_v3_TagSpecifier* envoy_config_metrics_v3_StatsConfig_add_stats_tags(envoy_config_metrics_v3_StatsConfig *msg, upb_arena *arena) { + struct envoy_config_metrics_v3_TagSpecifier* sub = (struct envoy_config_metrics_v3_TagSpecifier*)_upb_msg_new(&envoy_config_metrics_v3_TagSpecifier_msginit, arena); + bool ok = _upb_array_append_accessor2( + msg, UPB_SIZE(12, 24), UPB_SIZE(2, 3), &sub, arena); + if (!ok) return NULL; + return sub; +} +UPB_INLINE void envoy_config_metrics_v3_StatsConfig_set_use_all_default_tags(envoy_config_metrics_v3_StatsConfig *msg, struct google_protobuf_BoolValue* value) { + _upb_sethas(msg, 1); + *UPB_PTR_AT(msg, UPB_SIZE(4, 8), struct google_protobuf_BoolValue*) = value; +} +UPB_INLINE struct google_protobuf_BoolValue* envoy_config_metrics_v3_StatsConfig_mutable_use_all_default_tags(envoy_config_metrics_v3_StatsConfig *msg, upb_arena *arena) { + struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_config_metrics_v3_StatsConfig_use_all_default_tags(msg); + if (sub == NULL) { + sub = (struct google_protobuf_BoolValue*)_upb_msg_new(&google_protobuf_BoolValue_msginit, arena); + if (!sub) return NULL; + envoy_config_metrics_v3_StatsConfig_set_use_all_default_tags(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_config_metrics_v3_StatsConfig_set_stats_matcher(envoy_config_metrics_v3_StatsConfig *msg, envoy_config_metrics_v3_StatsMatcher* value) { + _upb_sethas(msg, 2); + *UPB_PTR_AT(msg, UPB_SIZE(8, 16), envoy_config_metrics_v3_StatsMatcher*) = value; +} +UPB_INLINE struct envoy_config_metrics_v3_StatsMatcher* envoy_config_metrics_v3_StatsConfig_mutable_stats_matcher(envoy_config_metrics_v3_StatsConfig *msg, upb_arena *arena) { + struct envoy_config_metrics_v3_StatsMatcher* sub = (struct envoy_config_metrics_v3_StatsMatcher*)envoy_config_metrics_v3_StatsConfig_stats_matcher(msg); + if (sub == NULL) { + sub = (struct envoy_config_metrics_v3_StatsMatcher*)_upb_msg_new(&envoy_config_metrics_v3_StatsMatcher_msginit, arena); + if (!sub) return NULL; + envoy_config_metrics_v3_StatsConfig_set_stats_matcher(msg, sub); + } + return sub; +} +UPB_INLINE envoy_config_metrics_v3_HistogramBucketSettings** envoy_config_metrics_v3_StatsConfig_mutable_histogram_bucket_settings(envoy_config_metrics_v3_StatsConfig *msg, size_t *len) { + return (envoy_config_metrics_v3_HistogramBucketSettings**)_upb_array_mutable_accessor(msg, UPB_SIZE(16, 32), len); +} +UPB_INLINE envoy_config_metrics_v3_HistogramBucketSettings** envoy_config_metrics_v3_StatsConfig_resize_histogram_bucket_settings(envoy_config_metrics_v3_StatsConfig *msg, size_t len, upb_arena *arena) { + return (envoy_config_metrics_v3_HistogramBucketSettings**)_upb_array_resize_accessor2(msg, UPB_SIZE(16, 32), len, UPB_SIZE(2, 3), arena); +} +UPB_INLINE struct envoy_config_metrics_v3_HistogramBucketSettings* envoy_config_metrics_v3_StatsConfig_add_histogram_bucket_settings(envoy_config_metrics_v3_StatsConfig *msg, upb_arena *arena) { + struct envoy_config_metrics_v3_HistogramBucketSettings* sub = (struct envoy_config_metrics_v3_HistogramBucketSettings*)_upb_msg_new(&envoy_config_metrics_v3_HistogramBucketSettings_msginit, arena); + bool ok = _upb_array_append_accessor2( + msg, UPB_SIZE(16, 32), UPB_SIZE(2, 3), &sub, arena); + if (!ok) return NULL; + return sub; +} + +/* envoy.config.metrics.v3.StatsMatcher */ + +UPB_INLINE envoy_config_metrics_v3_StatsMatcher *envoy_config_metrics_v3_StatsMatcher_new(upb_arena *arena) { + return (envoy_config_metrics_v3_StatsMatcher *)_upb_msg_new(&envoy_config_metrics_v3_StatsMatcher_msginit, arena); +} +UPB_INLINE envoy_config_metrics_v3_StatsMatcher *envoy_config_metrics_v3_StatsMatcher_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_config_metrics_v3_StatsMatcher *ret = envoy_config_metrics_v3_StatsMatcher_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_config_metrics_v3_StatsMatcher_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_config_metrics_v3_StatsMatcher *envoy_config_metrics_v3_StatsMatcher_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_config_metrics_v3_StatsMatcher *ret = envoy_config_metrics_v3_StatsMatcher_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_config_metrics_v3_StatsMatcher_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_config_metrics_v3_StatsMatcher_serialize(const envoy_config_metrics_v3_StatsMatcher *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_config_metrics_v3_StatsMatcher_msginit, arena, len); +} + +typedef enum { + envoy_config_metrics_v3_StatsMatcher_stats_matcher_reject_all = 1, + envoy_config_metrics_v3_StatsMatcher_stats_matcher_exclusion_list = 2, + envoy_config_metrics_v3_StatsMatcher_stats_matcher_inclusion_list = 3, + envoy_config_metrics_v3_StatsMatcher_stats_matcher_NOT_SET = 0 +} envoy_config_metrics_v3_StatsMatcher_stats_matcher_oneofcases; +UPB_INLINE envoy_config_metrics_v3_StatsMatcher_stats_matcher_oneofcases envoy_config_metrics_v3_StatsMatcher_stats_matcher_case(const envoy_config_metrics_v3_StatsMatcher* msg) { return (envoy_config_metrics_v3_StatsMatcher_stats_matcher_oneofcases)*UPB_PTR_AT(msg, UPB_SIZE(4, 8), int32_t); } + +UPB_INLINE bool envoy_config_metrics_v3_StatsMatcher_has_reject_all(const envoy_config_metrics_v3_StatsMatcher *msg) { return _upb_getoneofcase(msg, UPB_SIZE(4, 8)) == 1; } +UPB_INLINE bool envoy_config_metrics_v3_StatsMatcher_reject_all(const envoy_config_metrics_v3_StatsMatcher *msg) { return UPB_READ_ONEOF(msg, bool, UPB_SIZE(0, 0), UPB_SIZE(4, 8), 1, false); } +UPB_INLINE bool envoy_config_metrics_v3_StatsMatcher_has_exclusion_list(const envoy_config_metrics_v3_StatsMatcher *msg) { return _upb_getoneofcase(msg, UPB_SIZE(4, 8)) == 2; } +UPB_INLINE const struct envoy_type_matcher_v3_ListStringMatcher* envoy_config_metrics_v3_StatsMatcher_exclusion_list(const envoy_config_metrics_v3_StatsMatcher *msg) { return UPB_READ_ONEOF(msg, const struct envoy_type_matcher_v3_ListStringMatcher*, UPB_SIZE(0, 0), UPB_SIZE(4, 8), 2, NULL); } +UPB_INLINE bool envoy_config_metrics_v3_StatsMatcher_has_inclusion_list(const envoy_config_metrics_v3_StatsMatcher *msg) { return _upb_getoneofcase(msg, UPB_SIZE(4, 8)) == 3; } +UPB_INLINE const struct envoy_type_matcher_v3_ListStringMatcher* envoy_config_metrics_v3_StatsMatcher_inclusion_list(const envoy_config_metrics_v3_StatsMatcher *msg) { return UPB_READ_ONEOF(msg, const struct envoy_type_matcher_v3_ListStringMatcher*, UPB_SIZE(0, 0), UPB_SIZE(4, 8), 3, NULL); } + +UPB_INLINE void envoy_config_metrics_v3_StatsMatcher_set_reject_all(envoy_config_metrics_v3_StatsMatcher *msg, bool value) { + UPB_WRITE_ONEOF(msg, bool, UPB_SIZE(0, 0), value, UPB_SIZE(4, 8), 1); +} +UPB_INLINE void envoy_config_metrics_v3_StatsMatcher_set_exclusion_list(envoy_config_metrics_v3_StatsMatcher *msg, struct envoy_type_matcher_v3_ListStringMatcher* value) { + UPB_WRITE_ONEOF(msg, struct envoy_type_matcher_v3_ListStringMatcher*, UPB_SIZE(0, 0), value, UPB_SIZE(4, 8), 2); +} +UPB_INLINE struct envoy_type_matcher_v3_ListStringMatcher* envoy_config_metrics_v3_StatsMatcher_mutable_exclusion_list(envoy_config_metrics_v3_StatsMatcher *msg, upb_arena *arena) { + struct envoy_type_matcher_v3_ListStringMatcher* sub = (struct envoy_type_matcher_v3_ListStringMatcher*)envoy_config_metrics_v3_StatsMatcher_exclusion_list(msg); + if (sub == NULL) { + sub = (struct envoy_type_matcher_v3_ListStringMatcher*)_upb_msg_new(&envoy_type_matcher_v3_ListStringMatcher_msginit, arena); + if (!sub) return NULL; + envoy_config_metrics_v3_StatsMatcher_set_exclusion_list(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_config_metrics_v3_StatsMatcher_set_inclusion_list(envoy_config_metrics_v3_StatsMatcher *msg, struct envoy_type_matcher_v3_ListStringMatcher* value) { + UPB_WRITE_ONEOF(msg, struct envoy_type_matcher_v3_ListStringMatcher*, UPB_SIZE(0, 0), value, UPB_SIZE(4, 8), 3); +} +UPB_INLINE struct envoy_type_matcher_v3_ListStringMatcher* envoy_config_metrics_v3_StatsMatcher_mutable_inclusion_list(envoy_config_metrics_v3_StatsMatcher *msg, upb_arena *arena) { + struct envoy_type_matcher_v3_ListStringMatcher* sub = (struct envoy_type_matcher_v3_ListStringMatcher*)envoy_config_metrics_v3_StatsMatcher_inclusion_list(msg); + if (sub == NULL) { + sub = (struct envoy_type_matcher_v3_ListStringMatcher*)_upb_msg_new(&envoy_type_matcher_v3_ListStringMatcher_msginit, arena); + if (!sub) return NULL; + envoy_config_metrics_v3_StatsMatcher_set_inclusion_list(msg, sub); + } + return sub; +} + +/* envoy.config.metrics.v3.TagSpecifier */ + +UPB_INLINE envoy_config_metrics_v3_TagSpecifier *envoy_config_metrics_v3_TagSpecifier_new(upb_arena *arena) { + return (envoy_config_metrics_v3_TagSpecifier *)_upb_msg_new(&envoy_config_metrics_v3_TagSpecifier_msginit, arena); +} +UPB_INLINE envoy_config_metrics_v3_TagSpecifier *envoy_config_metrics_v3_TagSpecifier_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_config_metrics_v3_TagSpecifier *ret = envoy_config_metrics_v3_TagSpecifier_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_config_metrics_v3_TagSpecifier_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_config_metrics_v3_TagSpecifier *envoy_config_metrics_v3_TagSpecifier_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_config_metrics_v3_TagSpecifier *ret = envoy_config_metrics_v3_TagSpecifier_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_config_metrics_v3_TagSpecifier_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_config_metrics_v3_TagSpecifier_serialize(const envoy_config_metrics_v3_TagSpecifier *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_config_metrics_v3_TagSpecifier_msginit, arena, len); +} + +typedef enum { + envoy_config_metrics_v3_TagSpecifier_tag_value_regex = 2, + envoy_config_metrics_v3_TagSpecifier_tag_value_fixed_value = 3, + envoy_config_metrics_v3_TagSpecifier_tag_value_NOT_SET = 0 +} envoy_config_metrics_v3_TagSpecifier_tag_value_oneofcases; +UPB_INLINE envoy_config_metrics_v3_TagSpecifier_tag_value_oneofcases envoy_config_metrics_v3_TagSpecifier_tag_value_case(const envoy_config_metrics_v3_TagSpecifier* msg) { return (envoy_config_metrics_v3_TagSpecifier_tag_value_oneofcases)*UPB_PTR_AT(msg, UPB_SIZE(16, 32), int32_t); } + +UPB_INLINE upb_strview envoy_config_metrics_v3_TagSpecifier_tag_name(const envoy_config_metrics_v3_TagSpecifier *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(0, 0), upb_strview); } +UPB_INLINE bool envoy_config_metrics_v3_TagSpecifier_has_regex(const envoy_config_metrics_v3_TagSpecifier *msg) { return _upb_getoneofcase(msg, UPB_SIZE(16, 32)) == 2; } +UPB_INLINE upb_strview envoy_config_metrics_v3_TagSpecifier_regex(const envoy_config_metrics_v3_TagSpecifier *msg) { return UPB_READ_ONEOF(msg, upb_strview, UPB_SIZE(8, 16), UPB_SIZE(16, 32), 2, upb_strview_make("", strlen(""))); } +UPB_INLINE bool envoy_config_metrics_v3_TagSpecifier_has_fixed_value(const envoy_config_metrics_v3_TagSpecifier *msg) { return _upb_getoneofcase(msg, UPB_SIZE(16, 32)) == 3; } +UPB_INLINE upb_strview envoy_config_metrics_v3_TagSpecifier_fixed_value(const envoy_config_metrics_v3_TagSpecifier *msg) { return UPB_READ_ONEOF(msg, upb_strview, UPB_SIZE(8, 16), UPB_SIZE(16, 32), 3, upb_strview_make("", strlen(""))); } + +UPB_INLINE void envoy_config_metrics_v3_TagSpecifier_set_tag_name(envoy_config_metrics_v3_TagSpecifier *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(0, 0), upb_strview) = value; +} +UPB_INLINE void envoy_config_metrics_v3_TagSpecifier_set_regex(envoy_config_metrics_v3_TagSpecifier *msg, upb_strview value) { + UPB_WRITE_ONEOF(msg, upb_strview, UPB_SIZE(8, 16), value, UPB_SIZE(16, 32), 2); +} +UPB_INLINE void envoy_config_metrics_v3_TagSpecifier_set_fixed_value(envoy_config_metrics_v3_TagSpecifier *msg, upb_strview value) { + UPB_WRITE_ONEOF(msg, upb_strview, UPB_SIZE(8, 16), value, UPB_SIZE(16, 32), 3); +} + +/* envoy.config.metrics.v3.HistogramBucketSettings */ + +UPB_INLINE envoy_config_metrics_v3_HistogramBucketSettings *envoy_config_metrics_v3_HistogramBucketSettings_new(upb_arena *arena) { + return (envoy_config_metrics_v3_HistogramBucketSettings *)_upb_msg_new(&envoy_config_metrics_v3_HistogramBucketSettings_msginit, arena); +} +UPB_INLINE envoy_config_metrics_v3_HistogramBucketSettings *envoy_config_metrics_v3_HistogramBucketSettings_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_config_metrics_v3_HistogramBucketSettings *ret = envoy_config_metrics_v3_HistogramBucketSettings_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_config_metrics_v3_HistogramBucketSettings_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_config_metrics_v3_HistogramBucketSettings *envoy_config_metrics_v3_HistogramBucketSettings_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_config_metrics_v3_HistogramBucketSettings *ret = envoy_config_metrics_v3_HistogramBucketSettings_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_config_metrics_v3_HistogramBucketSettings_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_config_metrics_v3_HistogramBucketSettings_serialize(const envoy_config_metrics_v3_HistogramBucketSettings *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_config_metrics_v3_HistogramBucketSettings_msginit, arena, len); +} + +UPB_INLINE bool envoy_config_metrics_v3_HistogramBucketSettings_has_match(const envoy_config_metrics_v3_HistogramBucketSettings *msg) { return _upb_hasbit(msg, 1); } +UPB_INLINE const struct envoy_type_matcher_v3_StringMatcher* envoy_config_metrics_v3_HistogramBucketSettings_match(const envoy_config_metrics_v3_HistogramBucketSettings *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), const struct envoy_type_matcher_v3_StringMatcher*); } +UPB_INLINE double const* envoy_config_metrics_v3_HistogramBucketSettings_buckets(const envoy_config_metrics_v3_HistogramBucketSettings *msg, size_t *len) { return (double const*)_upb_array_accessor(msg, UPB_SIZE(8, 16), len); } + +UPB_INLINE void envoy_config_metrics_v3_HistogramBucketSettings_set_match(envoy_config_metrics_v3_HistogramBucketSettings *msg, struct envoy_type_matcher_v3_StringMatcher* value) { + _upb_sethas(msg, 1); + *UPB_PTR_AT(msg, UPB_SIZE(4, 8), struct envoy_type_matcher_v3_StringMatcher*) = value; +} +UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_config_metrics_v3_HistogramBucketSettings_mutable_match(envoy_config_metrics_v3_HistogramBucketSettings *msg, upb_arena *arena) { + struct envoy_type_matcher_v3_StringMatcher* sub = (struct envoy_type_matcher_v3_StringMatcher*)envoy_config_metrics_v3_HistogramBucketSettings_match(msg); + if (sub == NULL) { + sub = (struct envoy_type_matcher_v3_StringMatcher*)_upb_msg_new(&envoy_type_matcher_v3_StringMatcher_msginit, arena); + if (!sub) return NULL; + envoy_config_metrics_v3_HistogramBucketSettings_set_match(msg, sub); + } + return sub; +} +UPB_INLINE double* envoy_config_metrics_v3_HistogramBucketSettings_mutable_buckets(envoy_config_metrics_v3_HistogramBucketSettings *msg, size_t *len) { + return (double*)_upb_array_mutable_accessor(msg, UPB_SIZE(8, 16), len); +} +UPB_INLINE double* envoy_config_metrics_v3_HistogramBucketSettings_resize_buckets(envoy_config_metrics_v3_HistogramBucketSettings *msg, size_t len, upb_arena *arena) { + return (double*)_upb_array_resize_accessor2(msg, UPB_SIZE(8, 16), len, 3, arena); +} +UPB_INLINE bool envoy_config_metrics_v3_HistogramBucketSettings_add_buckets(envoy_config_metrics_v3_HistogramBucketSettings *msg, double val, upb_arena *arena) { + return _upb_array_append_accessor2(msg, UPB_SIZE(8, 16), 3, &val, + arena); +} + +/* envoy.config.metrics.v3.StatsdSink */ + +UPB_INLINE envoy_config_metrics_v3_StatsdSink *envoy_config_metrics_v3_StatsdSink_new(upb_arena *arena) { + return (envoy_config_metrics_v3_StatsdSink *)_upb_msg_new(&envoy_config_metrics_v3_StatsdSink_msginit, arena); +} +UPB_INLINE envoy_config_metrics_v3_StatsdSink *envoy_config_metrics_v3_StatsdSink_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_config_metrics_v3_StatsdSink *ret = envoy_config_metrics_v3_StatsdSink_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_config_metrics_v3_StatsdSink_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_config_metrics_v3_StatsdSink *envoy_config_metrics_v3_StatsdSink_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_config_metrics_v3_StatsdSink *ret = envoy_config_metrics_v3_StatsdSink_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_config_metrics_v3_StatsdSink_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_config_metrics_v3_StatsdSink_serialize(const envoy_config_metrics_v3_StatsdSink *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_config_metrics_v3_StatsdSink_msginit, arena, len); +} + +typedef enum { + envoy_config_metrics_v3_StatsdSink_statsd_specifier_address = 1, + envoy_config_metrics_v3_StatsdSink_statsd_specifier_tcp_cluster_name = 2, + envoy_config_metrics_v3_StatsdSink_statsd_specifier_NOT_SET = 0 +} envoy_config_metrics_v3_StatsdSink_statsd_specifier_oneofcases; +UPB_INLINE envoy_config_metrics_v3_StatsdSink_statsd_specifier_oneofcases envoy_config_metrics_v3_StatsdSink_statsd_specifier_case(const envoy_config_metrics_v3_StatsdSink* msg) { return (envoy_config_metrics_v3_StatsdSink_statsd_specifier_oneofcases)*UPB_PTR_AT(msg, UPB_SIZE(16, 32), int32_t); } + +UPB_INLINE bool envoy_config_metrics_v3_StatsdSink_has_address(const envoy_config_metrics_v3_StatsdSink *msg) { return _upb_getoneofcase(msg, UPB_SIZE(16, 32)) == 1; } +UPB_INLINE const struct envoy_config_core_v3_Address* envoy_config_metrics_v3_StatsdSink_address(const envoy_config_metrics_v3_StatsdSink *msg) { return UPB_READ_ONEOF(msg, const struct envoy_config_core_v3_Address*, UPB_SIZE(8, 16), UPB_SIZE(16, 32), 1, NULL); } +UPB_INLINE bool envoy_config_metrics_v3_StatsdSink_has_tcp_cluster_name(const envoy_config_metrics_v3_StatsdSink *msg) { return _upb_getoneofcase(msg, UPB_SIZE(16, 32)) == 2; } +UPB_INLINE upb_strview envoy_config_metrics_v3_StatsdSink_tcp_cluster_name(const envoy_config_metrics_v3_StatsdSink *msg) { return UPB_READ_ONEOF(msg, upb_strview, UPB_SIZE(8, 16), UPB_SIZE(16, 32), 2, upb_strview_make("", strlen(""))); } +UPB_INLINE upb_strview envoy_config_metrics_v3_StatsdSink_prefix(const envoy_config_metrics_v3_StatsdSink *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(0, 0), upb_strview); } + +UPB_INLINE void envoy_config_metrics_v3_StatsdSink_set_address(envoy_config_metrics_v3_StatsdSink *msg, struct envoy_config_core_v3_Address* value) { + UPB_WRITE_ONEOF(msg, struct envoy_config_core_v3_Address*, UPB_SIZE(8, 16), value, UPB_SIZE(16, 32), 1); +} +UPB_INLINE struct envoy_config_core_v3_Address* envoy_config_metrics_v3_StatsdSink_mutable_address(envoy_config_metrics_v3_StatsdSink *msg, upb_arena *arena) { + struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)envoy_config_metrics_v3_StatsdSink_address(msg); + if (sub == NULL) { + sub = (struct envoy_config_core_v3_Address*)_upb_msg_new(&envoy_config_core_v3_Address_msginit, arena); + if (!sub) return NULL; + envoy_config_metrics_v3_StatsdSink_set_address(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_config_metrics_v3_StatsdSink_set_tcp_cluster_name(envoy_config_metrics_v3_StatsdSink *msg, upb_strview value) { + UPB_WRITE_ONEOF(msg, upb_strview, UPB_SIZE(8, 16), value, UPB_SIZE(16, 32), 2); +} +UPB_INLINE void envoy_config_metrics_v3_StatsdSink_set_prefix(envoy_config_metrics_v3_StatsdSink *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(0, 0), upb_strview) = value; +} + +/* envoy.config.metrics.v3.DogStatsdSink */ + +UPB_INLINE envoy_config_metrics_v3_DogStatsdSink *envoy_config_metrics_v3_DogStatsdSink_new(upb_arena *arena) { + return (envoy_config_metrics_v3_DogStatsdSink *)_upb_msg_new(&envoy_config_metrics_v3_DogStatsdSink_msginit, arena); +} +UPB_INLINE envoy_config_metrics_v3_DogStatsdSink *envoy_config_metrics_v3_DogStatsdSink_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_config_metrics_v3_DogStatsdSink *ret = envoy_config_metrics_v3_DogStatsdSink_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_config_metrics_v3_DogStatsdSink_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_config_metrics_v3_DogStatsdSink *envoy_config_metrics_v3_DogStatsdSink_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_config_metrics_v3_DogStatsdSink *ret = envoy_config_metrics_v3_DogStatsdSink_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_config_metrics_v3_DogStatsdSink_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_config_metrics_v3_DogStatsdSink_serialize(const envoy_config_metrics_v3_DogStatsdSink *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_config_metrics_v3_DogStatsdSink_msginit, arena, len); +} + +typedef enum { + envoy_config_metrics_v3_DogStatsdSink_dog_statsd_specifier_address = 1, + envoy_config_metrics_v3_DogStatsdSink_dog_statsd_specifier_NOT_SET = 0 +} envoy_config_metrics_v3_DogStatsdSink_dog_statsd_specifier_oneofcases; +UPB_INLINE envoy_config_metrics_v3_DogStatsdSink_dog_statsd_specifier_oneofcases envoy_config_metrics_v3_DogStatsdSink_dog_statsd_specifier_case(const envoy_config_metrics_v3_DogStatsdSink* msg) { return (envoy_config_metrics_v3_DogStatsdSink_dog_statsd_specifier_oneofcases)*UPB_PTR_AT(msg, UPB_SIZE(20, 40), int32_t); } + +UPB_INLINE bool envoy_config_metrics_v3_DogStatsdSink_has_address(const envoy_config_metrics_v3_DogStatsdSink *msg) { return _upb_getoneofcase(msg, UPB_SIZE(20, 40)) == 1; } +UPB_INLINE const struct envoy_config_core_v3_Address* envoy_config_metrics_v3_DogStatsdSink_address(const envoy_config_metrics_v3_DogStatsdSink *msg) { return UPB_READ_ONEOF(msg, const struct envoy_config_core_v3_Address*, UPB_SIZE(16, 32), UPB_SIZE(20, 40), 1, NULL); } +UPB_INLINE upb_strview envoy_config_metrics_v3_DogStatsdSink_prefix(const envoy_config_metrics_v3_DogStatsdSink *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview); } +UPB_INLINE bool envoy_config_metrics_v3_DogStatsdSink_has_max_bytes_per_datagram(const envoy_config_metrics_v3_DogStatsdSink *msg) { return _upb_hasbit(msg, 1); } +UPB_INLINE const struct google_protobuf_UInt64Value* envoy_config_metrics_v3_DogStatsdSink_max_bytes_per_datagram(const envoy_config_metrics_v3_DogStatsdSink *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(12, 24), const struct google_protobuf_UInt64Value*); } + +UPB_INLINE void envoy_config_metrics_v3_DogStatsdSink_set_address(envoy_config_metrics_v3_DogStatsdSink *msg, struct envoy_config_core_v3_Address* value) { + UPB_WRITE_ONEOF(msg, struct envoy_config_core_v3_Address*, UPB_SIZE(16, 32), value, UPB_SIZE(20, 40), 1); +} +UPB_INLINE struct envoy_config_core_v3_Address* envoy_config_metrics_v3_DogStatsdSink_mutable_address(envoy_config_metrics_v3_DogStatsdSink *msg, upb_arena *arena) { + struct envoy_config_core_v3_Address* sub = (struct envoy_config_core_v3_Address*)envoy_config_metrics_v3_DogStatsdSink_address(msg); + if (sub == NULL) { + sub = (struct envoy_config_core_v3_Address*)_upb_msg_new(&envoy_config_core_v3_Address_msginit, arena); + if (!sub) return NULL; + envoy_config_metrics_v3_DogStatsdSink_set_address(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_config_metrics_v3_DogStatsdSink_set_prefix(envoy_config_metrics_v3_DogStatsdSink *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview) = value; +} +UPB_INLINE void envoy_config_metrics_v3_DogStatsdSink_set_max_bytes_per_datagram(envoy_config_metrics_v3_DogStatsdSink *msg, struct google_protobuf_UInt64Value* value) { + _upb_sethas(msg, 1); + *UPB_PTR_AT(msg, UPB_SIZE(12, 24), struct google_protobuf_UInt64Value*) = value; +} +UPB_INLINE struct google_protobuf_UInt64Value* envoy_config_metrics_v3_DogStatsdSink_mutable_max_bytes_per_datagram(envoy_config_metrics_v3_DogStatsdSink *msg, upb_arena *arena) { + struct google_protobuf_UInt64Value* sub = (struct google_protobuf_UInt64Value*)envoy_config_metrics_v3_DogStatsdSink_max_bytes_per_datagram(msg); + if (sub == NULL) { + sub = (struct google_protobuf_UInt64Value*)_upb_msg_new(&google_protobuf_UInt64Value_msginit, arena); + if (!sub) return NULL; + envoy_config_metrics_v3_DogStatsdSink_set_max_bytes_per_datagram(msg, sub); + } + return sub; +} + +/* envoy.config.metrics.v3.HystrixSink */ + +UPB_INLINE envoy_config_metrics_v3_HystrixSink *envoy_config_metrics_v3_HystrixSink_new(upb_arena *arena) { + return (envoy_config_metrics_v3_HystrixSink *)_upb_msg_new(&envoy_config_metrics_v3_HystrixSink_msginit, arena); +} +UPB_INLINE envoy_config_metrics_v3_HystrixSink *envoy_config_metrics_v3_HystrixSink_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_config_metrics_v3_HystrixSink *ret = envoy_config_metrics_v3_HystrixSink_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_config_metrics_v3_HystrixSink_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_config_metrics_v3_HystrixSink *envoy_config_metrics_v3_HystrixSink_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_config_metrics_v3_HystrixSink *ret = envoy_config_metrics_v3_HystrixSink_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_config_metrics_v3_HystrixSink_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_config_metrics_v3_HystrixSink_serialize(const envoy_config_metrics_v3_HystrixSink *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_config_metrics_v3_HystrixSink_msginit, arena, len); +} + +UPB_INLINE int64_t envoy_config_metrics_v3_HystrixSink_num_buckets(const envoy_config_metrics_v3_HystrixSink *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(0, 0), int64_t); } + +UPB_INLINE void envoy_config_metrics_v3_HystrixSink_set_num_buckets(envoy_config_metrics_v3_HystrixSink *msg, int64_t value) { + *UPB_PTR_AT(msg, UPB_SIZE(0, 0), int64_t) = value; +} + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#include "upb/port_undef.inc" + +#endif /* ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPB_H_ */ diff --git a/grpc/src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.c b/grpc/src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.c new file mode 100644 index 00000000..a306e71e --- /dev/null +++ b/grpc/src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.c @@ -0,0 +1,141 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * envoy/config/overload/v3/overload.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#include <stddef.h> +#include "upb/msg.h" +#include "envoy/config/overload/v3/overload.upb.h" +#include "envoy/type/v3/percent.upb.h" +#include "google/protobuf/any.upb.h" +#include "google/protobuf/duration.upb.h" +#include "udpa/annotations/status.upb.h" +#include "udpa/annotations/versioning.upb.h" +#include "validate/validate.upb.h" + +#include "upb/port_def.inc" + +static const upb_msglayout *const envoy_config_overload_v3_ResourceMonitor_submsgs[1] = { + &google_protobuf_Any_msginit, +}; + +static const upb_msglayout_field envoy_config_overload_v3_ResourceMonitor__fields[2] = { + {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, + {3, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 11, 1}, +}; + +const upb_msglayout envoy_config_overload_v3_ResourceMonitor_msginit = { + &envoy_config_overload_v3_ResourceMonitor_submsgs[0], + &envoy_config_overload_v3_ResourceMonitor__fields[0], + UPB_SIZE(16, 32), 2, false, 255, +}; + +static const upb_msglayout_field envoy_config_overload_v3_ThresholdTrigger__fields[1] = { + {1, UPB_SIZE(0, 0), 0, 0, 1, 1}, +}; + +const upb_msglayout envoy_config_overload_v3_ThresholdTrigger_msginit = { + NULL, + &envoy_config_overload_v3_ThresholdTrigger__fields[0], + UPB_SIZE(8, 8), 1, false, 255, +}; + +static const upb_msglayout_field envoy_config_overload_v3_ScaledTrigger__fields[2] = { + {1, UPB_SIZE(0, 0), 0, 0, 1, 1}, + {2, UPB_SIZE(8, 8), 0, 0, 1, 1}, +}; + +const upb_msglayout envoy_config_overload_v3_ScaledTrigger_msginit = { + NULL, + &envoy_config_overload_v3_ScaledTrigger__fields[0], + UPB_SIZE(16, 16), 2, false, 255, +}; + +static const upb_msglayout *const envoy_config_overload_v3_Trigger_submsgs[2] = { + &envoy_config_overload_v3_ScaledTrigger_msginit, + &envoy_config_overload_v3_ThresholdTrigger_msginit, +}; + +static const upb_msglayout_field envoy_config_overload_v3_Trigger__fields[3] = { + {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, + {2, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 1, 11, 1}, + {3, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 11, 1}, +}; + +const upb_msglayout envoy_config_overload_v3_Trigger_msginit = { + &envoy_config_overload_v3_Trigger_submsgs[0], + &envoy_config_overload_v3_Trigger__fields[0], + UPB_SIZE(16, 32), 3, false, 255, +}; + +static const upb_msglayout *const envoy_config_overload_v3_ScaleTimersOverloadActionConfig_submsgs[1] = { + &envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_msginit, +}; + +static const upb_msglayout_field envoy_config_overload_v3_ScaleTimersOverloadActionConfig__fields[1] = { + {1, UPB_SIZE(0, 0), 0, 0, 11, 3}, +}; + +const upb_msglayout envoy_config_overload_v3_ScaleTimersOverloadActionConfig_msginit = { + &envoy_config_overload_v3_ScaleTimersOverloadActionConfig_submsgs[0], + &envoy_config_overload_v3_ScaleTimersOverloadActionConfig__fields[0], + UPB_SIZE(8, 8), 1, false, 255, +}; + +static const upb_msglayout *const envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_submsgs[2] = { + &envoy_type_v3_Percent_msginit, + &google_protobuf_Duration_msginit, +}; + +static const upb_msglayout_field envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer__fields[3] = { + {1, UPB_SIZE(0, 0), 0, 0, 14, 1}, + {2, UPB_SIZE(4, 8), UPB_SIZE(-9, -17), 1, 11, 1}, + {3, UPB_SIZE(4, 8), UPB_SIZE(-9, -17), 0, 11, 1}, +}; + +const upb_msglayout envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_msginit = { + &envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_submsgs[0], + &envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer__fields[0], + UPB_SIZE(16, 24), 3, false, 255, +}; + +static const upb_msglayout *const envoy_config_overload_v3_OverloadAction_submsgs[2] = { + &envoy_config_overload_v3_Trigger_msginit, + &google_protobuf_Any_msginit, +}; + +static const upb_msglayout_field envoy_config_overload_v3_OverloadAction__fields[3] = { + {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, + {2, UPB_SIZE(16, 32), 0, 0, 11, 3}, + {3, UPB_SIZE(12, 24), 1, 1, 11, 1}, +}; + +const upb_msglayout envoy_config_overload_v3_OverloadAction_msginit = { + &envoy_config_overload_v3_OverloadAction_submsgs[0], + &envoy_config_overload_v3_OverloadAction__fields[0], + UPB_SIZE(24, 48), 3, false, 255, +}; + +static const upb_msglayout *const envoy_config_overload_v3_OverloadManager_submsgs[3] = { + &envoy_config_overload_v3_OverloadAction_msginit, + &envoy_config_overload_v3_ResourceMonitor_msginit, + &google_protobuf_Duration_msginit, +}; + +static const upb_msglayout_field envoy_config_overload_v3_OverloadManager__fields[3] = { + {1, UPB_SIZE(4, 8), 1, 2, 11, 1}, + {2, UPB_SIZE(8, 16), 0, 1, 11, 3}, + {3, UPB_SIZE(12, 24), 0, 0, 11, 3}, +}; + +const upb_msglayout envoy_config_overload_v3_OverloadManager_msginit = { + &envoy_config_overload_v3_OverloadManager_submsgs[0], + &envoy_config_overload_v3_OverloadManager__fields[0], + UPB_SIZE(16, 32), 3, false, 255, +}; + +#include "upb/port_undef.inc" + diff --git a/grpc/src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.h b/grpc/src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.h new file mode 100644 index 00000000..d800aa97 --- /dev/null +++ b/grpc/src/core/ext/upb-generated/envoy/config/overload/v3/overload.upb.h @@ -0,0 +1,452 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * envoy/config/overload/v3/overload.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#ifndef ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPB_H_ +#define ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPB_H_ + +#include "upb/msg.h" +#include "upb/decode.h" +#include "upb/decode_fast.h" +#include "upb/encode.h" + +#include "upb/port_def.inc" + +#ifdef __cplusplus +extern "C" { +#endif + +struct envoy_config_overload_v3_ResourceMonitor; +struct envoy_config_overload_v3_ThresholdTrigger; +struct envoy_config_overload_v3_ScaledTrigger; +struct envoy_config_overload_v3_Trigger; +struct envoy_config_overload_v3_ScaleTimersOverloadActionConfig; +struct envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer; +struct envoy_config_overload_v3_OverloadAction; +struct envoy_config_overload_v3_OverloadManager; +typedef struct envoy_config_overload_v3_ResourceMonitor envoy_config_overload_v3_ResourceMonitor; +typedef struct envoy_config_overload_v3_ThresholdTrigger envoy_config_overload_v3_ThresholdTrigger; +typedef struct envoy_config_overload_v3_ScaledTrigger envoy_config_overload_v3_ScaledTrigger; +typedef struct envoy_config_overload_v3_Trigger envoy_config_overload_v3_Trigger; +typedef struct envoy_config_overload_v3_ScaleTimersOverloadActionConfig envoy_config_overload_v3_ScaleTimersOverloadActionConfig; +typedef struct envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer; +typedef struct envoy_config_overload_v3_OverloadAction envoy_config_overload_v3_OverloadAction; +typedef struct envoy_config_overload_v3_OverloadManager envoy_config_overload_v3_OverloadManager; +extern const upb_msglayout envoy_config_overload_v3_ResourceMonitor_msginit; +extern const upb_msglayout envoy_config_overload_v3_ThresholdTrigger_msginit; +extern const upb_msglayout envoy_config_overload_v3_ScaledTrigger_msginit; +extern const upb_msglayout envoy_config_overload_v3_Trigger_msginit; +extern const upb_msglayout envoy_config_overload_v3_ScaleTimersOverloadActionConfig_msginit; +extern const upb_msglayout envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_msginit; +extern const upb_msglayout envoy_config_overload_v3_OverloadAction_msginit; +extern const upb_msglayout envoy_config_overload_v3_OverloadManager_msginit; +struct envoy_type_v3_Percent; +struct google_protobuf_Any; +struct google_protobuf_Duration; +extern const upb_msglayout envoy_type_v3_Percent_msginit; +extern const upb_msglayout google_protobuf_Any_msginit; +extern const upb_msglayout google_protobuf_Duration_msginit; + +typedef enum { + envoy_config_overload_v3_ScaleTimersOverloadActionConfig_UNSPECIFIED = 0, + envoy_config_overload_v3_ScaleTimersOverloadActionConfig_HTTP_DOWNSTREAM_CONNECTION_IDLE = 1, + envoy_config_overload_v3_ScaleTimersOverloadActionConfig_HTTP_DOWNSTREAM_STREAM_IDLE = 2, + envoy_config_overload_v3_ScaleTimersOverloadActionConfig_TRANSPORT_SOCKET_CONNECT = 3 +} envoy_config_overload_v3_ScaleTimersOverloadActionConfig_TimerType; + + +/* envoy.config.overload.v3.ResourceMonitor */ + +UPB_INLINE envoy_config_overload_v3_ResourceMonitor *envoy_config_overload_v3_ResourceMonitor_new(upb_arena *arena) { + return (envoy_config_overload_v3_ResourceMonitor *)_upb_msg_new(&envoy_config_overload_v3_ResourceMonitor_msginit, arena); +} +UPB_INLINE envoy_config_overload_v3_ResourceMonitor *envoy_config_overload_v3_ResourceMonitor_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_config_overload_v3_ResourceMonitor *ret = envoy_config_overload_v3_ResourceMonitor_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_config_overload_v3_ResourceMonitor_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_config_overload_v3_ResourceMonitor *envoy_config_overload_v3_ResourceMonitor_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_config_overload_v3_ResourceMonitor *ret = envoy_config_overload_v3_ResourceMonitor_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_config_overload_v3_ResourceMonitor_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_config_overload_v3_ResourceMonitor_serialize(const envoy_config_overload_v3_ResourceMonitor *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_config_overload_v3_ResourceMonitor_msginit, arena, len); +} + +typedef enum { + envoy_config_overload_v3_ResourceMonitor_config_type_typed_config = 3, + envoy_config_overload_v3_ResourceMonitor_config_type_NOT_SET = 0 +} envoy_config_overload_v3_ResourceMonitor_config_type_oneofcases; +UPB_INLINE envoy_config_overload_v3_ResourceMonitor_config_type_oneofcases envoy_config_overload_v3_ResourceMonitor_config_type_case(const envoy_config_overload_v3_ResourceMonitor* msg) { return (envoy_config_overload_v3_ResourceMonitor_config_type_oneofcases)*UPB_PTR_AT(msg, UPB_SIZE(12, 24), int32_t); } + +UPB_INLINE upb_strview envoy_config_overload_v3_ResourceMonitor_name(const envoy_config_overload_v3_ResourceMonitor *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(0, 0), upb_strview); } +UPB_INLINE bool envoy_config_overload_v3_ResourceMonitor_has_typed_config(const envoy_config_overload_v3_ResourceMonitor *msg) { return _upb_getoneofcase(msg, UPB_SIZE(12, 24)) == 3; } +UPB_INLINE const struct google_protobuf_Any* envoy_config_overload_v3_ResourceMonitor_typed_config(const envoy_config_overload_v3_ResourceMonitor *msg) { return UPB_READ_ONEOF(msg, const struct google_protobuf_Any*, UPB_SIZE(8, 16), UPB_SIZE(12, 24), 3, NULL); } + +UPB_INLINE void envoy_config_overload_v3_ResourceMonitor_set_name(envoy_config_overload_v3_ResourceMonitor *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(0, 0), upb_strview) = value; +} +UPB_INLINE void envoy_config_overload_v3_ResourceMonitor_set_typed_config(envoy_config_overload_v3_ResourceMonitor *msg, struct google_protobuf_Any* value) { + UPB_WRITE_ONEOF(msg, struct google_protobuf_Any*, UPB_SIZE(8, 16), value, UPB_SIZE(12, 24), 3); +} +UPB_INLINE struct google_protobuf_Any* envoy_config_overload_v3_ResourceMonitor_mutable_typed_config(envoy_config_overload_v3_ResourceMonitor *msg, upb_arena *arena) { + struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_overload_v3_ResourceMonitor_typed_config(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Any*)_upb_msg_new(&google_protobuf_Any_msginit, arena); + if (!sub) return NULL; + envoy_config_overload_v3_ResourceMonitor_set_typed_config(msg, sub); + } + return sub; +} + +/* envoy.config.overload.v3.ThresholdTrigger */ + +UPB_INLINE envoy_config_overload_v3_ThresholdTrigger *envoy_config_overload_v3_ThresholdTrigger_new(upb_arena *arena) { + return (envoy_config_overload_v3_ThresholdTrigger *)_upb_msg_new(&envoy_config_overload_v3_ThresholdTrigger_msginit, arena); +} +UPB_INLINE envoy_config_overload_v3_ThresholdTrigger *envoy_config_overload_v3_ThresholdTrigger_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_config_overload_v3_ThresholdTrigger *ret = envoy_config_overload_v3_ThresholdTrigger_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_config_overload_v3_ThresholdTrigger_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_config_overload_v3_ThresholdTrigger *envoy_config_overload_v3_ThresholdTrigger_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_config_overload_v3_ThresholdTrigger *ret = envoy_config_overload_v3_ThresholdTrigger_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_config_overload_v3_ThresholdTrigger_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_config_overload_v3_ThresholdTrigger_serialize(const envoy_config_overload_v3_ThresholdTrigger *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_config_overload_v3_ThresholdTrigger_msginit, arena, len); +} + +UPB_INLINE double envoy_config_overload_v3_ThresholdTrigger_value(const envoy_config_overload_v3_ThresholdTrigger *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(0, 0), double); } + +UPB_INLINE void envoy_config_overload_v3_ThresholdTrigger_set_value(envoy_config_overload_v3_ThresholdTrigger *msg, double value) { + *UPB_PTR_AT(msg, UPB_SIZE(0, 0), double) = value; +} + +/* envoy.config.overload.v3.ScaledTrigger */ + +UPB_INLINE envoy_config_overload_v3_ScaledTrigger *envoy_config_overload_v3_ScaledTrigger_new(upb_arena *arena) { + return (envoy_config_overload_v3_ScaledTrigger *)_upb_msg_new(&envoy_config_overload_v3_ScaledTrigger_msginit, arena); +} +UPB_INLINE envoy_config_overload_v3_ScaledTrigger *envoy_config_overload_v3_ScaledTrigger_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_config_overload_v3_ScaledTrigger *ret = envoy_config_overload_v3_ScaledTrigger_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_config_overload_v3_ScaledTrigger_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_config_overload_v3_ScaledTrigger *envoy_config_overload_v3_ScaledTrigger_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_config_overload_v3_ScaledTrigger *ret = envoy_config_overload_v3_ScaledTrigger_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_config_overload_v3_ScaledTrigger_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_config_overload_v3_ScaledTrigger_serialize(const envoy_config_overload_v3_ScaledTrigger *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_config_overload_v3_ScaledTrigger_msginit, arena, len); +} + +UPB_INLINE double envoy_config_overload_v3_ScaledTrigger_scaling_threshold(const envoy_config_overload_v3_ScaledTrigger *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(0, 0), double); } +UPB_INLINE double envoy_config_overload_v3_ScaledTrigger_saturation_threshold(const envoy_config_overload_v3_ScaledTrigger *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(8, 8), double); } + +UPB_INLINE void envoy_config_overload_v3_ScaledTrigger_set_scaling_threshold(envoy_config_overload_v3_ScaledTrigger *msg, double value) { + *UPB_PTR_AT(msg, UPB_SIZE(0, 0), double) = value; +} +UPB_INLINE void envoy_config_overload_v3_ScaledTrigger_set_saturation_threshold(envoy_config_overload_v3_ScaledTrigger *msg, double value) { + *UPB_PTR_AT(msg, UPB_SIZE(8, 8), double) = value; +} + +/* envoy.config.overload.v3.Trigger */ + +UPB_INLINE envoy_config_overload_v3_Trigger *envoy_config_overload_v3_Trigger_new(upb_arena *arena) { + return (envoy_config_overload_v3_Trigger *)_upb_msg_new(&envoy_config_overload_v3_Trigger_msginit, arena); +} +UPB_INLINE envoy_config_overload_v3_Trigger *envoy_config_overload_v3_Trigger_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_config_overload_v3_Trigger *ret = envoy_config_overload_v3_Trigger_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_config_overload_v3_Trigger_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_config_overload_v3_Trigger *envoy_config_overload_v3_Trigger_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_config_overload_v3_Trigger *ret = envoy_config_overload_v3_Trigger_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_config_overload_v3_Trigger_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_config_overload_v3_Trigger_serialize(const envoy_config_overload_v3_Trigger *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_config_overload_v3_Trigger_msginit, arena, len); +} + +typedef enum { + envoy_config_overload_v3_Trigger_trigger_oneof_threshold = 2, + envoy_config_overload_v3_Trigger_trigger_oneof_scaled = 3, + envoy_config_overload_v3_Trigger_trigger_oneof_NOT_SET = 0 +} envoy_config_overload_v3_Trigger_trigger_oneof_oneofcases; +UPB_INLINE envoy_config_overload_v3_Trigger_trigger_oneof_oneofcases envoy_config_overload_v3_Trigger_trigger_oneof_case(const envoy_config_overload_v3_Trigger* msg) { return (envoy_config_overload_v3_Trigger_trigger_oneof_oneofcases)*UPB_PTR_AT(msg, UPB_SIZE(12, 24), int32_t); } + +UPB_INLINE upb_strview envoy_config_overload_v3_Trigger_name(const envoy_config_overload_v3_Trigger *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(0, 0), upb_strview); } +UPB_INLINE bool envoy_config_overload_v3_Trigger_has_threshold(const envoy_config_overload_v3_Trigger *msg) { return _upb_getoneofcase(msg, UPB_SIZE(12, 24)) == 2; } +UPB_INLINE const envoy_config_overload_v3_ThresholdTrigger* envoy_config_overload_v3_Trigger_threshold(const envoy_config_overload_v3_Trigger *msg) { return UPB_READ_ONEOF(msg, const envoy_config_overload_v3_ThresholdTrigger*, UPB_SIZE(8, 16), UPB_SIZE(12, 24), 2, NULL); } +UPB_INLINE bool envoy_config_overload_v3_Trigger_has_scaled(const envoy_config_overload_v3_Trigger *msg) { return _upb_getoneofcase(msg, UPB_SIZE(12, 24)) == 3; } +UPB_INLINE const envoy_config_overload_v3_ScaledTrigger* envoy_config_overload_v3_Trigger_scaled(const envoy_config_overload_v3_Trigger *msg) { return UPB_READ_ONEOF(msg, const envoy_config_overload_v3_ScaledTrigger*, UPB_SIZE(8, 16), UPB_SIZE(12, 24), 3, NULL); } + +UPB_INLINE void envoy_config_overload_v3_Trigger_set_name(envoy_config_overload_v3_Trigger *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(0, 0), upb_strview) = value; +} +UPB_INLINE void envoy_config_overload_v3_Trigger_set_threshold(envoy_config_overload_v3_Trigger *msg, envoy_config_overload_v3_ThresholdTrigger* value) { + UPB_WRITE_ONEOF(msg, envoy_config_overload_v3_ThresholdTrigger*, UPB_SIZE(8, 16), value, UPB_SIZE(12, 24), 2); +} +UPB_INLINE struct envoy_config_overload_v3_ThresholdTrigger* envoy_config_overload_v3_Trigger_mutable_threshold(envoy_config_overload_v3_Trigger *msg, upb_arena *arena) { + struct envoy_config_overload_v3_ThresholdTrigger* sub = (struct envoy_config_overload_v3_ThresholdTrigger*)envoy_config_overload_v3_Trigger_threshold(msg); + if (sub == NULL) { + sub = (struct envoy_config_overload_v3_ThresholdTrigger*)_upb_msg_new(&envoy_config_overload_v3_ThresholdTrigger_msginit, arena); + if (!sub) return NULL; + envoy_config_overload_v3_Trigger_set_threshold(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_config_overload_v3_Trigger_set_scaled(envoy_config_overload_v3_Trigger *msg, envoy_config_overload_v3_ScaledTrigger* value) { + UPB_WRITE_ONEOF(msg, envoy_config_overload_v3_ScaledTrigger*, UPB_SIZE(8, 16), value, UPB_SIZE(12, 24), 3); +} +UPB_INLINE struct envoy_config_overload_v3_ScaledTrigger* envoy_config_overload_v3_Trigger_mutable_scaled(envoy_config_overload_v3_Trigger *msg, upb_arena *arena) { + struct envoy_config_overload_v3_ScaledTrigger* sub = (struct envoy_config_overload_v3_ScaledTrigger*)envoy_config_overload_v3_Trigger_scaled(msg); + if (sub == NULL) { + sub = (struct envoy_config_overload_v3_ScaledTrigger*)_upb_msg_new(&envoy_config_overload_v3_ScaledTrigger_msginit, arena); + if (!sub) return NULL; + envoy_config_overload_v3_Trigger_set_scaled(msg, sub); + } + return sub; +} + +/* envoy.config.overload.v3.ScaleTimersOverloadActionConfig */ + +UPB_INLINE envoy_config_overload_v3_ScaleTimersOverloadActionConfig *envoy_config_overload_v3_ScaleTimersOverloadActionConfig_new(upb_arena *arena) { + return (envoy_config_overload_v3_ScaleTimersOverloadActionConfig *)_upb_msg_new(&envoy_config_overload_v3_ScaleTimersOverloadActionConfig_msginit, arena); +} +UPB_INLINE envoy_config_overload_v3_ScaleTimersOverloadActionConfig *envoy_config_overload_v3_ScaleTimersOverloadActionConfig_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_config_overload_v3_ScaleTimersOverloadActionConfig *ret = envoy_config_overload_v3_ScaleTimersOverloadActionConfig_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_config_overload_v3_ScaleTimersOverloadActionConfig_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_config_overload_v3_ScaleTimersOverloadActionConfig *envoy_config_overload_v3_ScaleTimersOverloadActionConfig_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_config_overload_v3_ScaleTimersOverloadActionConfig *ret = envoy_config_overload_v3_ScaleTimersOverloadActionConfig_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_config_overload_v3_ScaleTimersOverloadActionConfig_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_config_overload_v3_ScaleTimersOverloadActionConfig_serialize(const envoy_config_overload_v3_ScaleTimersOverloadActionConfig *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_config_overload_v3_ScaleTimersOverloadActionConfig_msginit, arena, len); +} + +UPB_INLINE bool envoy_config_overload_v3_ScaleTimersOverloadActionConfig_has_timer_scale_factors(const envoy_config_overload_v3_ScaleTimersOverloadActionConfig *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(0, 0)); } +UPB_INLINE const envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer* const* envoy_config_overload_v3_ScaleTimersOverloadActionConfig_timer_scale_factors(const envoy_config_overload_v3_ScaleTimersOverloadActionConfig *msg, size_t *len) { return (const envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer* const*)_upb_array_accessor(msg, UPB_SIZE(0, 0), len); } + +UPB_INLINE envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer** envoy_config_overload_v3_ScaleTimersOverloadActionConfig_mutable_timer_scale_factors(envoy_config_overload_v3_ScaleTimersOverloadActionConfig *msg, size_t *len) { + return (envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer**)_upb_array_mutable_accessor(msg, UPB_SIZE(0, 0), len); +} +UPB_INLINE envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer** envoy_config_overload_v3_ScaleTimersOverloadActionConfig_resize_timer_scale_factors(envoy_config_overload_v3_ScaleTimersOverloadActionConfig *msg, size_t len, upb_arena *arena) { + return (envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer**)_upb_array_resize_accessor2(msg, UPB_SIZE(0, 0), len, UPB_SIZE(2, 3), arena); +} +UPB_INLINE struct envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer* envoy_config_overload_v3_ScaleTimersOverloadActionConfig_add_timer_scale_factors(envoy_config_overload_v3_ScaleTimersOverloadActionConfig *msg, upb_arena *arena) { + struct envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer* sub = (struct envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer*)_upb_msg_new(&envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_msginit, arena); + bool ok = _upb_array_append_accessor2( + msg, UPB_SIZE(0, 0), UPB_SIZE(2, 3), &sub, arena); + if (!ok) return NULL; + return sub; +} + +/* envoy.config.overload.v3.ScaleTimersOverloadActionConfig.ScaleTimer */ + +UPB_INLINE envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer *envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_new(upb_arena *arena) { + return (envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer *)_upb_msg_new(&envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_msginit, arena); +} +UPB_INLINE envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer *envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer *ret = envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer *envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer *ret = envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_serialize(const envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_msginit, arena, len); +} + +typedef enum { + envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_overload_adjust_min_timeout = 2, + envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_overload_adjust_min_scale = 3, + envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_overload_adjust_NOT_SET = 0 +} envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_overload_adjust_oneofcases; +UPB_INLINE envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_overload_adjust_oneofcases envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_overload_adjust_case(const envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer* msg) { return (envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_overload_adjust_oneofcases)*UPB_PTR_AT(msg, UPB_SIZE(8, 16), int32_t); } + +UPB_INLINE int32_t envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_timer(const envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(0, 0), int32_t); } +UPB_INLINE bool envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_has_min_timeout(const envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer *msg) { return _upb_getoneofcase(msg, UPB_SIZE(8, 16)) == 2; } +UPB_INLINE const struct google_protobuf_Duration* envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_min_timeout(const envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer *msg) { return UPB_READ_ONEOF(msg, const struct google_protobuf_Duration*, UPB_SIZE(4, 8), UPB_SIZE(8, 16), 2, NULL); } +UPB_INLINE bool envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_has_min_scale(const envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer *msg) { return _upb_getoneofcase(msg, UPB_SIZE(8, 16)) == 3; } +UPB_INLINE const struct envoy_type_v3_Percent* envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_min_scale(const envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer *msg) { return UPB_READ_ONEOF(msg, const struct envoy_type_v3_Percent*, UPB_SIZE(4, 8), UPB_SIZE(8, 16), 3, NULL); } + +UPB_INLINE void envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_set_timer(envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer *msg, int32_t value) { + *UPB_PTR_AT(msg, UPB_SIZE(0, 0), int32_t) = value; +} +UPB_INLINE void envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_set_min_timeout(envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer *msg, struct google_protobuf_Duration* value) { + UPB_WRITE_ONEOF(msg, struct google_protobuf_Duration*, UPB_SIZE(4, 8), value, UPB_SIZE(8, 16), 2); +} +UPB_INLINE struct google_protobuf_Duration* envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_mutable_min_timeout(envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer *msg, upb_arena *arena) { + struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_min_timeout(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Duration*)_upb_msg_new(&google_protobuf_Duration_msginit, arena); + if (!sub) return NULL; + envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_set_min_timeout(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_set_min_scale(envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer *msg, struct envoy_type_v3_Percent* value) { + UPB_WRITE_ONEOF(msg, struct envoy_type_v3_Percent*, UPB_SIZE(4, 8), value, UPB_SIZE(8, 16), 3); +} +UPB_INLINE struct envoy_type_v3_Percent* envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_mutable_min_scale(envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer *msg, upb_arena *arena) { + struct envoy_type_v3_Percent* sub = (struct envoy_type_v3_Percent*)envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_min_scale(msg); + if (sub == NULL) { + sub = (struct envoy_type_v3_Percent*)_upb_msg_new(&envoy_type_v3_Percent_msginit, arena); + if (!sub) return NULL; + envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_set_min_scale(msg, sub); + } + return sub; +} + +/* envoy.config.overload.v3.OverloadAction */ + +UPB_INLINE envoy_config_overload_v3_OverloadAction *envoy_config_overload_v3_OverloadAction_new(upb_arena *arena) { + return (envoy_config_overload_v3_OverloadAction *)_upb_msg_new(&envoy_config_overload_v3_OverloadAction_msginit, arena); +} +UPB_INLINE envoy_config_overload_v3_OverloadAction *envoy_config_overload_v3_OverloadAction_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_config_overload_v3_OverloadAction *ret = envoy_config_overload_v3_OverloadAction_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_config_overload_v3_OverloadAction_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_config_overload_v3_OverloadAction *envoy_config_overload_v3_OverloadAction_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_config_overload_v3_OverloadAction *ret = envoy_config_overload_v3_OverloadAction_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_config_overload_v3_OverloadAction_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_config_overload_v3_OverloadAction_serialize(const envoy_config_overload_v3_OverloadAction *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_config_overload_v3_OverloadAction_msginit, arena, len); +} + +UPB_INLINE upb_strview envoy_config_overload_v3_OverloadAction_name(const envoy_config_overload_v3_OverloadAction *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview); } +UPB_INLINE bool envoy_config_overload_v3_OverloadAction_has_triggers(const envoy_config_overload_v3_OverloadAction *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(16, 32)); } +UPB_INLINE const envoy_config_overload_v3_Trigger* const* envoy_config_overload_v3_OverloadAction_triggers(const envoy_config_overload_v3_OverloadAction *msg, size_t *len) { return (const envoy_config_overload_v3_Trigger* const*)_upb_array_accessor(msg, UPB_SIZE(16, 32), len); } +UPB_INLINE bool envoy_config_overload_v3_OverloadAction_has_typed_config(const envoy_config_overload_v3_OverloadAction *msg) { return _upb_hasbit(msg, 1); } +UPB_INLINE const struct google_protobuf_Any* envoy_config_overload_v3_OverloadAction_typed_config(const envoy_config_overload_v3_OverloadAction *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(12, 24), const struct google_protobuf_Any*); } + +UPB_INLINE void envoy_config_overload_v3_OverloadAction_set_name(envoy_config_overload_v3_OverloadAction *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview) = value; +} +UPB_INLINE envoy_config_overload_v3_Trigger** envoy_config_overload_v3_OverloadAction_mutable_triggers(envoy_config_overload_v3_OverloadAction *msg, size_t *len) { + return (envoy_config_overload_v3_Trigger**)_upb_array_mutable_accessor(msg, UPB_SIZE(16, 32), len); +} +UPB_INLINE envoy_config_overload_v3_Trigger** envoy_config_overload_v3_OverloadAction_resize_triggers(envoy_config_overload_v3_OverloadAction *msg, size_t len, upb_arena *arena) { + return (envoy_config_overload_v3_Trigger**)_upb_array_resize_accessor2(msg, UPB_SIZE(16, 32), len, UPB_SIZE(2, 3), arena); +} +UPB_INLINE struct envoy_config_overload_v3_Trigger* envoy_config_overload_v3_OverloadAction_add_triggers(envoy_config_overload_v3_OverloadAction *msg, upb_arena *arena) { + struct envoy_config_overload_v3_Trigger* sub = (struct envoy_config_overload_v3_Trigger*)_upb_msg_new(&envoy_config_overload_v3_Trigger_msginit, arena); + bool ok = _upb_array_append_accessor2( + msg, UPB_SIZE(16, 32), UPB_SIZE(2, 3), &sub, arena); + if (!ok) return NULL; + return sub; +} +UPB_INLINE void envoy_config_overload_v3_OverloadAction_set_typed_config(envoy_config_overload_v3_OverloadAction *msg, struct google_protobuf_Any* value) { + _upb_sethas(msg, 1); + *UPB_PTR_AT(msg, UPB_SIZE(12, 24), struct google_protobuf_Any*) = value; +} +UPB_INLINE struct google_protobuf_Any* envoy_config_overload_v3_OverloadAction_mutable_typed_config(envoy_config_overload_v3_OverloadAction *msg, upb_arena *arena) { + struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_overload_v3_OverloadAction_typed_config(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Any*)_upb_msg_new(&google_protobuf_Any_msginit, arena); + if (!sub) return NULL; + envoy_config_overload_v3_OverloadAction_set_typed_config(msg, sub); + } + return sub; +} + +/* envoy.config.overload.v3.OverloadManager */ + +UPB_INLINE envoy_config_overload_v3_OverloadManager *envoy_config_overload_v3_OverloadManager_new(upb_arena *arena) { + return (envoy_config_overload_v3_OverloadManager *)_upb_msg_new(&envoy_config_overload_v3_OverloadManager_msginit, arena); +} +UPB_INLINE envoy_config_overload_v3_OverloadManager *envoy_config_overload_v3_OverloadManager_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_config_overload_v3_OverloadManager *ret = envoy_config_overload_v3_OverloadManager_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_config_overload_v3_OverloadManager_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_config_overload_v3_OverloadManager *envoy_config_overload_v3_OverloadManager_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_config_overload_v3_OverloadManager *ret = envoy_config_overload_v3_OverloadManager_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_config_overload_v3_OverloadManager_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_config_overload_v3_OverloadManager_serialize(const envoy_config_overload_v3_OverloadManager *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_config_overload_v3_OverloadManager_msginit, arena, len); +} + +UPB_INLINE bool envoy_config_overload_v3_OverloadManager_has_refresh_interval(const envoy_config_overload_v3_OverloadManager *msg) { return _upb_hasbit(msg, 1); } +UPB_INLINE const struct google_protobuf_Duration* envoy_config_overload_v3_OverloadManager_refresh_interval(const envoy_config_overload_v3_OverloadManager *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), const struct google_protobuf_Duration*); } +UPB_INLINE bool envoy_config_overload_v3_OverloadManager_has_resource_monitors(const envoy_config_overload_v3_OverloadManager *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(8, 16)); } +UPB_INLINE const envoy_config_overload_v3_ResourceMonitor* const* envoy_config_overload_v3_OverloadManager_resource_monitors(const envoy_config_overload_v3_OverloadManager *msg, size_t *len) { return (const envoy_config_overload_v3_ResourceMonitor* const*)_upb_array_accessor(msg, UPB_SIZE(8, 16), len); } +UPB_INLINE bool envoy_config_overload_v3_OverloadManager_has_actions(const envoy_config_overload_v3_OverloadManager *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(12, 24)); } +UPB_INLINE const envoy_config_overload_v3_OverloadAction* const* envoy_config_overload_v3_OverloadManager_actions(const envoy_config_overload_v3_OverloadManager *msg, size_t *len) { return (const envoy_config_overload_v3_OverloadAction* const*)_upb_array_accessor(msg, UPB_SIZE(12, 24), len); } + +UPB_INLINE void envoy_config_overload_v3_OverloadManager_set_refresh_interval(envoy_config_overload_v3_OverloadManager *msg, struct google_protobuf_Duration* value) { + _upb_sethas(msg, 1); + *UPB_PTR_AT(msg, UPB_SIZE(4, 8), struct google_protobuf_Duration*) = value; +} +UPB_INLINE struct google_protobuf_Duration* envoy_config_overload_v3_OverloadManager_mutable_refresh_interval(envoy_config_overload_v3_OverloadManager *msg, upb_arena *arena) { + struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_config_overload_v3_OverloadManager_refresh_interval(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Duration*)_upb_msg_new(&google_protobuf_Duration_msginit, arena); + if (!sub) return NULL; + envoy_config_overload_v3_OverloadManager_set_refresh_interval(msg, sub); + } + return sub; +} +UPB_INLINE envoy_config_overload_v3_ResourceMonitor** envoy_config_overload_v3_OverloadManager_mutable_resource_monitors(envoy_config_overload_v3_OverloadManager *msg, size_t *len) { + return (envoy_config_overload_v3_ResourceMonitor**)_upb_array_mutable_accessor(msg, UPB_SIZE(8, 16), len); +} +UPB_INLINE envoy_config_overload_v3_ResourceMonitor** envoy_config_overload_v3_OverloadManager_resize_resource_monitors(envoy_config_overload_v3_OverloadManager *msg, size_t len, upb_arena *arena) { + return (envoy_config_overload_v3_ResourceMonitor**)_upb_array_resize_accessor2(msg, UPB_SIZE(8, 16), len, UPB_SIZE(2, 3), arena); +} +UPB_INLINE struct envoy_config_overload_v3_ResourceMonitor* envoy_config_overload_v3_OverloadManager_add_resource_monitors(envoy_config_overload_v3_OverloadManager *msg, upb_arena *arena) { + struct envoy_config_overload_v3_ResourceMonitor* sub = (struct envoy_config_overload_v3_ResourceMonitor*)_upb_msg_new(&envoy_config_overload_v3_ResourceMonitor_msginit, arena); + bool ok = _upb_array_append_accessor2( + msg, UPB_SIZE(8, 16), UPB_SIZE(2, 3), &sub, arena); + if (!ok) return NULL; + return sub; +} +UPB_INLINE envoy_config_overload_v3_OverloadAction** envoy_config_overload_v3_OverloadManager_mutable_actions(envoy_config_overload_v3_OverloadManager *msg, size_t *len) { + return (envoy_config_overload_v3_OverloadAction**)_upb_array_mutable_accessor(msg, UPB_SIZE(12, 24), len); +} +UPB_INLINE envoy_config_overload_v3_OverloadAction** envoy_config_overload_v3_OverloadManager_resize_actions(envoy_config_overload_v3_OverloadManager *msg, size_t len, upb_arena *arena) { + return (envoy_config_overload_v3_OverloadAction**)_upb_array_resize_accessor2(msg, UPB_SIZE(12, 24), len, UPB_SIZE(2, 3), arena); +} +UPB_INLINE struct envoy_config_overload_v3_OverloadAction* envoy_config_overload_v3_OverloadManager_add_actions(envoy_config_overload_v3_OverloadManager *msg, upb_arena *arena) { + struct envoy_config_overload_v3_OverloadAction* sub = (struct envoy_config_overload_v3_OverloadAction*)_upb_msg_new(&envoy_config_overload_v3_OverloadAction_msginit, arena); + bool ok = _upb_array_append_accessor2( + msg, UPB_SIZE(12, 24), UPB_SIZE(2, 3), &sub, arena); + if (!ok) return NULL; + return sub; +} + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#include "upb/port_undef.inc" + +#endif /* ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPB_H_ */ diff --git a/grpc/src/core/ext/upb-generated/envoy/config/route/v3/route.upb.c b/grpc/src/core/ext/upb-generated/envoy/config/route/v3/route.upb.c index 22e259cd..d34e1c50 100644 --- a/grpc/src/core/ext/upb-generated/envoy/config/route/v3/route.upb.c +++ b/grpc/src/core/ext/upb-generated/envoy/config/route/v3/route.upb.c @@ -19,30 +19,32 @@ #include "upb/port_def.inc" -static const upb_msglayout *const envoy_config_route_v3_RouteConfiguration_submsgs[4] = { +static const upb_msglayout *const envoy_config_route_v3_RouteConfiguration_submsgs[5] = { &envoy_config_core_v3_HeaderValueOption_msginit, &envoy_config_route_v3_Vhds_msginit, &envoy_config_route_v3_VirtualHost_msginit, &google_protobuf_BoolValue_msginit, + &google_protobuf_UInt32Value_msginit, }; -static const upb_msglayout_field envoy_config_route_v3_RouteConfiguration__fields[10] = { +static const upb_msglayout_field envoy_config_route_v3_RouteConfiguration__fields[11] = { {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(20, 40), 0, 2, 11, 3}, - {3, UPB_SIZE(24, 48), 0, 0, 9, 3}, - {4, UPB_SIZE(28, 56), 0, 0, 11, 3}, - {5, UPB_SIZE(32, 64), 0, 0, 9, 3}, - {6, UPB_SIZE(36, 72), 0, 0, 11, 3}, + {2, UPB_SIZE(24, 48), 0, 2, 11, 3}, + {3, UPB_SIZE(28, 56), 0, 0, 9, 3}, + {4, UPB_SIZE(32, 64), 0, 0, 11, 3}, + {5, UPB_SIZE(36, 72), 0, 0, 9, 3}, + {6, UPB_SIZE(40, 80), 0, 0, 11, 3}, {7, UPB_SIZE(12, 24), 1, 3, 11, 1}, - {8, UPB_SIZE(40, 80), 0, 0, 9, 3}, + {8, UPB_SIZE(44, 88), 0, 0, 9, 3}, {9, UPB_SIZE(16, 32), 2, 1, 11, 1}, {10, UPB_SIZE(1, 1), 0, 0, 8, 1}, + {11, UPB_SIZE(20, 40), 3, 4, 11, 1}, }; const upb_msglayout envoy_config_route_v3_RouteConfiguration_msginit = { &envoy_config_route_v3_RouteConfiguration_submsgs[0], &envoy_config_route_v3_RouteConfiguration__fields[0], - UPB_SIZE(48, 96), 10, false, 255, + UPB_SIZE(48, 96), 11, false, 255, }; static const upb_msglayout *const envoy_config_route_v3_Vhds_submsgs[1] = { diff --git a/grpc/src/core/ext/upb-generated/envoy/config/route/v3/route.upb.h b/grpc/src/core/ext/upb-generated/envoy/config/route/v3/route.upb.h index 461e8c88..b8d009fd 100644 --- a/grpc/src/core/ext/upb-generated/envoy/config/route/v3/route.upb.h +++ b/grpc/src/core/ext/upb-generated/envoy/config/route/v3/route.upb.h @@ -30,10 +30,12 @@ struct envoy_config_core_v3_ConfigSource; struct envoy_config_core_v3_HeaderValueOption; struct envoy_config_route_v3_VirtualHost; struct google_protobuf_BoolValue; +struct google_protobuf_UInt32Value; extern const upb_msglayout envoy_config_core_v3_ConfigSource_msginit; extern const upb_msglayout envoy_config_core_v3_HeaderValueOption_msginit; extern const upb_msglayout envoy_config_route_v3_VirtualHost_msginit; extern const upb_msglayout google_protobuf_BoolValue_msginit; +extern const upb_msglayout google_protobuf_UInt32Value_msginit; /* envoy.config.route.v3.RouteConfiguration */ @@ -57,80 +59,82 @@ UPB_INLINE char *envoy_config_route_v3_RouteConfiguration_serialize(const envoy_ } UPB_INLINE upb_strview envoy_config_route_v3_RouteConfiguration_name(const envoy_config_route_v3_RouteConfiguration *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview); } -UPB_INLINE bool envoy_config_route_v3_RouteConfiguration_has_virtual_hosts(const envoy_config_route_v3_RouteConfiguration *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(20, 40)); } -UPB_INLINE const struct envoy_config_route_v3_VirtualHost* const* envoy_config_route_v3_RouteConfiguration_virtual_hosts(const envoy_config_route_v3_RouteConfiguration *msg, size_t *len) { return (const struct envoy_config_route_v3_VirtualHost* const*)_upb_array_accessor(msg, UPB_SIZE(20, 40), len); } -UPB_INLINE upb_strview const* envoy_config_route_v3_RouteConfiguration_internal_only_headers(const envoy_config_route_v3_RouteConfiguration *msg, size_t *len) { return (upb_strview const*)_upb_array_accessor(msg, UPB_SIZE(24, 48), len); } -UPB_INLINE bool envoy_config_route_v3_RouteConfiguration_has_response_headers_to_add(const envoy_config_route_v3_RouteConfiguration *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(28, 56)); } -UPB_INLINE const struct envoy_config_core_v3_HeaderValueOption* const* envoy_config_route_v3_RouteConfiguration_response_headers_to_add(const envoy_config_route_v3_RouteConfiguration *msg, size_t *len) { return (const struct envoy_config_core_v3_HeaderValueOption* const*)_upb_array_accessor(msg, UPB_SIZE(28, 56), len); } -UPB_INLINE upb_strview const* envoy_config_route_v3_RouteConfiguration_response_headers_to_remove(const envoy_config_route_v3_RouteConfiguration *msg, size_t *len) { return (upb_strview const*)_upb_array_accessor(msg, UPB_SIZE(32, 64), len); } -UPB_INLINE bool envoy_config_route_v3_RouteConfiguration_has_request_headers_to_add(const envoy_config_route_v3_RouteConfiguration *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(36, 72)); } -UPB_INLINE const struct envoy_config_core_v3_HeaderValueOption* const* envoy_config_route_v3_RouteConfiguration_request_headers_to_add(const envoy_config_route_v3_RouteConfiguration *msg, size_t *len) { return (const struct envoy_config_core_v3_HeaderValueOption* const*)_upb_array_accessor(msg, UPB_SIZE(36, 72), len); } +UPB_INLINE bool envoy_config_route_v3_RouteConfiguration_has_virtual_hosts(const envoy_config_route_v3_RouteConfiguration *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(24, 48)); } +UPB_INLINE const struct envoy_config_route_v3_VirtualHost* const* envoy_config_route_v3_RouteConfiguration_virtual_hosts(const envoy_config_route_v3_RouteConfiguration *msg, size_t *len) { return (const struct envoy_config_route_v3_VirtualHost* const*)_upb_array_accessor(msg, UPB_SIZE(24, 48), len); } +UPB_INLINE upb_strview const* envoy_config_route_v3_RouteConfiguration_internal_only_headers(const envoy_config_route_v3_RouteConfiguration *msg, size_t *len) { return (upb_strview const*)_upb_array_accessor(msg, UPB_SIZE(28, 56), len); } +UPB_INLINE bool envoy_config_route_v3_RouteConfiguration_has_response_headers_to_add(const envoy_config_route_v3_RouteConfiguration *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(32, 64)); } +UPB_INLINE const struct envoy_config_core_v3_HeaderValueOption* const* envoy_config_route_v3_RouteConfiguration_response_headers_to_add(const envoy_config_route_v3_RouteConfiguration *msg, size_t *len) { return (const struct envoy_config_core_v3_HeaderValueOption* const*)_upb_array_accessor(msg, UPB_SIZE(32, 64), len); } +UPB_INLINE upb_strview const* envoy_config_route_v3_RouteConfiguration_response_headers_to_remove(const envoy_config_route_v3_RouteConfiguration *msg, size_t *len) { return (upb_strview const*)_upb_array_accessor(msg, UPB_SIZE(36, 72), len); } +UPB_INLINE bool envoy_config_route_v3_RouteConfiguration_has_request_headers_to_add(const envoy_config_route_v3_RouteConfiguration *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(40, 80)); } +UPB_INLINE const struct envoy_config_core_v3_HeaderValueOption* const* envoy_config_route_v3_RouteConfiguration_request_headers_to_add(const envoy_config_route_v3_RouteConfiguration *msg, size_t *len) { return (const struct envoy_config_core_v3_HeaderValueOption* const*)_upb_array_accessor(msg, UPB_SIZE(40, 80), len); } UPB_INLINE bool envoy_config_route_v3_RouteConfiguration_has_validate_clusters(const envoy_config_route_v3_RouteConfiguration *msg) { return _upb_hasbit(msg, 1); } UPB_INLINE const struct google_protobuf_BoolValue* envoy_config_route_v3_RouteConfiguration_validate_clusters(const envoy_config_route_v3_RouteConfiguration *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(12, 24), const struct google_protobuf_BoolValue*); } -UPB_INLINE upb_strview const* envoy_config_route_v3_RouteConfiguration_request_headers_to_remove(const envoy_config_route_v3_RouteConfiguration *msg, size_t *len) { return (upb_strview const*)_upb_array_accessor(msg, UPB_SIZE(40, 80), len); } +UPB_INLINE upb_strview const* envoy_config_route_v3_RouteConfiguration_request_headers_to_remove(const envoy_config_route_v3_RouteConfiguration *msg, size_t *len) { return (upb_strview const*)_upb_array_accessor(msg, UPB_SIZE(44, 88), len); } UPB_INLINE bool envoy_config_route_v3_RouteConfiguration_has_vhds(const envoy_config_route_v3_RouteConfiguration *msg) { return _upb_hasbit(msg, 2); } UPB_INLINE const envoy_config_route_v3_Vhds* envoy_config_route_v3_RouteConfiguration_vhds(const envoy_config_route_v3_RouteConfiguration *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(16, 32), const envoy_config_route_v3_Vhds*); } UPB_INLINE bool envoy_config_route_v3_RouteConfiguration_most_specific_header_mutations_wins(const envoy_config_route_v3_RouteConfiguration *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(1, 1), bool); } +UPB_INLINE bool envoy_config_route_v3_RouteConfiguration_has_max_direct_response_body_size_bytes(const envoy_config_route_v3_RouteConfiguration *msg) { return _upb_hasbit(msg, 3); } +UPB_INLINE const struct google_protobuf_UInt32Value* envoy_config_route_v3_RouteConfiguration_max_direct_response_body_size_bytes(const envoy_config_route_v3_RouteConfiguration *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(20, 40), const struct google_protobuf_UInt32Value*); } UPB_INLINE void envoy_config_route_v3_RouteConfiguration_set_name(envoy_config_route_v3_RouteConfiguration *msg, upb_strview value) { *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview) = value; } UPB_INLINE struct envoy_config_route_v3_VirtualHost** envoy_config_route_v3_RouteConfiguration_mutable_virtual_hosts(envoy_config_route_v3_RouteConfiguration *msg, size_t *len) { - return (struct envoy_config_route_v3_VirtualHost**)_upb_array_mutable_accessor(msg, UPB_SIZE(20, 40), len); + return (struct envoy_config_route_v3_VirtualHost**)_upb_array_mutable_accessor(msg, UPB_SIZE(24, 48), len); } UPB_INLINE struct envoy_config_route_v3_VirtualHost** envoy_config_route_v3_RouteConfiguration_resize_virtual_hosts(envoy_config_route_v3_RouteConfiguration *msg, size_t len, upb_arena *arena) { - return (struct envoy_config_route_v3_VirtualHost**)_upb_array_resize_accessor2(msg, UPB_SIZE(20, 40), len, UPB_SIZE(2, 3), arena); + return (struct envoy_config_route_v3_VirtualHost**)_upb_array_resize_accessor2(msg, UPB_SIZE(24, 48), len, UPB_SIZE(2, 3), arena); } UPB_INLINE struct envoy_config_route_v3_VirtualHost* envoy_config_route_v3_RouteConfiguration_add_virtual_hosts(envoy_config_route_v3_RouteConfiguration *msg, upb_arena *arena) { struct envoy_config_route_v3_VirtualHost* sub = (struct envoy_config_route_v3_VirtualHost*)_upb_msg_new(&envoy_config_route_v3_VirtualHost_msginit, arena); bool ok = _upb_array_append_accessor2( - msg, UPB_SIZE(20, 40), UPB_SIZE(2, 3), &sub, arena); + msg, UPB_SIZE(24, 48), UPB_SIZE(2, 3), &sub, arena); if (!ok) return NULL; return sub; } UPB_INLINE upb_strview* envoy_config_route_v3_RouteConfiguration_mutable_internal_only_headers(envoy_config_route_v3_RouteConfiguration *msg, size_t *len) { - return (upb_strview*)_upb_array_mutable_accessor(msg, UPB_SIZE(24, 48), len); + return (upb_strview*)_upb_array_mutable_accessor(msg, UPB_SIZE(28, 56), len); } UPB_INLINE upb_strview* envoy_config_route_v3_RouteConfiguration_resize_internal_only_headers(envoy_config_route_v3_RouteConfiguration *msg, size_t len, upb_arena *arena) { - return (upb_strview*)_upb_array_resize_accessor2(msg, UPB_SIZE(24, 48), len, UPB_SIZE(3, 4), arena); + return (upb_strview*)_upb_array_resize_accessor2(msg, UPB_SIZE(28, 56), len, UPB_SIZE(3, 4), arena); } UPB_INLINE bool envoy_config_route_v3_RouteConfiguration_add_internal_only_headers(envoy_config_route_v3_RouteConfiguration *msg, upb_strview val, upb_arena *arena) { - return _upb_array_append_accessor2(msg, UPB_SIZE(24, 48), UPB_SIZE(3, 4), &val, + return _upb_array_append_accessor2(msg, UPB_SIZE(28, 56), UPB_SIZE(3, 4), &val, arena); } UPB_INLINE struct envoy_config_core_v3_HeaderValueOption** envoy_config_route_v3_RouteConfiguration_mutable_response_headers_to_add(envoy_config_route_v3_RouteConfiguration *msg, size_t *len) { - return (struct envoy_config_core_v3_HeaderValueOption**)_upb_array_mutable_accessor(msg, UPB_SIZE(28, 56), len); + return (struct envoy_config_core_v3_HeaderValueOption**)_upb_array_mutable_accessor(msg, UPB_SIZE(32, 64), len); } UPB_INLINE struct envoy_config_core_v3_HeaderValueOption** envoy_config_route_v3_RouteConfiguration_resize_response_headers_to_add(envoy_config_route_v3_RouteConfiguration *msg, size_t len, upb_arena *arena) { - return (struct envoy_config_core_v3_HeaderValueOption**)_upb_array_resize_accessor2(msg, UPB_SIZE(28, 56), len, UPB_SIZE(2, 3), arena); + return (struct envoy_config_core_v3_HeaderValueOption**)_upb_array_resize_accessor2(msg, UPB_SIZE(32, 64), len, UPB_SIZE(2, 3), arena); } UPB_INLINE struct envoy_config_core_v3_HeaderValueOption* envoy_config_route_v3_RouteConfiguration_add_response_headers_to_add(envoy_config_route_v3_RouteConfiguration *msg, upb_arena *arena) { struct envoy_config_core_v3_HeaderValueOption* sub = (struct envoy_config_core_v3_HeaderValueOption*)_upb_msg_new(&envoy_config_core_v3_HeaderValueOption_msginit, arena); bool ok = _upb_array_append_accessor2( - msg, UPB_SIZE(28, 56), UPB_SIZE(2, 3), &sub, arena); + msg, UPB_SIZE(32, 64), UPB_SIZE(2, 3), &sub, arena); if (!ok) return NULL; return sub; } UPB_INLINE upb_strview* envoy_config_route_v3_RouteConfiguration_mutable_response_headers_to_remove(envoy_config_route_v3_RouteConfiguration *msg, size_t *len) { - return (upb_strview*)_upb_array_mutable_accessor(msg, UPB_SIZE(32, 64), len); + return (upb_strview*)_upb_array_mutable_accessor(msg, UPB_SIZE(36, 72), len); } UPB_INLINE upb_strview* envoy_config_route_v3_RouteConfiguration_resize_response_headers_to_remove(envoy_config_route_v3_RouteConfiguration *msg, size_t len, upb_arena *arena) { - return (upb_strview*)_upb_array_resize_accessor2(msg, UPB_SIZE(32, 64), len, UPB_SIZE(3, 4), arena); + return (upb_strview*)_upb_array_resize_accessor2(msg, UPB_SIZE(36, 72), len, UPB_SIZE(3, 4), arena); } UPB_INLINE bool envoy_config_route_v3_RouteConfiguration_add_response_headers_to_remove(envoy_config_route_v3_RouteConfiguration *msg, upb_strview val, upb_arena *arena) { - return _upb_array_append_accessor2(msg, UPB_SIZE(32, 64), UPB_SIZE(3, 4), &val, + return _upb_array_append_accessor2(msg, UPB_SIZE(36, 72), UPB_SIZE(3, 4), &val, arena); } UPB_INLINE struct envoy_config_core_v3_HeaderValueOption** envoy_config_route_v3_RouteConfiguration_mutable_request_headers_to_add(envoy_config_route_v3_RouteConfiguration *msg, size_t *len) { - return (struct envoy_config_core_v3_HeaderValueOption**)_upb_array_mutable_accessor(msg, UPB_SIZE(36, 72), len); + return (struct envoy_config_core_v3_HeaderValueOption**)_upb_array_mutable_accessor(msg, UPB_SIZE(40, 80), len); } UPB_INLINE struct envoy_config_core_v3_HeaderValueOption** envoy_config_route_v3_RouteConfiguration_resize_request_headers_to_add(envoy_config_route_v3_RouteConfiguration *msg, size_t len, upb_arena *arena) { - return (struct envoy_config_core_v3_HeaderValueOption**)_upb_array_resize_accessor2(msg, UPB_SIZE(36, 72), len, UPB_SIZE(2, 3), arena); + return (struct envoy_config_core_v3_HeaderValueOption**)_upb_array_resize_accessor2(msg, UPB_SIZE(40, 80), len, UPB_SIZE(2, 3), arena); } UPB_INLINE struct envoy_config_core_v3_HeaderValueOption* envoy_config_route_v3_RouteConfiguration_add_request_headers_to_add(envoy_config_route_v3_RouteConfiguration *msg, upb_arena *arena) { struct envoy_config_core_v3_HeaderValueOption* sub = (struct envoy_config_core_v3_HeaderValueOption*)_upb_msg_new(&envoy_config_core_v3_HeaderValueOption_msginit, arena); bool ok = _upb_array_append_accessor2( - msg, UPB_SIZE(36, 72), UPB_SIZE(2, 3), &sub, arena); + msg, UPB_SIZE(40, 80), UPB_SIZE(2, 3), &sub, arena); if (!ok) return NULL; return sub; } @@ -148,13 +152,13 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_config_route_v3_RouteConfigur return sub; } UPB_INLINE upb_strview* envoy_config_route_v3_RouteConfiguration_mutable_request_headers_to_remove(envoy_config_route_v3_RouteConfiguration *msg, size_t *len) { - return (upb_strview*)_upb_array_mutable_accessor(msg, UPB_SIZE(40, 80), len); + return (upb_strview*)_upb_array_mutable_accessor(msg, UPB_SIZE(44, 88), len); } UPB_INLINE upb_strview* envoy_config_route_v3_RouteConfiguration_resize_request_headers_to_remove(envoy_config_route_v3_RouteConfiguration *msg, size_t len, upb_arena *arena) { - return (upb_strview*)_upb_array_resize_accessor2(msg, UPB_SIZE(40, 80), len, UPB_SIZE(3, 4), arena); + return (upb_strview*)_upb_array_resize_accessor2(msg, UPB_SIZE(44, 88), len, UPB_SIZE(3, 4), arena); } UPB_INLINE bool envoy_config_route_v3_RouteConfiguration_add_request_headers_to_remove(envoy_config_route_v3_RouteConfiguration *msg, upb_strview val, upb_arena *arena) { - return _upb_array_append_accessor2(msg, UPB_SIZE(40, 80), UPB_SIZE(3, 4), &val, + return _upb_array_append_accessor2(msg, UPB_SIZE(44, 88), UPB_SIZE(3, 4), &val, arena); } UPB_INLINE void envoy_config_route_v3_RouteConfiguration_set_vhds(envoy_config_route_v3_RouteConfiguration *msg, envoy_config_route_v3_Vhds* value) { @@ -173,6 +177,19 @@ UPB_INLINE struct envoy_config_route_v3_Vhds* envoy_config_route_v3_RouteConfigu UPB_INLINE void envoy_config_route_v3_RouteConfiguration_set_most_specific_header_mutations_wins(envoy_config_route_v3_RouteConfiguration *msg, bool value) { *UPB_PTR_AT(msg, UPB_SIZE(1, 1), bool) = value; } +UPB_INLINE void envoy_config_route_v3_RouteConfiguration_set_max_direct_response_body_size_bytes(envoy_config_route_v3_RouteConfiguration *msg, struct google_protobuf_UInt32Value* value) { + _upb_sethas(msg, 3); + *UPB_PTR_AT(msg, UPB_SIZE(20, 40), struct google_protobuf_UInt32Value*) = value; +} +UPB_INLINE struct google_protobuf_UInt32Value* envoy_config_route_v3_RouteConfiguration_mutable_max_direct_response_body_size_bytes(envoy_config_route_v3_RouteConfiguration *msg, upb_arena *arena) { + struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_config_route_v3_RouteConfiguration_max_direct_response_body_size_bytes(msg); + if (sub == NULL) { + sub = (struct google_protobuf_UInt32Value*)_upb_msg_new(&google_protobuf_UInt32Value_msginit, arena); + if (!sub) return NULL; + envoy_config_route_v3_RouteConfiguration_set_max_direct_response_body_size_bytes(msg, sub); + } + return sub; +} /* envoy.config.route.v3.Vhds */ diff --git a/grpc/src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.c b/grpc/src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.c index 61efffb6..a5c1d65d 100644 --- a/grpc/src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.c +++ b/grpc/src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.c @@ -20,7 +20,6 @@ #include "envoy/type/v3/range.upb.h" #include "google/protobuf/any.upb.h" #include "google/protobuf/duration.upb.h" -#include "google/protobuf/struct.upb.h" #include "google/protobuf/wrappers.upb.h" #include "envoy/annotations/deprecation.upb.h" #include "udpa/annotations/migrate.upb.h" @@ -467,14 +466,15 @@ static const upb_msglayout *const envoy_config_route_v3_RouteAction_UpgradeConfi &envoy_config_core_v3_ProxyProtocolConfig_msginit, }; -static const upb_msglayout_field envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig__fields[1] = { +static const upb_msglayout_field envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig__fields[2] = { {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, + {2, UPB_SIZE(1, 1), 0, 0, 8, 1}, }; const upb_msglayout envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_msginit = { &envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_submsgs[0], &envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig__fields[0], - UPB_SIZE(8, 16), 1, false, 255, + UPB_SIZE(8, 16), 2, false, 255, }; static const upb_msglayout *const envoy_config_route_v3_RouteAction_MaxStreamDuration_submsgs[1] = { @@ -612,7 +612,11 @@ const upb_msglayout envoy_config_route_v3_HedgePolicy_msginit = { UPB_SIZE(16, 24), 3, false, 255, }; -static const upb_msglayout_field envoy_config_route_v3_RedirectAction__fields[8] = { +static const upb_msglayout *const envoy_config_route_v3_RedirectAction_submsgs[1] = { + &envoy_type_matcher_v3_RegexMatchAndSubstitute_msginit, +}; + +static const upb_msglayout_field envoy_config_route_v3_RedirectAction__fields[9] = { {1, UPB_SIZE(12, 16), 0, 0, 9, 1}, {2, UPB_SIZE(20, 32), UPB_SIZE(-29, -49), 0, 9, 1}, {3, UPB_SIZE(0, 0), 0, 0, 14, 1}, @@ -621,12 +625,13 @@ static const upb_msglayout_field envoy_config_route_v3_RedirectAction__fields[8] {6, UPB_SIZE(8, 8), 0, 0, 8, 1}, {7, UPB_SIZE(32, 56), UPB_SIZE(-41, -73), 0, 9, 1}, {8, UPB_SIZE(4, 4), 0, 0, 13, 1}, + {9, UPB_SIZE(20, 32), UPB_SIZE(-29, -49), 0, 11, 1}, }; const upb_msglayout envoy_config_route_v3_RedirectAction_msginit = { - NULL, + &envoy_config_route_v3_RedirectAction_submsgs[0], &envoy_config_route_v3_RedirectAction__fields[0], - UPB_SIZE(48, 80), 8, false, 255, + UPB_SIZE(48, 80), 9, false, 255, }; static const upb_msglayout *const envoy_config_route_v3_DirectResponseAction_submsgs[1] = { @@ -711,30 +716,34 @@ const upb_msglayout envoy_config_route_v3_RateLimit_msginit = { UPB_SIZE(24, 48), 4, false, 255, }; -static const upb_msglayout *const envoy_config_route_v3_RateLimit_Action_submsgs[7] = { +static const upb_msglayout *const envoy_config_route_v3_RateLimit_Action_submsgs[9] = { + &envoy_config_core_v3_TypedExtensionConfig_msginit, &envoy_config_route_v3_RateLimit_Action_DestinationCluster_msginit, &envoy_config_route_v3_RateLimit_Action_DynamicMetaData_msginit, &envoy_config_route_v3_RateLimit_Action_GenericKey_msginit, &envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_msginit, + &envoy_config_route_v3_RateLimit_Action_MetaData_msginit, &envoy_config_route_v3_RateLimit_Action_RemoteAddress_msginit, &envoy_config_route_v3_RateLimit_Action_RequestHeaders_msginit, &envoy_config_route_v3_RateLimit_Action_SourceCluster_msginit, }; -static const upb_msglayout_field envoy_config_route_v3_RateLimit_Action__fields[7] = { - {1, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 6, 11, 1}, - {2, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 11, 1}, - {3, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 5, 11, 1}, - {4, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 4, 11, 1}, - {5, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 2, 11, 1}, - {6, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 3, 11, 1}, - {7, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 1, 11, 1}, +static const upb_msglayout_field envoy_config_route_v3_RateLimit_Action__fields[9] = { + {1, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 8, 11, 1}, + {2, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 1, 11, 1}, + {3, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 7, 11, 1}, + {4, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 6, 11, 1}, + {5, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 3, 11, 1}, + {6, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 4, 11, 1}, + {7, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 2, 11, 1}, + {8, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 5, 11, 1}, + {9, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 11, 1}, }; const upb_msglayout envoy_config_route_v3_RateLimit_Action_msginit = { &envoy_config_route_v3_RateLimit_Action_submsgs[0], &envoy_config_route_v3_RateLimit_Action__fields[0], - UPB_SIZE(8, 16), 7, false, 255, + UPB_SIZE(8, 16), 9, false, 255, }; const upb_msglayout envoy_config_route_v3_RateLimit_Action_SourceCluster_msginit = { @@ -811,6 +820,23 @@ const upb_msglayout envoy_config_route_v3_RateLimit_Action_DynamicMetaData_msgin UPB_SIZE(24, 48), 3, false, 255, }; +static const upb_msglayout *const envoy_config_route_v3_RateLimit_Action_MetaData_submsgs[1] = { + &envoy_type_metadata_v3_MetadataKey_msginit, +}; + +static const upb_msglayout_field envoy_config_route_v3_RateLimit_Action_MetaData__fields[4] = { + {1, UPB_SIZE(8, 8), 0, 0, 9, 1}, + {2, UPB_SIZE(24, 40), 1, 0, 11, 1}, + {3, UPB_SIZE(16, 24), 0, 0, 9, 1}, + {4, UPB_SIZE(4, 4), 0, 0, 14, 1}, +}; + +const upb_msglayout envoy_config_route_v3_RateLimit_Action_MetaData_msginit = { + &envoy_config_route_v3_RateLimit_Action_MetaData_submsgs[0], + &envoy_config_route_v3_RateLimit_Action_MetaData__fields[0], + UPB_SIZE(32, 48), 4, false, 255, +}; + static const upb_msglayout *const envoy_config_route_v3_RateLimit_Override_submsgs[1] = { &envoy_config_route_v3_RateLimit_Override_DynamicMetadata_msginit, }; @@ -896,5 +922,20 @@ const upb_msglayout envoy_config_route_v3_InternalRedirectPolicy_msginit = { UPB_SIZE(16, 32), 4, false, 255, }; +static const upb_msglayout *const envoy_config_route_v3_FilterConfig_submsgs[1] = { + &google_protobuf_Any_msginit, +}; + +static const upb_msglayout_field envoy_config_route_v3_FilterConfig__fields[2] = { + {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, + {2, UPB_SIZE(1, 1), 0, 0, 8, 1}, +}; + +const upb_msglayout envoy_config_route_v3_FilterConfig_msginit = { + &envoy_config_route_v3_FilterConfig_submsgs[0], + &envoy_config_route_v3_FilterConfig__fields[0], + UPB_SIZE(8, 16), 2, false, 255, +}; + #include "upb/port_undef.inc" diff --git a/grpc/src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.h b/grpc/src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.h index 863404e6..4f98c015 100644 --- a/grpc/src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.h +++ b/grpc/src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.h @@ -65,11 +65,13 @@ struct envoy_config_route_v3_RateLimit_Action_RemoteAddress; struct envoy_config_route_v3_RateLimit_Action_GenericKey; struct envoy_config_route_v3_RateLimit_Action_HeaderValueMatch; struct envoy_config_route_v3_RateLimit_Action_DynamicMetaData; +struct envoy_config_route_v3_RateLimit_Action_MetaData; struct envoy_config_route_v3_RateLimit_Override; struct envoy_config_route_v3_RateLimit_Override_DynamicMetadata; struct envoy_config_route_v3_HeaderMatcher; struct envoy_config_route_v3_QueryParameterMatcher; struct envoy_config_route_v3_InternalRedirectPolicy; +struct envoy_config_route_v3_FilterConfig; typedef struct envoy_config_route_v3_VirtualHost envoy_config_route_v3_VirtualHost; typedef struct envoy_config_route_v3_VirtualHost_TypedPerFilterConfigEntry envoy_config_route_v3_VirtualHost_TypedPerFilterConfigEntry; typedef struct envoy_config_route_v3_FilterAction envoy_config_route_v3_FilterAction; @@ -115,11 +117,13 @@ typedef struct envoy_config_route_v3_RateLimit_Action_RemoteAddress envoy_config typedef struct envoy_config_route_v3_RateLimit_Action_GenericKey envoy_config_route_v3_RateLimit_Action_GenericKey; typedef struct envoy_config_route_v3_RateLimit_Action_HeaderValueMatch envoy_config_route_v3_RateLimit_Action_HeaderValueMatch; typedef struct envoy_config_route_v3_RateLimit_Action_DynamicMetaData envoy_config_route_v3_RateLimit_Action_DynamicMetaData; +typedef struct envoy_config_route_v3_RateLimit_Action_MetaData envoy_config_route_v3_RateLimit_Action_MetaData; typedef struct envoy_config_route_v3_RateLimit_Override envoy_config_route_v3_RateLimit_Override; typedef struct envoy_config_route_v3_RateLimit_Override_DynamicMetadata envoy_config_route_v3_RateLimit_Override_DynamicMetadata; typedef struct envoy_config_route_v3_HeaderMatcher envoy_config_route_v3_HeaderMatcher; typedef struct envoy_config_route_v3_QueryParameterMatcher envoy_config_route_v3_QueryParameterMatcher; typedef struct envoy_config_route_v3_InternalRedirectPolicy envoy_config_route_v3_InternalRedirectPolicy; +typedef struct envoy_config_route_v3_FilterConfig envoy_config_route_v3_FilterConfig; extern const upb_msglayout envoy_config_route_v3_VirtualHost_msginit; extern const upb_msglayout envoy_config_route_v3_VirtualHost_TypedPerFilterConfigEntry_msginit; extern const upb_msglayout envoy_config_route_v3_FilterAction_msginit; @@ -165,11 +169,13 @@ extern const upb_msglayout envoy_config_route_v3_RateLimit_Action_RemoteAddress_ extern const upb_msglayout envoy_config_route_v3_RateLimit_Action_GenericKey_msginit; extern const upb_msglayout envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_msginit; extern const upb_msglayout envoy_config_route_v3_RateLimit_Action_DynamicMetaData_msginit; +extern const upb_msglayout envoy_config_route_v3_RateLimit_Action_MetaData_msginit; extern const upb_msglayout envoy_config_route_v3_RateLimit_Override_msginit; extern const upb_msglayout envoy_config_route_v3_RateLimit_Override_DynamicMetadata_msginit; extern const upb_msglayout envoy_config_route_v3_HeaderMatcher_msginit; extern const upb_msglayout envoy_config_route_v3_QueryParameterMatcher_msginit; extern const upb_msglayout envoy_config_route_v3_InternalRedirectPolicy_msginit; +extern const upb_msglayout envoy_config_route_v3_FilterConfig_msginit; struct envoy_config_core_v3_DataSource; struct envoy_config_core_v3_HeaderValueOption; struct envoy_config_core_v3_Metadata; @@ -206,6 +212,11 @@ extern const upb_msglayout google_protobuf_Duration_msginit; extern const upb_msglayout google_protobuf_UInt32Value_msginit; typedef enum { + envoy_config_route_v3_RateLimit_Action_MetaData_DYNAMIC = 0, + envoy_config_route_v3_RateLimit_Action_MetaData_ROUTE_ENTRY = 1 +} envoy_config_route_v3_RateLimit_Action_MetaData_Source; + +typedef enum { envoy_config_route_v3_RedirectAction_MOVED_PERMANENTLY = 0, envoy_config_route_v3_RedirectAction_FOUND = 1, envoy_config_route_v3_RedirectAction_SEE_OTHER = 2, @@ -2102,6 +2113,7 @@ UPB_INLINE char *envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_s UPB_INLINE bool envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_has_proxy_protocol_config(const envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig *msg) { return _upb_hasbit(msg, 1); } UPB_INLINE const struct envoy_config_core_v3_ProxyProtocolConfig* envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_proxy_protocol_config(const envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), const struct envoy_config_core_v3_ProxyProtocolConfig*); } +UPB_INLINE bool envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_allow_post(const envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(1, 1), bool); } UPB_INLINE void envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_set_proxy_protocol_config(envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig *msg, struct envoy_config_core_v3_ProxyProtocolConfig* value) { _upb_sethas(msg, 1); @@ -2116,6 +2128,9 @@ UPB_INLINE struct envoy_config_core_v3_ProxyProtocolConfig* envoy_config_route_v } return sub; } +UPB_INLINE void envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig_set_allow_post(envoy_config_route_v3_RouteAction_UpgradeConfig_ConnectConfig *msg, bool value) { + *UPB_PTR_AT(msg, UPB_SIZE(1, 1), bool) = value; +} /* envoy.config.route.v3.RouteAction.MaxStreamDuration */ @@ -2657,6 +2672,7 @@ UPB_INLINE envoy_config_route_v3_RedirectAction_scheme_rewrite_specifier_oneofca typedef enum { envoy_config_route_v3_RedirectAction_path_rewrite_specifier_path_redirect = 2, envoy_config_route_v3_RedirectAction_path_rewrite_specifier_prefix_rewrite = 5, + envoy_config_route_v3_RedirectAction_path_rewrite_specifier_regex_rewrite = 9, envoy_config_route_v3_RedirectAction_path_rewrite_specifier_NOT_SET = 0 } envoy_config_route_v3_RedirectAction_path_rewrite_specifier_oneofcases; UPB_INLINE envoy_config_route_v3_RedirectAction_path_rewrite_specifier_oneofcases envoy_config_route_v3_RedirectAction_path_rewrite_specifier_case(const envoy_config_route_v3_RedirectAction* msg) { return (envoy_config_route_v3_RedirectAction_path_rewrite_specifier_oneofcases)*UPB_PTR_AT(msg, UPB_SIZE(28, 48), int32_t); } @@ -2673,6 +2689,8 @@ UPB_INLINE bool envoy_config_route_v3_RedirectAction_strip_query(const envoy_con UPB_INLINE bool envoy_config_route_v3_RedirectAction_has_scheme_redirect(const envoy_config_route_v3_RedirectAction *msg) { return _upb_getoneofcase(msg, UPB_SIZE(40, 72)) == 7; } UPB_INLINE upb_strview envoy_config_route_v3_RedirectAction_scheme_redirect(const envoy_config_route_v3_RedirectAction *msg) { return UPB_READ_ONEOF(msg, upb_strview, UPB_SIZE(32, 56), UPB_SIZE(40, 72), 7, upb_strview_make("", strlen(""))); } UPB_INLINE uint32_t envoy_config_route_v3_RedirectAction_port_redirect(const envoy_config_route_v3_RedirectAction *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 4), uint32_t); } +UPB_INLINE bool envoy_config_route_v3_RedirectAction_has_regex_rewrite(const envoy_config_route_v3_RedirectAction *msg) { return _upb_getoneofcase(msg, UPB_SIZE(28, 48)) == 9; } +UPB_INLINE const struct envoy_type_matcher_v3_RegexMatchAndSubstitute* envoy_config_route_v3_RedirectAction_regex_rewrite(const envoy_config_route_v3_RedirectAction *msg) { return UPB_READ_ONEOF(msg, const struct envoy_type_matcher_v3_RegexMatchAndSubstitute*, UPB_SIZE(20, 32), UPB_SIZE(28, 48), 9, NULL); } UPB_INLINE void envoy_config_route_v3_RedirectAction_set_host_redirect(envoy_config_route_v3_RedirectAction *msg, upb_strview value) { *UPB_PTR_AT(msg, UPB_SIZE(12, 16), upb_strview) = value; @@ -2698,6 +2716,18 @@ UPB_INLINE void envoy_config_route_v3_RedirectAction_set_scheme_redirect(envoy_c UPB_INLINE void envoy_config_route_v3_RedirectAction_set_port_redirect(envoy_config_route_v3_RedirectAction *msg, uint32_t value) { *UPB_PTR_AT(msg, UPB_SIZE(4, 4), uint32_t) = value; } +UPB_INLINE void envoy_config_route_v3_RedirectAction_set_regex_rewrite(envoy_config_route_v3_RedirectAction *msg, struct envoy_type_matcher_v3_RegexMatchAndSubstitute* value) { + UPB_WRITE_ONEOF(msg, struct envoy_type_matcher_v3_RegexMatchAndSubstitute*, UPB_SIZE(20, 32), value, UPB_SIZE(28, 48), 9); +} +UPB_INLINE struct envoy_type_matcher_v3_RegexMatchAndSubstitute* envoy_config_route_v3_RedirectAction_mutable_regex_rewrite(envoy_config_route_v3_RedirectAction *msg, upb_arena *arena) { + struct envoy_type_matcher_v3_RegexMatchAndSubstitute* sub = (struct envoy_type_matcher_v3_RegexMatchAndSubstitute*)envoy_config_route_v3_RedirectAction_regex_rewrite(msg); + if (sub == NULL) { + sub = (struct envoy_type_matcher_v3_RegexMatchAndSubstitute*)_upb_msg_new(&envoy_type_matcher_v3_RegexMatchAndSubstitute_msginit, arena); + if (!sub) return NULL; + envoy_config_route_v3_RedirectAction_set_regex_rewrite(msg, sub); + } + return sub; +} /* envoy.config.route.v3.DirectResponseAction */ @@ -3003,6 +3033,8 @@ typedef enum { envoy_config_route_v3_RateLimit_Action_action_specifier_generic_key = 5, envoy_config_route_v3_RateLimit_Action_action_specifier_header_value_match = 6, envoy_config_route_v3_RateLimit_Action_action_specifier_dynamic_metadata = 7, + envoy_config_route_v3_RateLimit_Action_action_specifier_metadata = 8, + envoy_config_route_v3_RateLimit_Action_action_specifier_extension = 9, envoy_config_route_v3_RateLimit_Action_action_specifier_NOT_SET = 0 } envoy_config_route_v3_RateLimit_Action_action_specifier_oneofcases; UPB_INLINE envoy_config_route_v3_RateLimit_Action_action_specifier_oneofcases envoy_config_route_v3_RateLimit_Action_action_specifier_case(const envoy_config_route_v3_RateLimit_Action* msg) { return (envoy_config_route_v3_RateLimit_Action_action_specifier_oneofcases)*UPB_PTR_AT(msg, UPB_SIZE(4, 8), int32_t); } @@ -3021,6 +3053,10 @@ UPB_INLINE bool envoy_config_route_v3_RateLimit_Action_has_header_value_match(co UPB_INLINE const envoy_config_route_v3_RateLimit_Action_HeaderValueMatch* envoy_config_route_v3_RateLimit_Action_header_value_match(const envoy_config_route_v3_RateLimit_Action *msg) { return UPB_READ_ONEOF(msg, const envoy_config_route_v3_RateLimit_Action_HeaderValueMatch*, UPB_SIZE(0, 0), UPB_SIZE(4, 8), 6, NULL); } UPB_INLINE bool envoy_config_route_v3_RateLimit_Action_has_dynamic_metadata(const envoy_config_route_v3_RateLimit_Action *msg) { return _upb_getoneofcase(msg, UPB_SIZE(4, 8)) == 7; } UPB_INLINE const envoy_config_route_v3_RateLimit_Action_DynamicMetaData* envoy_config_route_v3_RateLimit_Action_dynamic_metadata(const envoy_config_route_v3_RateLimit_Action *msg) { return UPB_READ_ONEOF(msg, const envoy_config_route_v3_RateLimit_Action_DynamicMetaData*, UPB_SIZE(0, 0), UPB_SIZE(4, 8), 7, NULL); } +UPB_INLINE bool envoy_config_route_v3_RateLimit_Action_has_metadata(const envoy_config_route_v3_RateLimit_Action *msg) { return _upb_getoneofcase(msg, UPB_SIZE(4, 8)) == 8; } +UPB_INLINE const envoy_config_route_v3_RateLimit_Action_MetaData* envoy_config_route_v3_RateLimit_Action_metadata(const envoy_config_route_v3_RateLimit_Action *msg) { return UPB_READ_ONEOF(msg, const envoy_config_route_v3_RateLimit_Action_MetaData*, UPB_SIZE(0, 0), UPB_SIZE(4, 8), 8, NULL); } +UPB_INLINE bool envoy_config_route_v3_RateLimit_Action_has_extension(const envoy_config_route_v3_RateLimit_Action *msg) { return _upb_getoneofcase(msg, UPB_SIZE(4, 8)) == 9; } +UPB_INLINE const struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_route_v3_RateLimit_Action_extension(const envoy_config_route_v3_RateLimit_Action *msg) { return UPB_READ_ONEOF(msg, const struct envoy_config_core_v3_TypedExtensionConfig*, UPB_SIZE(0, 0), UPB_SIZE(4, 8), 9, NULL); } UPB_INLINE void envoy_config_route_v3_RateLimit_Action_set_source_cluster(envoy_config_route_v3_RateLimit_Action *msg, envoy_config_route_v3_RateLimit_Action_SourceCluster* value) { UPB_WRITE_ONEOF(msg, envoy_config_route_v3_RateLimit_Action_SourceCluster*, UPB_SIZE(0, 0), value, UPB_SIZE(4, 8), 1); @@ -3106,6 +3142,30 @@ UPB_INLINE struct envoy_config_route_v3_RateLimit_Action_DynamicMetaData* envoy_ } return sub; } +UPB_INLINE void envoy_config_route_v3_RateLimit_Action_set_metadata(envoy_config_route_v3_RateLimit_Action *msg, envoy_config_route_v3_RateLimit_Action_MetaData* value) { + UPB_WRITE_ONEOF(msg, envoy_config_route_v3_RateLimit_Action_MetaData*, UPB_SIZE(0, 0), value, UPB_SIZE(4, 8), 8); +} +UPB_INLINE struct envoy_config_route_v3_RateLimit_Action_MetaData* envoy_config_route_v3_RateLimit_Action_mutable_metadata(envoy_config_route_v3_RateLimit_Action *msg, upb_arena *arena) { + struct envoy_config_route_v3_RateLimit_Action_MetaData* sub = (struct envoy_config_route_v3_RateLimit_Action_MetaData*)envoy_config_route_v3_RateLimit_Action_metadata(msg); + if (sub == NULL) { + sub = (struct envoy_config_route_v3_RateLimit_Action_MetaData*)_upb_msg_new(&envoy_config_route_v3_RateLimit_Action_MetaData_msginit, arena); + if (!sub) return NULL; + envoy_config_route_v3_RateLimit_Action_set_metadata(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_config_route_v3_RateLimit_Action_set_extension(envoy_config_route_v3_RateLimit_Action *msg, struct envoy_config_core_v3_TypedExtensionConfig* value) { + UPB_WRITE_ONEOF(msg, struct envoy_config_core_v3_TypedExtensionConfig*, UPB_SIZE(0, 0), value, UPB_SIZE(4, 8), 9); +} +UPB_INLINE struct envoy_config_core_v3_TypedExtensionConfig* envoy_config_route_v3_RateLimit_Action_mutable_extension(envoy_config_route_v3_RateLimit_Action *msg, upb_arena *arena) { + struct envoy_config_core_v3_TypedExtensionConfig* sub = (struct envoy_config_core_v3_TypedExtensionConfig*)envoy_config_route_v3_RateLimit_Action_extension(msg); + if (sub == NULL) { + sub = (struct envoy_config_core_v3_TypedExtensionConfig*)_upb_msg_new(&envoy_config_core_v3_TypedExtensionConfig_msginit, arena); + if (!sub) return NULL; + envoy_config_route_v3_RateLimit_Action_set_extension(msg, sub); + } + return sub; +} /* envoy.config.route.v3.RateLimit.Action.SourceCluster */ @@ -3338,6 +3398,55 @@ UPB_INLINE void envoy_config_route_v3_RateLimit_Action_DynamicMetaData_set_defau *UPB_PTR_AT(msg, UPB_SIZE(12, 24), upb_strview) = value; } +/* envoy.config.route.v3.RateLimit.Action.MetaData */ + +UPB_INLINE envoy_config_route_v3_RateLimit_Action_MetaData *envoy_config_route_v3_RateLimit_Action_MetaData_new(upb_arena *arena) { + return (envoy_config_route_v3_RateLimit_Action_MetaData *)_upb_msg_new(&envoy_config_route_v3_RateLimit_Action_MetaData_msginit, arena); +} +UPB_INLINE envoy_config_route_v3_RateLimit_Action_MetaData *envoy_config_route_v3_RateLimit_Action_MetaData_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_config_route_v3_RateLimit_Action_MetaData *ret = envoy_config_route_v3_RateLimit_Action_MetaData_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_MetaData_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_config_route_v3_RateLimit_Action_MetaData *envoy_config_route_v3_RateLimit_Action_MetaData_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_config_route_v3_RateLimit_Action_MetaData *ret = envoy_config_route_v3_RateLimit_Action_MetaData_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_RateLimit_Action_MetaData_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_config_route_v3_RateLimit_Action_MetaData_serialize(const envoy_config_route_v3_RateLimit_Action_MetaData *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_config_route_v3_RateLimit_Action_MetaData_msginit, arena, len); +} + +UPB_INLINE upb_strview envoy_config_route_v3_RateLimit_Action_MetaData_descriptor_key(const envoy_config_route_v3_RateLimit_Action_MetaData *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(8, 8), upb_strview); } +UPB_INLINE bool envoy_config_route_v3_RateLimit_Action_MetaData_has_metadata_key(const envoy_config_route_v3_RateLimit_Action_MetaData *msg) { return _upb_hasbit(msg, 1); } +UPB_INLINE const struct envoy_type_metadata_v3_MetadataKey* envoy_config_route_v3_RateLimit_Action_MetaData_metadata_key(const envoy_config_route_v3_RateLimit_Action_MetaData *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(24, 40), const struct envoy_type_metadata_v3_MetadataKey*); } +UPB_INLINE upb_strview envoy_config_route_v3_RateLimit_Action_MetaData_default_value(const envoy_config_route_v3_RateLimit_Action_MetaData *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(16, 24), upb_strview); } +UPB_INLINE int32_t envoy_config_route_v3_RateLimit_Action_MetaData_source(const envoy_config_route_v3_RateLimit_Action_MetaData *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t); } + +UPB_INLINE void envoy_config_route_v3_RateLimit_Action_MetaData_set_descriptor_key(envoy_config_route_v3_RateLimit_Action_MetaData *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(8, 8), upb_strview) = value; +} +UPB_INLINE void envoy_config_route_v3_RateLimit_Action_MetaData_set_metadata_key(envoy_config_route_v3_RateLimit_Action_MetaData *msg, struct envoy_type_metadata_v3_MetadataKey* value) { + _upb_sethas(msg, 1); + *UPB_PTR_AT(msg, UPB_SIZE(24, 40), struct envoy_type_metadata_v3_MetadataKey*) = value; +} +UPB_INLINE struct envoy_type_metadata_v3_MetadataKey* envoy_config_route_v3_RateLimit_Action_MetaData_mutable_metadata_key(envoy_config_route_v3_RateLimit_Action_MetaData *msg, upb_arena *arena) { + struct envoy_type_metadata_v3_MetadataKey* sub = (struct envoy_type_metadata_v3_MetadataKey*)envoy_config_route_v3_RateLimit_Action_MetaData_metadata_key(msg); + if (sub == NULL) { + sub = (struct envoy_type_metadata_v3_MetadataKey*)_upb_msg_new(&envoy_type_metadata_v3_MetadataKey_msginit, arena); + if (!sub) return NULL; + envoy_config_route_v3_RateLimit_Action_MetaData_set_metadata_key(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_config_route_v3_RateLimit_Action_MetaData_set_default_value(envoy_config_route_v3_RateLimit_Action_MetaData *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(16, 24), upb_strview) = value; +} +UPB_INLINE void envoy_config_route_v3_RateLimit_Action_MetaData_set_source(envoy_config_route_v3_RateLimit_Action_MetaData *msg, int32_t value) { + *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t) = value; +} + /* envoy.config.route.v3.RateLimit.Override */ UPB_INLINE envoy_config_route_v3_RateLimit_Override *envoy_config_route_v3_RateLimit_Override_new(upb_arena *arena) { @@ -3631,6 +3740,47 @@ UPB_INLINE void envoy_config_route_v3_InternalRedirectPolicy_set_allow_cross_sch *UPB_PTR_AT(msg, UPB_SIZE(1, 1), bool) = value; } +/* envoy.config.route.v3.FilterConfig */ + +UPB_INLINE envoy_config_route_v3_FilterConfig *envoy_config_route_v3_FilterConfig_new(upb_arena *arena) { + return (envoy_config_route_v3_FilterConfig *)_upb_msg_new(&envoy_config_route_v3_FilterConfig_msginit, arena); +} +UPB_INLINE envoy_config_route_v3_FilterConfig *envoy_config_route_v3_FilterConfig_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_config_route_v3_FilterConfig *ret = envoy_config_route_v3_FilterConfig_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_config_route_v3_FilterConfig_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_config_route_v3_FilterConfig *envoy_config_route_v3_FilterConfig_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_config_route_v3_FilterConfig *ret = envoy_config_route_v3_FilterConfig_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_config_route_v3_FilterConfig_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_config_route_v3_FilterConfig_serialize(const envoy_config_route_v3_FilterConfig *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_config_route_v3_FilterConfig_msginit, arena, len); +} + +UPB_INLINE bool envoy_config_route_v3_FilterConfig_has_config(const envoy_config_route_v3_FilterConfig *msg) { return _upb_hasbit(msg, 1); } +UPB_INLINE const struct google_protobuf_Any* envoy_config_route_v3_FilterConfig_config(const envoy_config_route_v3_FilterConfig *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), const struct google_protobuf_Any*); } +UPB_INLINE bool envoy_config_route_v3_FilterConfig_is_optional(const envoy_config_route_v3_FilterConfig *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(1, 1), bool); } + +UPB_INLINE void envoy_config_route_v3_FilterConfig_set_config(envoy_config_route_v3_FilterConfig *msg, struct google_protobuf_Any* value) { + _upb_sethas(msg, 1); + *UPB_PTR_AT(msg, UPB_SIZE(4, 8), struct google_protobuf_Any*) = value; +} +UPB_INLINE struct google_protobuf_Any* envoy_config_route_v3_FilterConfig_mutable_config(envoy_config_route_v3_FilterConfig *msg, upb_arena *arena) { + struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_config_route_v3_FilterConfig_config(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Any*)_upb_msg_new(&google_protobuf_Any_msginit, arena); + if (!sub) return NULL; + envoy_config_route_v3_FilterConfig_set_config(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_config_route_v3_FilterConfig_set_is_optional(envoy_config_route_v3_FilterConfig *msg, bool value) { + *UPB_PTR_AT(msg, UPB_SIZE(1, 1), bool) = value; +} + #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/grpc/src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.c b/grpc/src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.c index 6729533f..52cb6b72 100644 --- a/grpc/src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.c +++ b/grpc/src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.c @@ -10,7 +10,6 @@ #include "upb/msg.h" #include "envoy/config/trace/v3/http_tracer.upb.h" #include "google/protobuf/any.upb.h" -#include "google/protobuf/struct.upb.h" #include "udpa/annotations/status.upb.h" #include "udpa/annotations/versioning.upb.h" #include "validate/validate.upb.h" diff --git a/grpc/src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3/cluster.upb.c b/grpc/src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3/cluster.upb.c new file mode 100644 index 00000000..308e8b53 --- /dev/null +++ b/grpc/src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3/cluster.upb.c @@ -0,0 +1,29 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * envoy/extensions/clusters/aggregate/v3/cluster.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#include <stddef.h> +#include "upb/msg.h" +#include "envoy/extensions/clusters/aggregate/v3/cluster.upb.h" +#include "udpa/annotations/status.upb.h" +#include "udpa/annotations/versioning.upb.h" +#include "validate/validate.upb.h" + +#include "upb/port_def.inc" + +static const upb_msglayout_field envoy_extensions_clusters_aggregate_v3_ClusterConfig__fields[1] = { + {1, UPB_SIZE(0, 0), 0, 0, 9, 3}, +}; + +const upb_msglayout envoy_extensions_clusters_aggregate_v3_ClusterConfig_msginit = { + NULL, + &envoy_extensions_clusters_aggregate_v3_ClusterConfig__fields[0], + UPB_SIZE(8, 8), 1, false, 255, +}; + +#include "upb/port_undef.inc" + diff --git a/grpc/src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3/cluster.upb.h b/grpc/src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3/cluster.upb.h new file mode 100644 index 00000000..ffa4ccbc --- /dev/null +++ b/grpc/src/core/ext/upb-generated/envoy/extensions/clusters/aggregate/v3/cluster.upb.h @@ -0,0 +1,67 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * envoy/extensions/clusters/aggregate/v3/cluster.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#ifndef ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPB_H_ +#define ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPB_H_ + +#include "upb/msg.h" +#include "upb/decode.h" +#include "upb/decode_fast.h" +#include "upb/encode.h" + +#include "upb/port_def.inc" + +#ifdef __cplusplus +extern "C" { +#endif + +struct envoy_extensions_clusters_aggregate_v3_ClusterConfig; +typedef struct envoy_extensions_clusters_aggregate_v3_ClusterConfig envoy_extensions_clusters_aggregate_v3_ClusterConfig; +extern const upb_msglayout envoy_extensions_clusters_aggregate_v3_ClusterConfig_msginit; + + +/* envoy.extensions.clusters.aggregate.v3.ClusterConfig */ + +UPB_INLINE envoy_extensions_clusters_aggregate_v3_ClusterConfig *envoy_extensions_clusters_aggregate_v3_ClusterConfig_new(upb_arena *arena) { + return (envoy_extensions_clusters_aggregate_v3_ClusterConfig *)_upb_msg_new(&envoy_extensions_clusters_aggregate_v3_ClusterConfig_msginit, arena); +} +UPB_INLINE envoy_extensions_clusters_aggregate_v3_ClusterConfig *envoy_extensions_clusters_aggregate_v3_ClusterConfig_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_extensions_clusters_aggregate_v3_ClusterConfig *ret = envoy_extensions_clusters_aggregate_v3_ClusterConfig_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_extensions_clusters_aggregate_v3_ClusterConfig_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_extensions_clusters_aggregate_v3_ClusterConfig *envoy_extensions_clusters_aggregate_v3_ClusterConfig_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_extensions_clusters_aggregate_v3_ClusterConfig *ret = envoy_extensions_clusters_aggregate_v3_ClusterConfig_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_extensions_clusters_aggregate_v3_ClusterConfig_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_extensions_clusters_aggregate_v3_ClusterConfig_serialize(const envoy_extensions_clusters_aggregate_v3_ClusterConfig *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_extensions_clusters_aggregate_v3_ClusterConfig_msginit, arena, len); +} + +UPB_INLINE upb_strview const* envoy_extensions_clusters_aggregate_v3_ClusterConfig_clusters(const envoy_extensions_clusters_aggregate_v3_ClusterConfig *msg, size_t *len) { return (upb_strview const*)_upb_array_accessor(msg, UPB_SIZE(0, 0), len); } + +UPB_INLINE upb_strview* envoy_extensions_clusters_aggregate_v3_ClusterConfig_mutable_clusters(envoy_extensions_clusters_aggregate_v3_ClusterConfig *msg, size_t *len) { + return (upb_strview*)_upb_array_mutable_accessor(msg, UPB_SIZE(0, 0), len); +} +UPB_INLINE upb_strview* envoy_extensions_clusters_aggregate_v3_ClusterConfig_resize_clusters(envoy_extensions_clusters_aggregate_v3_ClusterConfig *msg, size_t len, upb_arena *arena) { + return (upb_strview*)_upb_array_resize_accessor2(msg, UPB_SIZE(0, 0), len, UPB_SIZE(3, 4), arena); +} +UPB_INLINE bool envoy_extensions_clusters_aggregate_v3_ClusterConfig_add_clusters(envoy_extensions_clusters_aggregate_v3_ClusterConfig *msg, upb_strview val, upb_arena *arena) { + return _upb_array_append_accessor2(msg, UPB_SIZE(0, 0), UPB_SIZE(3, 4), &val, + arena); +} + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#include "upb/port_undef.inc" + +#endif /* ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPB_H_ */ diff --git a/grpc/src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3/fault.upb.c b/grpc/src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3/fault.upb.c new file mode 100644 index 00000000..5f92b8d0 --- /dev/null +++ b/grpc/src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3/fault.upb.c @@ -0,0 +1,79 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * envoy/extensions/filters/common/fault/v3/fault.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#include <stddef.h> +#include "upb/msg.h" +#include "envoy/extensions/filters/common/fault/v3/fault.upb.h" +#include "envoy/type/v3/percent.upb.h" +#include "google/protobuf/duration.upb.h" +#include "udpa/annotations/status.upb.h" +#include "udpa/annotations/versioning.upb.h" +#include "validate/validate.upb.h" + +#include "upb/port_def.inc" + +static const upb_msglayout *const envoy_extensions_filters_common_fault_v3_FaultDelay_submsgs[3] = { + &envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay_msginit, + &envoy_type_v3_FractionalPercent_msginit, + &google_protobuf_Duration_msginit, +}; + +static const upb_msglayout_field envoy_extensions_filters_common_fault_v3_FaultDelay__fields[3] = { + {3, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 2, 11, 1}, + {4, UPB_SIZE(4, 8), 1, 1, 11, 1}, + {5, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 11, 1}, +}; + +const upb_msglayout envoy_extensions_filters_common_fault_v3_FaultDelay_msginit = { + &envoy_extensions_filters_common_fault_v3_FaultDelay_submsgs[0], + &envoy_extensions_filters_common_fault_v3_FaultDelay__fields[0], + UPB_SIZE(16, 32), 3, false, 255, +}; + +const upb_msglayout envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay_msginit = { + NULL, + NULL, + UPB_SIZE(0, 0), 0, false, 255, +}; + +static const upb_msglayout *const envoy_extensions_filters_common_fault_v3_FaultRateLimit_submsgs[3] = { + &envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_msginit, + &envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit_msginit, + &envoy_type_v3_FractionalPercent_msginit, +}; + +static const upb_msglayout_field envoy_extensions_filters_common_fault_v3_FaultRateLimit__fields[3] = { + {1, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 11, 1}, + {2, UPB_SIZE(4, 8), 1, 2, 11, 1}, + {3, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 1, 11, 1}, +}; + +const upb_msglayout envoy_extensions_filters_common_fault_v3_FaultRateLimit_msginit = { + &envoy_extensions_filters_common_fault_v3_FaultRateLimit_submsgs[0], + &envoy_extensions_filters_common_fault_v3_FaultRateLimit__fields[0], + UPB_SIZE(16, 32), 3, false, 255, +}; + +static const upb_msglayout_field envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit__fields[1] = { + {1, UPB_SIZE(0, 0), 0, 0, 4, 1}, +}; + +const upb_msglayout envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_msginit = { + NULL, + &envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit__fields[0], + UPB_SIZE(8, 8), 1, false, 255, +}; + +const upb_msglayout envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit_msginit = { + NULL, + NULL, + UPB_SIZE(0, 0), 0, false, 255, +}; + +#include "upb/port_undef.inc" + diff --git a/grpc/src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3/fault.upb.h b/grpc/src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3/fault.upb.h new file mode 100644 index 00000000..8c609170 --- /dev/null +++ b/grpc/src/core/ext/upb-generated/envoy/extensions/filters/common/fault/v3/fault.upb.h @@ -0,0 +1,268 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * envoy/extensions/filters/common/fault/v3/fault.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#ifndef ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPB_H_ +#define ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPB_H_ + +#include "upb/msg.h" +#include "upb/decode.h" +#include "upb/decode_fast.h" +#include "upb/encode.h" + +#include "upb/port_def.inc" + +#ifdef __cplusplus +extern "C" { +#endif + +struct envoy_extensions_filters_common_fault_v3_FaultDelay; +struct envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay; +struct envoy_extensions_filters_common_fault_v3_FaultRateLimit; +struct envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit; +struct envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit; +typedef struct envoy_extensions_filters_common_fault_v3_FaultDelay envoy_extensions_filters_common_fault_v3_FaultDelay; +typedef struct envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay; +typedef struct envoy_extensions_filters_common_fault_v3_FaultRateLimit envoy_extensions_filters_common_fault_v3_FaultRateLimit; +typedef struct envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit; +typedef struct envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit; +extern const upb_msglayout envoy_extensions_filters_common_fault_v3_FaultDelay_msginit; +extern const upb_msglayout envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay_msginit; +extern const upb_msglayout envoy_extensions_filters_common_fault_v3_FaultRateLimit_msginit; +extern const upb_msglayout envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_msginit; +extern const upb_msglayout envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit_msginit; +struct envoy_type_v3_FractionalPercent; +struct google_protobuf_Duration; +extern const upb_msglayout envoy_type_v3_FractionalPercent_msginit; +extern const upb_msglayout google_protobuf_Duration_msginit; + +typedef enum { + envoy_extensions_filters_common_fault_v3_FaultDelay_FIXED = 0 +} envoy_extensions_filters_common_fault_v3_FaultDelay_FaultDelayType; + + +/* envoy.extensions.filters.common.fault.v3.FaultDelay */ + +UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultDelay *envoy_extensions_filters_common_fault_v3_FaultDelay_new(upb_arena *arena) { + return (envoy_extensions_filters_common_fault_v3_FaultDelay *)_upb_msg_new(&envoy_extensions_filters_common_fault_v3_FaultDelay_msginit, arena); +} +UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultDelay *envoy_extensions_filters_common_fault_v3_FaultDelay_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_extensions_filters_common_fault_v3_FaultDelay *ret = envoy_extensions_filters_common_fault_v3_FaultDelay_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_extensions_filters_common_fault_v3_FaultDelay_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultDelay *envoy_extensions_filters_common_fault_v3_FaultDelay_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_extensions_filters_common_fault_v3_FaultDelay *ret = envoy_extensions_filters_common_fault_v3_FaultDelay_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_extensions_filters_common_fault_v3_FaultDelay_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_extensions_filters_common_fault_v3_FaultDelay_serialize(const envoy_extensions_filters_common_fault_v3_FaultDelay *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_extensions_filters_common_fault_v3_FaultDelay_msginit, arena, len); +} + +typedef enum { + envoy_extensions_filters_common_fault_v3_FaultDelay_fault_delay_secifier_fixed_delay = 3, + envoy_extensions_filters_common_fault_v3_FaultDelay_fault_delay_secifier_header_delay = 5, + envoy_extensions_filters_common_fault_v3_FaultDelay_fault_delay_secifier_NOT_SET = 0 +} envoy_extensions_filters_common_fault_v3_FaultDelay_fault_delay_secifier_oneofcases; +UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultDelay_fault_delay_secifier_oneofcases envoy_extensions_filters_common_fault_v3_FaultDelay_fault_delay_secifier_case(const envoy_extensions_filters_common_fault_v3_FaultDelay* msg) { return (envoy_extensions_filters_common_fault_v3_FaultDelay_fault_delay_secifier_oneofcases)*UPB_PTR_AT(msg, UPB_SIZE(12, 24), int32_t); } + +UPB_INLINE bool envoy_extensions_filters_common_fault_v3_FaultDelay_has_fixed_delay(const envoy_extensions_filters_common_fault_v3_FaultDelay *msg) { return _upb_getoneofcase(msg, UPB_SIZE(12, 24)) == 3; } +UPB_INLINE const struct google_protobuf_Duration* envoy_extensions_filters_common_fault_v3_FaultDelay_fixed_delay(const envoy_extensions_filters_common_fault_v3_FaultDelay *msg) { return UPB_READ_ONEOF(msg, const struct google_protobuf_Duration*, UPB_SIZE(8, 16), UPB_SIZE(12, 24), 3, NULL); } +UPB_INLINE bool envoy_extensions_filters_common_fault_v3_FaultDelay_has_percentage(const envoy_extensions_filters_common_fault_v3_FaultDelay *msg) { return _upb_hasbit(msg, 1); } +UPB_INLINE const struct envoy_type_v3_FractionalPercent* envoy_extensions_filters_common_fault_v3_FaultDelay_percentage(const envoy_extensions_filters_common_fault_v3_FaultDelay *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), const struct envoy_type_v3_FractionalPercent*); } +UPB_INLINE bool envoy_extensions_filters_common_fault_v3_FaultDelay_has_header_delay(const envoy_extensions_filters_common_fault_v3_FaultDelay *msg) { return _upb_getoneofcase(msg, UPB_SIZE(12, 24)) == 5; } +UPB_INLINE const envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay* envoy_extensions_filters_common_fault_v3_FaultDelay_header_delay(const envoy_extensions_filters_common_fault_v3_FaultDelay *msg) { return UPB_READ_ONEOF(msg, const envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay*, UPB_SIZE(8, 16), UPB_SIZE(12, 24), 5, NULL); } + +UPB_INLINE void envoy_extensions_filters_common_fault_v3_FaultDelay_set_fixed_delay(envoy_extensions_filters_common_fault_v3_FaultDelay *msg, struct google_protobuf_Duration* value) { + UPB_WRITE_ONEOF(msg, struct google_protobuf_Duration*, UPB_SIZE(8, 16), value, UPB_SIZE(12, 24), 3); +} +UPB_INLINE struct google_protobuf_Duration* envoy_extensions_filters_common_fault_v3_FaultDelay_mutable_fixed_delay(envoy_extensions_filters_common_fault_v3_FaultDelay *msg, upb_arena *arena) { + struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_extensions_filters_common_fault_v3_FaultDelay_fixed_delay(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Duration*)_upb_msg_new(&google_protobuf_Duration_msginit, arena); + if (!sub) return NULL; + envoy_extensions_filters_common_fault_v3_FaultDelay_set_fixed_delay(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_extensions_filters_common_fault_v3_FaultDelay_set_percentage(envoy_extensions_filters_common_fault_v3_FaultDelay *msg, struct envoy_type_v3_FractionalPercent* value) { + _upb_sethas(msg, 1); + *UPB_PTR_AT(msg, UPB_SIZE(4, 8), struct envoy_type_v3_FractionalPercent*) = value; +} +UPB_INLINE struct envoy_type_v3_FractionalPercent* envoy_extensions_filters_common_fault_v3_FaultDelay_mutable_percentage(envoy_extensions_filters_common_fault_v3_FaultDelay *msg, upb_arena *arena) { + struct envoy_type_v3_FractionalPercent* sub = (struct envoy_type_v3_FractionalPercent*)envoy_extensions_filters_common_fault_v3_FaultDelay_percentage(msg); + if (sub == NULL) { + sub = (struct envoy_type_v3_FractionalPercent*)_upb_msg_new(&envoy_type_v3_FractionalPercent_msginit, arena); + if (!sub) return NULL; + envoy_extensions_filters_common_fault_v3_FaultDelay_set_percentage(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_extensions_filters_common_fault_v3_FaultDelay_set_header_delay(envoy_extensions_filters_common_fault_v3_FaultDelay *msg, envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay* value) { + UPB_WRITE_ONEOF(msg, envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay*, UPB_SIZE(8, 16), value, UPB_SIZE(12, 24), 5); +} +UPB_INLINE struct envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay* envoy_extensions_filters_common_fault_v3_FaultDelay_mutable_header_delay(envoy_extensions_filters_common_fault_v3_FaultDelay *msg, upb_arena *arena) { + struct envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay* sub = (struct envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay*)envoy_extensions_filters_common_fault_v3_FaultDelay_header_delay(msg); + if (sub == NULL) { + sub = (struct envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay*)_upb_msg_new(&envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay_msginit, arena); + if (!sub) return NULL; + envoy_extensions_filters_common_fault_v3_FaultDelay_set_header_delay(msg, sub); + } + return sub; +} + +/* envoy.extensions.filters.common.fault.v3.FaultDelay.HeaderDelay */ + +UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay *envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay_new(upb_arena *arena) { + return (envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay *)_upb_msg_new(&envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay_msginit, arena); +} +UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay *envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay *ret = envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay *envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay *ret = envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay_serialize(const envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay_msginit, arena, len); +} + + + +/* envoy.extensions.filters.common.fault.v3.FaultRateLimit */ + +UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultRateLimit *envoy_extensions_filters_common_fault_v3_FaultRateLimit_new(upb_arena *arena) { + return (envoy_extensions_filters_common_fault_v3_FaultRateLimit *)_upb_msg_new(&envoy_extensions_filters_common_fault_v3_FaultRateLimit_msginit, arena); +} +UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultRateLimit *envoy_extensions_filters_common_fault_v3_FaultRateLimit_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_extensions_filters_common_fault_v3_FaultRateLimit *ret = envoy_extensions_filters_common_fault_v3_FaultRateLimit_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_extensions_filters_common_fault_v3_FaultRateLimit_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultRateLimit *envoy_extensions_filters_common_fault_v3_FaultRateLimit_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_extensions_filters_common_fault_v3_FaultRateLimit *ret = envoy_extensions_filters_common_fault_v3_FaultRateLimit_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_extensions_filters_common_fault_v3_FaultRateLimit_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_extensions_filters_common_fault_v3_FaultRateLimit_serialize(const envoy_extensions_filters_common_fault_v3_FaultRateLimit *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_extensions_filters_common_fault_v3_FaultRateLimit_msginit, arena, len); +} + +typedef enum { + envoy_extensions_filters_common_fault_v3_FaultRateLimit_limit_type_fixed_limit = 1, + envoy_extensions_filters_common_fault_v3_FaultRateLimit_limit_type_header_limit = 3, + envoy_extensions_filters_common_fault_v3_FaultRateLimit_limit_type_NOT_SET = 0 +} envoy_extensions_filters_common_fault_v3_FaultRateLimit_limit_type_oneofcases; +UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultRateLimit_limit_type_oneofcases envoy_extensions_filters_common_fault_v3_FaultRateLimit_limit_type_case(const envoy_extensions_filters_common_fault_v3_FaultRateLimit* msg) { return (envoy_extensions_filters_common_fault_v3_FaultRateLimit_limit_type_oneofcases)*UPB_PTR_AT(msg, UPB_SIZE(12, 24), int32_t); } + +UPB_INLINE bool envoy_extensions_filters_common_fault_v3_FaultRateLimit_has_fixed_limit(const envoy_extensions_filters_common_fault_v3_FaultRateLimit *msg) { return _upb_getoneofcase(msg, UPB_SIZE(12, 24)) == 1; } +UPB_INLINE const envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit* envoy_extensions_filters_common_fault_v3_FaultRateLimit_fixed_limit(const envoy_extensions_filters_common_fault_v3_FaultRateLimit *msg) { return UPB_READ_ONEOF(msg, const envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit*, UPB_SIZE(8, 16), UPB_SIZE(12, 24), 1, NULL); } +UPB_INLINE bool envoy_extensions_filters_common_fault_v3_FaultRateLimit_has_percentage(const envoy_extensions_filters_common_fault_v3_FaultRateLimit *msg) { return _upb_hasbit(msg, 1); } +UPB_INLINE const struct envoy_type_v3_FractionalPercent* envoy_extensions_filters_common_fault_v3_FaultRateLimit_percentage(const envoy_extensions_filters_common_fault_v3_FaultRateLimit *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), const struct envoy_type_v3_FractionalPercent*); } +UPB_INLINE bool envoy_extensions_filters_common_fault_v3_FaultRateLimit_has_header_limit(const envoy_extensions_filters_common_fault_v3_FaultRateLimit *msg) { return _upb_getoneofcase(msg, UPB_SIZE(12, 24)) == 3; } +UPB_INLINE const envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit* envoy_extensions_filters_common_fault_v3_FaultRateLimit_header_limit(const envoy_extensions_filters_common_fault_v3_FaultRateLimit *msg) { return UPB_READ_ONEOF(msg, const envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit*, UPB_SIZE(8, 16), UPB_SIZE(12, 24), 3, NULL); } + +UPB_INLINE void envoy_extensions_filters_common_fault_v3_FaultRateLimit_set_fixed_limit(envoy_extensions_filters_common_fault_v3_FaultRateLimit *msg, envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit* value) { + UPB_WRITE_ONEOF(msg, envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit*, UPB_SIZE(8, 16), value, UPB_SIZE(12, 24), 1); +} +UPB_INLINE struct envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit* envoy_extensions_filters_common_fault_v3_FaultRateLimit_mutable_fixed_limit(envoy_extensions_filters_common_fault_v3_FaultRateLimit *msg, upb_arena *arena) { + struct envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit* sub = (struct envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit*)envoy_extensions_filters_common_fault_v3_FaultRateLimit_fixed_limit(msg); + if (sub == NULL) { + sub = (struct envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit*)_upb_msg_new(&envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_msginit, arena); + if (!sub) return NULL; + envoy_extensions_filters_common_fault_v3_FaultRateLimit_set_fixed_limit(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_extensions_filters_common_fault_v3_FaultRateLimit_set_percentage(envoy_extensions_filters_common_fault_v3_FaultRateLimit *msg, struct envoy_type_v3_FractionalPercent* value) { + _upb_sethas(msg, 1); + *UPB_PTR_AT(msg, UPB_SIZE(4, 8), struct envoy_type_v3_FractionalPercent*) = value; +} +UPB_INLINE struct envoy_type_v3_FractionalPercent* envoy_extensions_filters_common_fault_v3_FaultRateLimit_mutable_percentage(envoy_extensions_filters_common_fault_v3_FaultRateLimit *msg, upb_arena *arena) { + struct envoy_type_v3_FractionalPercent* sub = (struct envoy_type_v3_FractionalPercent*)envoy_extensions_filters_common_fault_v3_FaultRateLimit_percentage(msg); + if (sub == NULL) { + sub = (struct envoy_type_v3_FractionalPercent*)_upb_msg_new(&envoy_type_v3_FractionalPercent_msginit, arena); + if (!sub) return NULL; + envoy_extensions_filters_common_fault_v3_FaultRateLimit_set_percentage(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_extensions_filters_common_fault_v3_FaultRateLimit_set_header_limit(envoy_extensions_filters_common_fault_v3_FaultRateLimit *msg, envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit* value) { + UPB_WRITE_ONEOF(msg, envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit*, UPB_SIZE(8, 16), value, UPB_SIZE(12, 24), 3); +} +UPB_INLINE struct envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit* envoy_extensions_filters_common_fault_v3_FaultRateLimit_mutable_header_limit(envoy_extensions_filters_common_fault_v3_FaultRateLimit *msg, upb_arena *arena) { + struct envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit* sub = (struct envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit*)envoy_extensions_filters_common_fault_v3_FaultRateLimit_header_limit(msg); + if (sub == NULL) { + sub = (struct envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit*)_upb_msg_new(&envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit_msginit, arena); + if (!sub) return NULL; + envoy_extensions_filters_common_fault_v3_FaultRateLimit_set_header_limit(msg, sub); + } + return sub; +} + +/* envoy.extensions.filters.common.fault.v3.FaultRateLimit.FixedLimit */ + +UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit *envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_new(upb_arena *arena) { + return (envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit *)_upb_msg_new(&envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_msginit, arena); +} +UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit *envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit *ret = envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit *envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit *ret = envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_serialize(const envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_msginit, arena, len); +} + +UPB_INLINE uint64_t envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_limit_kbps(const envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(0, 0), uint64_t); } + +UPB_INLINE void envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_set_limit_kbps(envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit *msg, uint64_t value) { + *UPB_PTR_AT(msg, UPB_SIZE(0, 0), uint64_t) = value; +} + +/* envoy.extensions.filters.common.fault.v3.FaultRateLimit.HeaderLimit */ + +UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit *envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit_new(upb_arena *arena) { + return (envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit *)_upb_msg_new(&envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit_msginit, arena); +} +UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit *envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit *ret = envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit *envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit *ret = envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit_serialize(const envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit_msginit, arena, len); +} + + + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#include "upb/port_undef.inc" + +#endif /* ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPB_H_ */ diff --git a/grpc/src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.c b/grpc/src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.c new file mode 100644 index 00000000..ca5144c5 --- /dev/null +++ b/grpc/src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.c @@ -0,0 +1,78 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * envoy/extensions/filters/http/fault/v3/fault.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#include <stddef.h> +#include "upb/msg.h" +#include "envoy/extensions/filters/http/fault/v3/fault.upb.h" +#include "envoy/config/route/v3/route_components.upb.h" +#include "envoy/extensions/filters/common/fault/v3/fault.upb.h" +#include "envoy/type/v3/percent.upb.h" +#include "google/protobuf/wrappers.upb.h" +#include "udpa/annotations/status.upb.h" +#include "udpa/annotations/versioning.upb.h" +#include "validate/validate.upb.h" + +#include "upb/port_def.inc" + +static const upb_msglayout *const envoy_extensions_filters_http_fault_v3_FaultAbort_submsgs[2] = { + &envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort_msginit, + &envoy_type_v3_FractionalPercent_msginit, +}; + +static const upb_msglayout_field envoy_extensions_filters_http_fault_v3_FaultAbort__fields[4] = { + {2, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 13, 1}, + {3, UPB_SIZE(4, 8), 1, 1, 11, 1}, + {4, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 11, 1}, + {5, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 13, 1}, +}; + +const upb_msglayout envoy_extensions_filters_http_fault_v3_FaultAbort_msginit = { + &envoy_extensions_filters_http_fault_v3_FaultAbort_submsgs[0], + &envoy_extensions_filters_http_fault_v3_FaultAbort__fields[0], + UPB_SIZE(16, 32), 4, false, 255, +}; + +const upb_msglayout envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort_msginit = { + NULL, + NULL, + UPB_SIZE(0, 0), 0, false, 255, +}; + +static const upb_msglayout *const envoy_extensions_filters_http_fault_v3_HTTPFault_submsgs[5] = { + &envoy_config_route_v3_HeaderMatcher_msginit, + &envoy_extensions_filters_common_fault_v3_FaultDelay_msginit, + &envoy_extensions_filters_common_fault_v3_FaultRateLimit_msginit, + &envoy_extensions_filters_http_fault_v3_FaultAbort_msginit, + &google_protobuf_UInt32Value_msginit, +}; + +static const upb_msglayout_field envoy_extensions_filters_http_fault_v3_HTTPFault__fields[14] = { + {1, UPB_SIZE(68, 136), 1, 1, 11, 1}, + {2, UPB_SIZE(72, 144), 2, 3, 11, 1}, + {3, UPB_SIZE(4, 8), 0, 0, 9, 1}, + {4, UPB_SIZE(84, 168), 0, 0, 11, 3}, + {5, UPB_SIZE(88, 176), 0, 0, 9, 3}, + {6, UPB_SIZE(76, 152), 3, 4, 11, 1}, + {7, UPB_SIZE(80, 160), 4, 2, 11, 1}, + {8, UPB_SIZE(12, 24), 0, 0, 9, 1}, + {9, UPB_SIZE(20, 40), 0, 0, 9, 1}, + {10, UPB_SIZE(28, 56), 0, 0, 9, 1}, + {11, UPB_SIZE(36, 72), 0, 0, 9, 1}, + {12, UPB_SIZE(44, 88), 0, 0, 9, 1}, + {13, UPB_SIZE(52, 104), 0, 0, 9, 1}, + {14, UPB_SIZE(60, 120), 0, 0, 9, 1}, +}; + +const upb_msglayout envoy_extensions_filters_http_fault_v3_HTTPFault_msginit = { + &envoy_extensions_filters_http_fault_v3_HTTPFault_submsgs[0], + &envoy_extensions_filters_http_fault_v3_HTTPFault__fields[0], + UPB_SIZE(96, 192), 14, false, 255, +}; + +#include "upb/port_undef.inc" + diff --git a/grpc/src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.h b/grpc/src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.h new file mode 100644 index 00000000..fc618c9a --- /dev/null +++ b/grpc/src/core/ext/upb-generated/envoy/extensions/filters/http/fault/v3/fault.upb.h @@ -0,0 +1,281 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * envoy/extensions/filters/http/fault/v3/fault.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPB_H_ +#define ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPB_H_ + +#include "upb/msg.h" +#include "upb/decode.h" +#include "upb/decode_fast.h" +#include "upb/encode.h" + +#include "upb/port_def.inc" + +#ifdef __cplusplus +extern "C" { +#endif + +struct envoy_extensions_filters_http_fault_v3_FaultAbort; +struct envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort; +struct envoy_extensions_filters_http_fault_v3_HTTPFault; +typedef struct envoy_extensions_filters_http_fault_v3_FaultAbort envoy_extensions_filters_http_fault_v3_FaultAbort; +typedef struct envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort; +typedef struct envoy_extensions_filters_http_fault_v3_HTTPFault envoy_extensions_filters_http_fault_v3_HTTPFault; +extern const upb_msglayout envoy_extensions_filters_http_fault_v3_FaultAbort_msginit; +extern const upb_msglayout envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort_msginit; +extern const upb_msglayout envoy_extensions_filters_http_fault_v3_HTTPFault_msginit; +struct envoy_config_route_v3_HeaderMatcher; +struct envoy_extensions_filters_common_fault_v3_FaultDelay; +struct envoy_extensions_filters_common_fault_v3_FaultRateLimit; +struct envoy_type_v3_FractionalPercent; +struct google_protobuf_UInt32Value; +extern const upb_msglayout envoy_config_route_v3_HeaderMatcher_msginit; +extern const upb_msglayout envoy_extensions_filters_common_fault_v3_FaultDelay_msginit; +extern const upb_msglayout envoy_extensions_filters_common_fault_v3_FaultRateLimit_msginit; +extern const upb_msglayout envoy_type_v3_FractionalPercent_msginit; +extern const upb_msglayout google_protobuf_UInt32Value_msginit; + + +/* envoy.extensions.filters.http.fault.v3.FaultAbort */ + +UPB_INLINE envoy_extensions_filters_http_fault_v3_FaultAbort *envoy_extensions_filters_http_fault_v3_FaultAbort_new(upb_arena *arena) { + return (envoy_extensions_filters_http_fault_v3_FaultAbort *)_upb_msg_new(&envoy_extensions_filters_http_fault_v3_FaultAbort_msginit, arena); +} +UPB_INLINE envoy_extensions_filters_http_fault_v3_FaultAbort *envoy_extensions_filters_http_fault_v3_FaultAbort_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_extensions_filters_http_fault_v3_FaultAbort *ret = envoy_extensions_filters_http_fault_v3_FaultAbort_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_extensions_filters_http_fault_v3_FaultAbort_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_extensions_filters_http_fault_v3_FaultAbort *envoy_extensions_filters_http_fault_v3_FaultAbort_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_extensions_filters_http_fault_v3_FaultAbort *ret = envoy_extensions_filters_http_fault_v3_FaultAbort_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_extensions_filters_http_fault_v3_FaultAbort_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_extensions_filters_http_fault_v3_FaultAbort_serialize(const envoy_extensions_filters_http_fault_v3_FaultAbort *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_extensions_filters_http_fault_v3_FaultAbort_msginit, arena, len); +} + +typedef enum { + envoy_extensions_filters_http_fault_v3_FaultAbort_error_type_http_status = 2, + envoy_extensions_filters_http_fault_v3_FaultAbort_error_type_grpc_status = 5, + envoy_extensions_filters_http_fault_v3_FaultAbort_error_type_header_abort = 4, + envoy_extensions_filters_http_fault_v3_FaultAbort_error_type_NOT_SET = 0 +} envoy_extensions_filters_http_fault_v3_FaultAbort_error_type_oneofcases; +UPB_INLINE envoy_extensions_filters_http_fault_v3_FaultAbort_error_type_oneofcases envoy_extensions_filters_http_fault_v3_FaultAbort_error_type_case(const envoy_extensions_filters_http_fault_v3_FaultAbort* msg) { return (envoy_extensions_filters_http_fault_v3_FaultAbort_error_type_oneofcases)*UPB_PTR_AT(msg, UPB_SIZE(12, 24), int32_t); } + +UPB_INLINE bool envoy_extensions_filters_http_fault_v3_FaultAbort_has_http_status(const envoy_extensions_filters_http_fault_v3_FaultAbort *msg) { return _upb_getoneofcase(msg, UPB_SIZE(12, 24)) == 2; } +UPB_INLINE uint32_t envoy_extensions_filters_http_fault_v3_FaultAbort_http_status(const envoy_extensions_filters_http_fault_v3_FaultAbort *msg) { return UPB_READ_ONEOF(msg, uint32_t, UPB_SIZE(8, 16), UPB_SIZE(12, 24), 2, 0); } +UPB_INLINE bool envoy_extensions_filters_http_fault_v3_FaultAbort_has_percentage(const envoy_extensions_filters_http_fault_v3_FaultAbort *msg) { return _upb_hasbit(msg, 1); } +UPB_INLINE const struct envoy_type_v3_FractionalPercent* envoy_extensions_filters_http_fault_v3_FaultAbort_percentage(const envoy_extensions_filters_http_fault_v3_FaultAbort *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), const struct envoy_type_v3_FractionalPercent*); } +UPB_INLINE bool envoy_extensions_filters_http_fault_v3_FaultAbort_has_header_abort(const envoy_extensions_filters_http_fault_v3_FaultAbort *msg) { return _upb_getoneofcase(msg, UPB_SIZE(12, 24)) == 4; } +UPB_INLINE const envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort* envoy_extensions_filters_http_fault_v3_FaultAbort_header_abort(const envoy_extensions_filters_http_fault_v3_FaultAbort *msg) { return UPB_READ_ONEOF(msg, const envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort*, UPB_SIZE(8, 16), UPB_SIZE(12, 24), 4, NULL); } +UPB_INLINE bool envoy_extensions_filters_http_fault_v3_FaultAbort_has_grpc_status(const envoy_extensions_filters_http_fault_v3_FaultAbort *msg) { return _upb_getoneofcase(msg, UPB_SIZE(12, 24)) == 5; } +UPB_INLINE uint32_t envoy_extensions_filters_http_fault_v3_FaultAbort_grpc_status(const envoy_extensions_filters_http_fault_v3_FaultAbort *msg) { return UPB_READ_ONEOF(msg, uint32_t, UPB_SIZE(8, 16), UPB_SIZE(12, 24), 5, 0); } + +UPB_INLINE void envoy_extensions_filters_http_fault_v3_FaultAbort_set_http_status(envoy_extensions_filters_http_fault_v3_FaultAbort *msg, uint32_t value) { + UPB_WRITE_ONEOF(msg, uint32_t, UPB_SIZE(8, 16), value, UPB_SIZE(12, 24), 2); +} +UPB_INLINE void envoy_extensions_filters_http_fault_v3_FaultAbort_set_percentage(envoy_extensions_filters_http_fault_v3_FaultAbort *msg, struct envoy_type_v3_FractionalPercent* value) { + _upb_sethas(msg, 1); + *UPB_PTR_AT(msg, UPB_SIZE(4, 8), struct envoy_type_v3_FractionalPercent*) = value; +} +UPB_INLINE struct envoy_type_v3_FractionalPercent* envoy_extensions_filters_http_fault_v3_FaultAbort_mutable_percentage(envoy_extensions_filters_http_fault_v3_FaultAbort *msg, upb_arena *arena) { + struct envoy_type_v3_FractionalPercent* sub = (struct envoy_type_v3_FractionalPercent*)envoy_extensions_filters_http_fault_v3_FaultAbort_percentage(msg); + if (sub == NULL) { + sub = (struct envoy_type_v3_FractionalPercent*)_upb_msg_new(&envoy_type_v3_FractionalPercent_msginit, arena); + if (!sub) return NULL; + envoy_extensions_filters_http_fault_v3_FaultAbort_set_percentage(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_extensions_filters_http_fault_v3_FaultAbort_set_header_abort(envoy_extensions_filters_http_fault_v3_FaultAbort *msg, envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort* value) { + UPB_WRITE_ONEOF(msg, envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort*, UPB_SIZE(8, 16), value, UPB_SIZE(12, 24), 4); +} +UPB_INLINE struct envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort* envoy_extensions_filters_http_fault_v3_FaultAbort_mutable_header_abort(envoy_extensions_filters_http_fault_v3_FaultAbort *msg, upb_arena *arena) { + struct envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort* sub = (struct envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort*)envoy_extensions_filters_http_fault_v3_FaultAbort_header_abort(msg); + if (sub == NULL) { + sub = (struct envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort*)_upb_msg_new(&envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort_msginit, arena); + if (!sub) return NULL; + envoy_extensions_filters_http_fault_v3_FaultAbort_set_header_abort(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_extensions_filters_http_fault_v3_FaultAbort_set_grpc_status(envoy_extensions_filters_http_fault_v3_FaultAbort *msg, uint32_t value) { + UPB_WRITE_ONEOF(msg, uint32_t, UPB_SIZE(8, 16), value, UPB_SIZE(12, 24), 5); +} + +/* envoy.extensions.filters.http.fault.v3.FaultAbort.HeaderAbort */ + +UPB_INLINE envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort *envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort_new(upb_arena *arena) { + return (envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort *)_upb_msg_new(&envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort_msginit, arena); +} +UPB_INLINE envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort *envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort *ret = envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort *envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort *ret = envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort_serialize(const envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort_msginit, arena, len); +} + + + +/* envoy.extensions.filters.http.fault.v3.HTTPFault */ + +UPB_INLINE envoy_extensions_filters_http_fault_v3_HTTPFault *envoy_extensions_filters_http_fault_v3_HTTPFault_new(upb_arena *arena) { + return (envoy_extensions_filters_http_fault_v3_HTTPFault *)_upb_msg_new(&envoy_extensions_filters_http_fault_v3_HTTPFault_msginit, arena); +} +UPB_INLINE envoy_extensions_filters_http_fault_v3_HTTPFault *envoy_extensions_filters_http_fault_v3_HTTPFault_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_extensions_filters_http_fault_v3_HTTPFault *ret = envoy_extensions_filters_http_fault_v3_HTTPFault_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_extensions_filters_http_fault_v3_HTTPFault_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_extensions_filters_http_fault_v3_HTTPFault *envoy_extensions_filters_http_fault_v3_HTTPFault_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_extensions_filters_http_fault_v3_HTTPFault *ret = envoy_extensions_filters_http_fault_v3_HTTPFault_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_extensions_filters_http_fault_v3_HTTPFault_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_extensions_filters_http_fault_v3_HTTPFault_serialize(const envoy_extensions_filters_http_fault_v3_HTTPFault *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_extensions_filters_http_fault_v3_HTTPFault_msginit, arena, len); +} + +UPB_INLINE bool envoy_extensions_filters_http_fault_v3_HTTPFault_has_delay(const envoy_extensions_filters_http_fault_v3_HTTPFault *msg) { return _upb_hasbit(msg, 1); } +UPB_INLINE const struct envoy_extensions_filters_common_fault_v3_FaultDelay* envoy_extensions_filters_http_fault_v3_HTTPFault_delay(const envoy_extensions_filters_http_fault_v3_HTTPFault *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(68, 136), const struct envoy_extensions_filters_common_fault_v3_FaultDelay*); } +UPB_INLINE bool envoy_extensions_filters_http_fault_v3_HTTPFault_has_abort(const envoy_extensions_filters_http_fault_v3_HTTPFault *msg) { return _upb_hasbit(msg, 2); } +UPB_INLINE const envoy_extensions_filters_http_fault_v3_FaultAbort* envoy_extensions_filters_http_fault_v3_HTTPFault_abort(const envoy_extensions_filters_http_fault_v3_HTTPFault *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(72, 144), const envoy_extensions_filters_http_fault_v3_FaultAbort*); } +UPB_INLINE upb_strview envoy_extensions_filters_http_fault_v3_HTTPFault_upstream_cluster(const envoy_extensions_filters_http_fault_v3_HTTPFault *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview); } +UPB_INLINE bool envoy_extensions_filters_http_fault_v3_HTTPFault_has_headers(const envoy_extensions_filters_http_fault_v3_HTTPFault *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(84, 168)); } +UPB_INLINE const struct envoy_config_route_v3_HeaderMatcher* const* envoy_extensions_filters_http_fault_v3_HTTPFault_headers(const envoy_extensions_filters_http_fault_v3_HTTPFault *msg, size_t *len) { return (const struct envoy_config_route_v3_HeaderMatcher* const*)_upb_array_accessor(msg, UPB_SIZE(84, 168), len); } +UPB_INLINE upb_strview const* envoy_extensions_filters_http_fault_v3_HTTPFault_downstream_nodes(const envoy_extensions_filters_http_fault_v3_HTTPFault *msg, size_t *len) { return (upb_strview const*)_upb_array_accessor(msg, UPB_SIZE(88, 176), len); } +UPB_INLINE bool envoy_extensions_filters_http_fault_v3_HTTPFault_has_max_active_faults(const envoy_extensions_filters_http_fault_v3_HTTPFault *msg) { return _upb_hasbit(msg, 3); } +UPB_INLINE const struct google_protobuf_UInt32Value* envoy_extensions_filters_http_fault_v3_HTTPFault_max_active_faults(const envoy_extensions_filters_http_fault_v3_HTTPFault *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(76, 152), const struct google_protobuf_UInt32Value*); } +UPB_INLINE bool envoy_extensions_filters_http_fault_v3_HTTPFault_has_response_rate_limit(const envoy_extensions_filters_http_fault_v3_HTTPFault *msg) { return _upb_hasbit(msg, 4); } +UPB_INLINE const struct envoy_extensions_filters_common_fault_v3_FaultRateLimit* envoy_extensions_filters_http_fault_v3_HTTPFault_response_rate_limit(const envoy_extensions_filters_http_fault_v3_HTTPFault *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(80, 160), const struct envoy_extensions_filters_common_fault_v3_FaultRateLimit*); } +UPB_INLINE upb_strview envoy_extensions_filters_http_fault_v3_HTTPFault_delay_percent_runtime(const envoy_extensions_filters_http_fault_v3_HTTPFault *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(12, 24), upb_strview); } +UPB_INLINE upb_strview envoy_extensions_filters_http_fault_v3_HTTPFault_abort_percent_runtime(const envoy_extensions_filters_http_fault_v3_HTTPFault *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(20, 40), upb_strview); } +UPB_INLINE upb_strview envoy_extensions_filters_http_fault_v3_HTTPFault_delay_duration_runtime(const envoy_extensions_filters_http_fault_v3_HTTPFault *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(28, 56), upb_strview); } +UPB_INLINE upb_strview envoy_extensions_filters_http_fault_v3_HTTPFault_abort_http_status_runtime(const envoy_extensions_filters_http_fault_v3_HTTPFault *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(36, 72), upb_strview); } +UPB_INLINE upb_strview envoy_extensions_filters_http_fault_v3_HTTPFault_max_active_faults_runtime(const envoy_extensions_filters_http_fault_v3_HTTPFault *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(44, 88), upb_strview); } +UPB_INLINE upb_strview envoy_extensions_filters_http_fault_v3_HTTPFault_response_rate_limit_percent_runtime(const envoy_extensions_filters_http_fault_v3_HTTPFault *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(52, 104), upb_strview); } +UPB_INLINE upb_strview envoy_extensions_filters_http_fault_v3_HTTPFault_abort_grpc_status_runtime(const envoy_extensions_filters_http_fault_v3_HTTPFault *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(60, 120), upb_strview); } + +UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_delay(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, struct envoy_extensions_filters_common_fault_v3_FaultDelay* value) { + _upb_sethas(msg, 1); + *UPB_PTR_AT(msg, UPB_SIZE(68, 136), struct envoy_extensions_filters_common_fault_v3_FaultDelay*) = value; +} +UPB_INLINE struct envoy_extensions_filters_common_fault_v3_FaultDelay* envoy_extensions_filters_http_fault_v3_HTTPFault_mutable_delay(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, upb_arena *arena) { + struct envoy_extensions_filters_common_fault_v3_FaultDelay* sub = (struct envoy_extensions_filters_common_fault_v3_FaultDelay*)envoy_extensions_filters_http_fault_v3_HTTPFault_delay(msg); + if (sub == NULL) { + sub = (struct envoy_extensions_filters_common_fault_v3_FaultDelay*)_upb_msg_new(&envoy_extensions_filters_common_fault_v3_FaultDelay_msginit, arena); + if (!sub) return NULL; + envoy_extensions_filters_http_fault_v3_HTTPFault_set_delay(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_abort(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, envoy_extensions_filters_http_fault_v3_FaultAbort* value) { + _upb_sethas(msg, 2); + *UPB_PTR_AT(msg, UPB_SIZE(72, 144), envoy_extensions_filters_http_fault_v3_FaultAbort*) = value; +} +UPB_INLINE struct envoy_extensions_filters_http_fault_v3_FaultAbort* envoy_extensions_filters_http_fault_v3_HTTPFault_mutable_abort(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, upb_arena *arena) { + struct envoy_extensions_filters_http_fault_v3_FaultAbort* sub = (struct envoy_extensions_filters_http_fault_v3_FaultAbort*)envoy_extensions_filters_http_fault_v3_HTTPFault_abort(msg); + if (sub == NULL) { + sub = (struct envoy_extensions_filters_http_fault_v3_FaultAbort*)_upb_msg_new(&envoy_extensions_filters_http_fault_v3_FaultAbort_msginit, arena); + if (!sub) return NULL; + envoy_extensions_filters_http_fault_v3_HTTPFault_set_abort(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_upstream_cluster(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview) = value; +} +UPB_INLINE struct envoy_config_route_v3_HeaderMatcher** envoy_extensions_filters_http_fault_v3_HTTPFault_mutable_headers(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, size_t *len) { + return (struct envoy_config_route_v3_HeaderMatcher**)_upb_array_mutable_accessor(msg, UPB_SIZE(84, 168), len); +} +UPB_INLINE struct envoy_config_route_v3_HeaderMatcher** envoy_extensions_filters_http_fault_v3_HTTPFault_resize_headers(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, size_t len, upb_arena *arena) { + return (struct envoy_config_route_v3_HeaderMatcher**)_upb_array_resize_accessor2(msg, UPB_SIZE(84, 168), len, UPB_SIZE(2, 3), arena); +} +UPB_INLINE struct envoy_config_route_v3_HeaderMatcher* envoy_extensions_filters_http_fault_v3_HTTPFault_add_headers(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, upb_arena *arena) { + struct envoy_config_route_v3_HeaderMatcher* sub = (struct envoy_config_route_v3_HeaderMatcher*)_upb_msg_new(&envoy_config_route_v3_HeaderMatcher_msginit, arena); + bool ok = _upb_array_append_accessor2( + msg, UPB_SIZE(84, 168), UPB_SIZE(2, 3), &sub, arena); + if (!ok) return NULL; + return sub; +} +UPB_INLINE upb_strview* envoy_extensions_filters_http_fault_v3_HTTPFault_mutable_downstream_nodes(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, size_t *len) { + return (upb_strview*)_upb_array_mutable_accessor(msg, UPB_SIZE(88, 176), len); +} +UPB_INLINE upb_strview* envoy_extensions_filters_http_fault_v3_HTTPFault_resize_downstream_nodes(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, size_t len, upb_arena *arena) { + return (upb_strview*)_upb_array_resize_accessor2(msg, UPB_SIZE(88, 176), len, UPB_SIZE(3, 4), arena); +} +UPB_INLINE bool envoy_extensions_filters_http_fault_v3_HTTPFault_add_downstream_nodes(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, upb_strview val, upb_arena *arena) { + return _upb_array_append_accessor2(msg, UPB_SIZE(88, 176), UPB_SIZE(3, 4), &val, + arena); +} +UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_max_active_faults(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, struct google_protobuf_UInt32Value* value) { + _upb_sethas(msg, 3); + *UPB_PTR_AT(msg, UPB_SIZE(76, 152), struct google_protobuf_UInt32Value*) = value; +} +UPB_INLINE struct google_protobuf_UInt32Value* envoy_extensions_filters_http_fault_v3_HTTPFault_mutable_max_active_faults(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, upb_arena *arena) { + struct google_protobuf_UInt32Value* sub = (struct google_protobuf_UInt32Value*)envoy_extensions_filters_http_fault_v3_HTTPFault_max_active_faults(msg); + if (sub == NULL) { + sub = (struct google_protobuf_UInt32Value*)_upb_msg_new(&google_protobuf_UInt32Value_msginit, arena); + if (!sub) return NULL; + envoy_extensions_filters_http_fault_v3_HTTPFault_set_max_active_faults(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_response_rate_limit(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, struct envoy_extensions_filters_common_fault_v3_FaultRateLimit* value) { + _upb_sethas(msg, 4); + *UPB_PTR_AT(msg, UPB_SIZE(80, 160), struct envoy_extensions_filters_common_fault_v3_FaultRateLimit*) = value; +} +UPB_INLINE struct envoy_extensions_filters_common_fault_v3_FaultRateLimit* envoy_extensions_filters_http_fault_v3_HTTPFault_mutable_response_rate_limit(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, upb_arena *arena) { + struct envoy_extensions_filters_common_fault_v3_FaultRateLimit* sub = (struct envoy_extensions_filters_common_fault_v3_FaultRateLimit*)envoy_extensions_filters_http_fault_v3_HTTPFault_response_rate_limit(msg); + if (sub == NULL) { + sub = (struct envoy_extensions_filters_common_fault_v3_FaultRateLimit*)_upb_msg_new(&envoy_extensions_filters_common_fault_v3_FaultRateLimit_msginit, arena); + if (!sub) return NULL; + envoy_extensions_filters_http_fault_v3_HTTPFault_set_response_rate_limit(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_delay_percent_runtime(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(12, 24), upb_strview) = value; +} +UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_abort_percent_runtime(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(20, 40), upb_strview) = value; +} +UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_delay_duration_runtime(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(28, 56), upb_strview) = value; +} +UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_abort_http_status_runtime(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(36, 72), upb_strview) = value; +} +UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_max_active_faults_runtime(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(44, 88), upb_strview) = value; +} +UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_response_rate_limit_percent_runtime(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(52, 104), upb_strview) = value; +} +UPB_INLINE void envoy_extensions_filters_http_fault_v3_HTTPFault_set_abort_grpc_status_runtime(envoy_extensions_filters_http_fault_v3_HTTPFault *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(60, 120), upb_strview) = value; +} + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#include "upb/port_undef.inc" + +#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPB_H_ */ diff --git a/grpc/src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.c b/grpc/src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.c new file mode 100644 index 00000000..8e6ff697 --- /dev/null +++ b/grpc/src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.c @@ -0,0 +1,41 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * envoy/extensions/filters/http/router/v3/router.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#include <stddef.h> +#include "upb/msg.h" +#include "envoy/extensions/filters/http/router/v3/router.upb.h" +#include "envoy/config/accesslog/v3/accesslog.upb.h" +#include "google/protobuf/wrappers.upb.h" +#include "udpa/annotations/status.upb.h" +#include "udpa/annotations/versioning.upb.h" +#include "validate/validate.upb.h" + +#include "upb/port_def.inc" + +static const upb_msglayout *const envoy_extensions_filters_http_router_v3_Router_submsgs[2] = { + &envoy_config_accesslog_v3_AccessLog_msginit, + &google_protobuf_BoolValue_msginit, +}; + +static const upb_msglayout_field envoy_extensions_filters_http_router_v3_Router__fields[6] = { + {1, UPB_SIZE(4, 8), 1, 1, 11, 1}, + {2, UPB_SIZE(1, 1), 0, 0, 8, 1}, + {3, UPB_SIZE(8, 16), 0, 0, 11, 3}, + {4, UPB_SIZE(2, 2), 0, 0, 8, 1}, + {5, UPB_SIZE(12, 24), 0, 0, 9, 3}, + {6, UPB_SIZE(3, 3), 0, 0, 8, 1}, +}; + +const upb_msglayout envoy_extensions_filters_http_router_v3_Router_msginit = { + &envoy_extensions_filters_http_router_v3_Router_submsgs[0], + &envoy_extensions_filters_http_router_v3_Router__fields[0], + UPB_SIZE(16, 32), 6, false, 255, +}; + +#include "upb/port_undef.inc" + diff --git a/grpc/src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.h b/grpc/src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.h new file mode 100644 index 00000000..2e7084ac --- /dev/null +++ b/grpc/src/core/ext/upb-generated/envoy/extensions/filters/http/router/v3/router.upb.h @@ -0,0 +1,113 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * envoy/extensions/filters/http/router/v3/router.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_ROUTER_V3_ROUTER_PROTO_UPB_H_ +#define ENVOY_EXTENSIONS_FILTERS_HTTP_ROUTER_V3_ROUTER_PROTO_UPB_H_ + +#include "upb/msg.h" +#include "upb/decode.h" +#include "upb/decode_fast.h" +#include "upb/encode.h" + +#include "upb/port_def.inc" + +#ifdef __cplusplus +extern "C" { +#endif + +struct envoy_extensions_filters_http_router_v3_Router; +typedef struct envoy_extensions_filters_http_router_v3_Router envoy_extensions_filters_http_router_v3_Router; +extern const upb_msglayout envoy_extensions_filters_http_router_v3_Router_msginit; +struct envoy_config_accesslog_v3_AccessLog; +struct google_protobuf_BoolValue; +extern const upb_msglayout envoy_config_accesslog_v3_AccessLog_msginit; +extern const upb_msglayout google_protobuf_BoolValue_msginit; + + +/* envoy.extensions.filters.http.router.v3.Router */ + +UPB_INLINE envoy_extensions_filters_http_router_v3_Router *envoy_extensions_filters_http_router_v3_Router_new(upb_arena *arena) { + return (envoy_extensions_filters_http_router_v3_Router *)_upb_msg_new(&envoy_extensions_filters_http_router_v3_Router_msginit, arena); +} +UPB_INLINE envoy_extensions_filters_http_router_v3_Router *envoy_extensions_filters_http_router_v3_Router_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_extensions_filters_http_router_v3_Router *ret = envoy_extensions_filters_http_router_v3_Router_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_extensions_filters_http_router_v3_Router_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_extensions_filters_http_router_v3_Router *envoy_extensions_filters_http_router_v3_Router_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_extensions_filters_http_router_v3_Router *ret = envoy_extensions_filters_http_router_v3_Router_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_extensions_filters_http_router_v3_Router_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_extensions_filters_http_router_v3_Router_serialize(const envoy_extensions_filters_http_router_v3_Router *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_extensions_filters_http_router_v3_Router_msginit, arena, len); +} + +UPB_INLINE bool envoy_extensions_filters_http_router_v3_Router_has_dynamic_stats(const envoy_extensions_filters_http_router_v3_Router *msg) { return _upb_hasbit(msg, 1); } +UPB_INLINE const struct google_protobuf_BoolValue* envoy_extensions_filters_http_router_v3_Router_dynamic_stats(const envoy_extensions_filters_http_router_v3_Router *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), const struct google_protobuf_BoolValue*); } +UPB_INLINE bool envoy_extensions_filters_http_router_v3_Router_start_child_span(const envoy_extensions_filters_http_router_v3_Router *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(1, 1), bool); } +UPB_INLINE bool envoy_extensions_filters_http_router_v3_Router_has_upstream_log(const envoy_extensions_filters_http_router_v3_Router *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(8, 16)); } +UPB_INLINE const struct envoy_config_accesslog_v3_AccessLog* const* envoy_extensions_filters_http_router_v3_Router_upstream_log(const envoy_extensions_filters_http_router_v3_Router *msg, size_t *len) { return (const struct envoy_config_accesslog_v3_AccessLog* const*)_upb_array_accessor(msg, UPB_SIZE(8, 16), len); } +UPB_INLINE bool envoy_extensions_filters_http_router_v3_Router_suppress_envoy_headers(const envoy_extensions_filters_http_router_v3_Router *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(2, 2), bool); } +UPB_INLINE upb_strview const* envoy_extensions_filters_http_router_v3_Router_strict_check_headers(const envoy_extensions_filters_http_router_v3_Router *msg, size_t *len) { return (upb_strview const*)_upb_array_accessor(msg, UPB_SIZE(12, 24), len); } +UPB_INLINE bool envoy_extensions_filters_http_router_v3_Router_respect_expected_rq_timeout(const envoy_extensions_filters_http_router_v3_Router *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(3, 3), bool); } + +UPB_INLINE void envoy_extensions_filters_http_router_v3_Router_set_dynamic_stats(envoy_extensions_filters_http_router_v3_Router *msg, struct google_protobuf_BoolValue* value) { + _upb_sethas(msg, 1); + *UPB_PTR_AT(msg, UPB_SIZE(4, 8), struct google_protobuf_BoolValue*) = value; +} +UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_filters_http_router_v3_Router_mutable_dynamic_stats(envoy_extensions_filters_http_router_v3_Router *msg, upb_arena *arena) { + struct google_protobuf_BoolValue* sub = (struct google_protobuf_BoolValue*)envoy_extensions_filters_http_router_v3_Router_dynamic_stats(msg); + if (sub == NULL) { + sub = (struct google_protobuf_BoolValue*)_upb_msg_new(&google_protobuf_BoolValue_msginit, arena); + if (!sub) return NULL; + envoy_extensions_filters_http_router_v3_Router_set_dynamic_stats(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_extensions_filters_http_router_v3_Router_set_start_child_span(envoy_extensions_filters_http_router_v3_Router *msg, bool value) { + *UPB_PTR_AT(msg, UPB_SIZE(1, 1), bool) = value; +} +UPB_INLINE struct envoy_config_accesslog_v3_AccessLog** envoy_extensions_filters_http_router_v3_Router_mutable_upstream_log(envoy_extensions_filters_http_router_v3_Router *msg, size_t *len) { + return (struct envoy_config_accesslog_v3_AccessLog**)_upb_array_mutable_accessor(msg, UPB_SIZE(8, 16), len); +} +UPB_INLINE struct envoy_config_accesslog_v3_AccessLog** envoy_extensions_filters_http_router_v3_Router_resize_upstream_log(envoy_extensions_filters_http_router_v3_Router *msg, size_t len, upb_arena *arena) { + return (struct envoy_config_accesslog_v3_AccessLog**)_upb_array_resize_accessor2(msg, UPB_SIZE(8, 16), len, UPB_SIZE(2, 3), arena); +} +UPB_INLINE struct envoy_config_accesslog_v3_AccessLog* envoy_extensions_filters_http_router_v3_Router_add_upstream_log(envoy_extensions_filters_http_router_v3_Router *msg, upb_arena *arena) { + struct envoy_config_accesslog_v3_AccessLog* sub = (struct envoy_config_accesslog_v3_AccessLog*)_upb_msg_new(&envoy_config_accesslog_v3_AccessLog_msginit, arena); + bool ok = _upb_array_append_accessor2( + msg, UPB_SIZE(8, 16), UPB_SIZE(2, 3), &sub, arena); + if (!ok) return NULL; + return sub; +} +UPB_INLINE void envoy_extensions_filters_http_router_v3_Router_set_suppress_envoy_headers(envoy_extensions_filters_http_router_v3_Router *msg, bool value) { + *UPB_PTR_AT(msg, UPB_SIZE(2, 2), bool) = value; +} +UPB_INLINE upb_strview* envoy_extensions_filters_http_router_v3_Router_mutable_strict_check_headers(envoy_extensions_filters_http_router_v3_Router *msg, size_t *len) { + return (upb_strview*)_upb_array_mutable_accessor(msg, UPB_SIZE(12, 24), len); +} +UPB_INLINE upb_strview* envoy_extensions_filters_http_router_v3_Router_resize_strict_check_headers(envoy_extensions_filters_http_router_v3_Router *msg, size_t len, upb_arena *arena) { + return (upb_strview*)_upb_array_resize_accessor2(msg, UPB_SIZE(12, 24), len, UPB_SIZE(3, 4), arena); +} +UPB_INLINE bool envoy_extensions_filters_http_router_v3_Router_add_strict_check_headers(envoy_extensions_filters_http_router_v3_Router *msg, upb_strview val, upb_arena *arena) { + return _upb_array_append_accessor2(msg, UPB_SIZE(12, 24), UPB_SIZE(3, 4), &val, + arena); +} +UPB_INLINE void envoy_extensions_filters_http_router_v3_Router_set_respect_expected_rq_timeout(envoy_extensions_filters_http_router_v3_Router *msg, bool value) { + *UPB_PTR_AT(msg, UPB_SIZE(3, 3), bool) = value; +} + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#include "upb/port_undef.inc" + +#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_ROUTER_V3_ROUTER_PROTO_UPB_H_ */ diff --git a/grpc/src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.c b/grpc/src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.c index 9d5c4523..6b2b6c15 100644 --- a/grpc/src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.c +++ b/grpc/src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.c @@ -22,10 +22,7 @@ #include "envoy/type/v3/percent.upb.h" #include "google/protobuf/any.upb.h" #include "google/protobuf/duration.upb.h" -#include "google/protobuf/struct.upb.h" #include "google/protobuf/wrappers.upb.h" -#include "udpa/core/v1/resource_locator.upb.h" -#include "envoy/annotations/deprecation.upb.h" #include "udpa/annotations/migrate.upb.h" #include "udpa/annotations/security.upb.h" #include "udpa/annotations/status.upb.h" @@ -54,19 +51,19 @@ static const upb_msglayout *const envoy_extensions_filters_network_http_connecti &google_protobuf_UInt32Value_msginit, }; -static const upb_msglayout_field envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager__fields[38] = { +static const upb_msglayout_field envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager__fields[40] = { {1, UPB_SIZE(4, 4), 0, 0, 14, 1}, {2, UPB_SIZE(28, 32), 0, 0, 9, 1}, - {3, UPB_SIZE(136, 248), UPB_SIZE(-141, -257), 11, 11, 1}, - {4, UPB_SIZE(136, 248), UPB_SIZE(-141, -257), 4, 11, 1}, - {5, UPB_SIZE(124, 224), 0, 9, 11, 3}, + {3, UPB_SIZE(140, 256), UPB_SIZE(-145, -265), 11, 11, 1}, + {4, UPB_SIZE(140, 256), UPB_SIZE(-145, -265), 4, 11, 1}, + {5, UPB_SIZE(128, 232), 0, 9, 11, 3}, {6, UPB_SIZE(52, 80), 1, 14, 11, 1}, {7, UPB_SIZE(56, 88), 2, 7, 11, 1}, {8, UPB_SIZE(60, 96), 3, 1, 11, 1}, {9, UPB_SIZE(64, 104), 4, 2, 11, 1}, {10, UPB_SIZE(36, 48), 0, 0, 9, 1}, {12, UPB_SIZE(68, 112), 5, 15, 11, 1}, - {13, UPB_SIZE(128, 232), 0, 0, 11, 3}, + {13, UPB_SIZE(132, 240), 0, 0, 11, 3}, {14, UPB_SIZE(72, 120), 6, 14, 11, 1}, {15, UPB_SIZE(76, 128), 7, 14, 11, 1}, {16, UPB_SIZE(8, 8), 0, 0, 14, 1}, @@ -76,14 +73,14 @@ static const upb_msglayout_field envoy_extensions_filters_network_http_connectio {20, UPB_SIZE(21, 21), 0, 0, 8, 1}, {21, UPB_SIZE(22, 22), 0, 0, 8, 1}, {22, UPB_SIZE(44, 64), 0, 0, 9, 1}, - {23, UPB_SIZE(132, 240), 0, 8, 11, 3}, + {23, UPB_SIZE(136, 248), 0, 8, 11, 3}, {24, UPB_SIZE(84, 144), 9, 15, 11, 1}, {25, UPB_SIZE(88, 152), 10, 5, 11, 1}, {26, UPB_SIZE(92, 160), 11, 15, 11, 1}, {28, UPB_SIZE(96, 168), 12, 15, 11, 1}, {29, UPB_SIZE(100, 176), 13, 16, 11, 1}, {30, UPB_SIZE(104, 184), 14, 14, 11, 1}, - {31, UPB_SIZE(136, 248), UPB_SIZE(-141, -257), 13, 11, 1}, + {31, UPB_SIZE(140, 256), UPB_SIZE(-145, -265), 13, 11, 1}, {32, UPB_SIZE(23, 23), 0, 0, 8, 1}, {33, UPB_SIZE(24, 24), 0, 0, 8, 1}, {34, UPB_SIZE(12, 12), 0, 0, 14, 1}, @@ -93,12 +90,14 @@ static const upb_msglayout_field envoy_extensions_filters_network_http_connectio {38, UPB_SIZE(116, 208), 17, 10, 11, 1}, {39, UPB_SIZE(26, 26), 0, 0, 8, 1}, {40, UPB_SIZE(120, 216), 18, 14, 11, 1}, + {41, UPB_SIZE(124, 224), 19, 15, 11, 1}, + {42, UPB_SIZE(148, 268), UPB_SIZE(-153, -273), 0, 8, 1}, }; const upb_msglayout envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_msginit = { &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager__fields[0], - UPB_SIZE(144, 272), 38, false, 255, + UPB_SIZE(160, 288), 40, false, 255, }; static const upb_msglayout *const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_submsgs[4] = { @@ -207,21 +206,19 @@ const upb_msglayout envoy_extensions_filters_network_http_connection_manager_v3_ UPB_SIZE(24, 48), 5, false, 255, }; -static const upb_msglayout *const envoy_extensions_filters_network_http_connection_manager_v3_Rds_submsgs[2] = { +static const upb_msglayout *const envoy_extensions_filters_network_http_connection_manager_v3_Rds_submsgs[1] = { &envoy_config_core_v3_ConfigSource_msginit, - &udpa_core_v1_ResourceLocator_msginit, }; -static const upb_msglayout_field envoy_extensions_filters_network_http_connection_manager_v3_Rds__fields[3] = { +static const upb_msglayout_field envoy_extensions_filters_network_http_connection_manager_v3_Rds__fields[2] = { {1, UPB_SIZE(12, 24), 1, 0, 11, 1}, {2, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {3, UPB_SIZE(16, 32), 2, 1, 11, 1}, }; const upb_msglayout envoy_extensions_filters_network_http_connection_manager_v3_Rds_msginit = { &envoy_extensions_filters_network_http_connection_manager_v3_Rds_submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_Rds__fields[0], - UPB_SIZE(24, 48), 3, false, 255, + UPB_SIZE(16, 32), 2, false, 255, }; static const upb_msglayout *const envoy_extensions_filters_network_http_connection_manager_v3_ScopedRouteConfigurationsList_submsgs[1] = { @@ -334,16 +331,17 @@ static const upb_msglayout *const envoy_extensions_filters_network_http_connecti &google_protobuf_Any_msginit, }; -static const upb_msglayout_field envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter__fields[3] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, - {4, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 1, 11, 1}, - {5, UPB_SIZE(8, 16), UPB_SIZE(-13, -25), 0, 11, 1}, +static const upb_msglayout_field envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter__fields[4] = { + {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, + {4, UPB_SIZE(12, 24), UPB_SIZE(-17, -33), 1, 11, 1}, + {5, UPB_SIZE(12, 24), UPB_SIZE(-17, -33), 0, 11, 1}, + {6, UPB_SIZE(0, 0), 0, 0, 8, 1}, }; const upb_msglayout envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_msginit = { &envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_submsgs[0], &envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter__fields[0], - UPB_SIZE(16, 32), 3, false, 255, + UPB_SIZE(24, 48), 4, false, 255, }; static const upb_msglayout *const envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension_submsgs[1] = { diff --git a/grpc/src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h b/grpc/src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h index 7a4d9717..668fa854 100644 --- a/grpc/src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h +++ b/grpc/src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h @@ -90,7 +90,6 @@ struct google_protobuf_Any; struct google_protobuf_BoolValue; struct google_protobuf_Duration; struct google_protobuf_UInt32Value; -struct udpa_core_v1_ResourceLocator; extern const upb_msglayout envoy_config_accesslog_v3_AccessLog_msginit; extern const upb_msglayout envoy_config_accesslog_v3_AccessLogFilter_msginit; extern const upb_msglayout envoy_config_core_v3_ConfigSource_msginit; @@ -110,7 +109,6 @@ extern const upb_msglayout google_protobuf_Any_msginit; extern const upb_msglayout google_protobuf_BoolValue_msginit; extern const upb_msglayout google_protobuf_Duration_msginit; extern const upb_msglayout google_protobuf_UInt32Value_msginit; -extern const upb_msglayout udpa_core_v1_ResourceLocator_msginit; typedef enum { envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_AUTO = 0, @@ -165,16 +163,22 @@ typedef enum { envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_route_specifier_scoped_routes = 31, envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_route_specifier_NOT_SET = 0 } envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_route_specifier_oneofcases; -UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_route_specifier_oneofcases envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_route_specifier_case(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg) { return (envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_route_specifier_oneofcases)*UPB_PTR_AT(msg, UPB_SIZE(140, 256), int32_t); } +UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_route_specifier_oneofcases envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_route_specifier_case(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg) { return (envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_route_specifier_oneofcases)*UPB_PTR_AT(msg, UPB_SIZE(144, 264), int32_t); } + +typedef enum { + envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_strip_port_mode_strip_any_host_port = 42, + envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_strip_port_mode_NOT_SET = 0 +} envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_strip_port_mode_oneofcases; +UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_strip_port_mode_oneofcases envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_strip_port_mode_case(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* msg) { return (envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_strip_port_mode_oneofcases)*UPB_PTR_AT(msg, UPB_SIZE(152, 272), int32_t); } UPB_INLINE int32_t envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_codec_type(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t); } UPB_INLINE upb_strview envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_stat_prefix(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(28, 32), upb_strview); } -UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_has_rds(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg) { return _upb_getoneofcase(msg, UPB_SIZE(140, 256)) == 3; } -UPB_INLINE const envoy_extensions_filters_network_http_connection_manager_v3_Rds* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_rds(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg) { return UPB_READ_ONEOF(msg, const envoy_extensions_filters_network_http_connection_manager_v3_Rds*, UPB_SIZE(136, 248), UPB_SIZE(140, 256), 3, NULL); } -UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_has_route_config(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg) { return _upb_getoneofcase(msg, UPB_SIZE(140, 256)) == 4; } -UPB_INLINE const struct envoy_config_route_v3_RouteConfiguration* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_route_config(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg) { return UPB_READ_ONEOF(msg, const struct envoy_config_route_v3_RouteConfiguration*, UPB_SIZE(136, 248), UPB_SIZE(140, 256), 4, NULL); } -UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_has_http_filters(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(124, 224)); } -UPB_INLINE const envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter* const* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_http_filters(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, size_t *len) { return (const envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter* const*)_upb_array_accessor(msg, UPB_SIZE(124, 224), len); } +UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_has_rds(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg) { return _upb_getoneofcase(msg, UPB_SIZE(144, 264)) == 3; } +UPB_INLINE const envoy_extensions_filters_network_http_connection_manager_v3_Rds* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_rds(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg) { return UPB_READ_ONEOF(msg, const envoy_extensions_filters_network_http_connection_manager_v3_Rds*, UPB_SIZE(140, 256), UPB_SIZE(144, 264), 3, NULL); } +UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_has_route_config(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg) { return _upb_getoneofcase(msg, UPB_SIZE(144, 264)) == 4; } +UPB_INLINE const struct envoy_config_route_v3_RouteConfiguration* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_route_config(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg) { return UPB_READ_ONEOF(msg, const struct envoy_config_route_v3_RouteConfiguration*, UPB_SIZE(140, 256), UPB_SIZE(144, 264), 4, NULL); } +UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_has_http_filters(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(128, 232)); } +UPB_INLINE const envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter* const* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_http_filters(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, size_t *len) { return (const envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter* const*)_upb_array_accessor(msg, UPB_SIZE(128, 232), len); } UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_has_add_user_agent(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg) { return _upb_hasbit(msg, 1); } UPB_INLINE const struct google_protobuf_BoolValue* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_add_user_agent(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(52, 80), const struct google_protobuf_BoolValue*); } UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_has_tracing(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg) { return _upb_hasbit(msg, 2); } @@ -186,8 +190,8 @@ UPB_INLINE const struct envoy_config_core_v3_Http2ProtocolOptions* envoy_extensi UPB_INLINE upb_strview envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_server_name(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(36, 48), upb_strview); } UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_has_drain_timeout(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg) { return _upb_hasbit(msg, 5); } UPB_INLINE const struct google_protobuf_Duration* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_drain_timeout(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(68, 112), const struct google_protobuf_Duration*); } -UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_has_access_log(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(128, 232)); } -UPB_INLINE const struct envoy_config_accesslog_v3_AccessLog* const* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_access_log(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, size_t *len) { return (const struct envoy_config_accesslog_v3_AccessLog* const*)_upb_array_accessor(msg, UPB_SIZE(128, 232), len); } +UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_has_access_log(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(132, 240)); } +UPB_INLINE const struct envoy_config_accesslog_v3_AccessLog* const* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_access_log(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, size_t *len) { return (const struct envoy_config_accesslog_v3_AccessLog* const*)_upb_array_accessor(msg, UPB_SIZE(132, 240), len); } UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_has_use_remote_address(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg) { return _upb_hasbit(msg, 6); } UPB_INLINE const struct google_protobuf_BoolValue* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_use_remote_address(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(72, 120), const struct google_protobuf_BoolValue*); } UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_has_generate_request_id(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg) { return _upb_hasbit(msg, 7); } @@ -200,8 +204,8 @@ UPB_INLINE uint32_t envoy_extensions_filters_network_http_connection_manager_v3_ UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_represent_ipv4_remote_address_as_ipv4_mapped_ipv6(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(21, 21), bool); } UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_skip_xff_append(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(22, 22), bool); } UPB_INLINE upb_strview envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_via(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(44, 64), upb_strview); } -UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_has_upgrade_configs(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(132, 240)); } -UPB_INLINE const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig* const* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_upgrade_configs(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, size_t *len) { return (const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig* const*)_upb_array_accessor(msg, UPB_SIZE(132, 240), len); } +UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_has_upgrade_configs(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(136, 248)); } +UPB_INLINE const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig* const* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_upgrade_configs(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, size_t *len) { return (const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig* const*)_upb_array_accessor(msg, UPB_SIZE(136, 248), len); } UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_has_stream_idle_timeout(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg) { return _upb_hasbit(msg, 9); } UPB_INLINE const struct google_protobuf_Duration* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_stream_idle_timeout(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(84, 144), const struct google_protobuf_Duration*); } UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_has_internal_address_config(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg) { return _upb_hasbit(msg, 10); } @@ -214,8 +218,8 @@ UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_Http UPB_INLINE const struct google_protobuf_UInt32Value* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_max_request_headers_kb(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(100, 176), const struct google_protobuf_UInt32Value*); } UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_has_normalize_path(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg) { return _upb_hasbit(msg, 14); } UPB_INLINE const struct google_protobuf_BoolValue* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_normalize_path(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(104, 184), const struct google_protobuf_BoolValue*); } -UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_has_scoped_routes(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg) { return _upb_getoneofcase(msg, UPB_SIZE(140, 256)) == 31; } -UPB_INLINE const envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_scoped_routes(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg) { return UPB_READ_ONEOF(msg, const envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes*, UPB_SIZE(136, 248), UPB_SIZE(140, 256), 31, NULL); } +UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_has_scoped_routes(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg) { return _upb_getoneofcase(msg, UPB_SIZE(144, 264)) == 31; } +UPB_INLINE const envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_scoped_routes(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg) { return UPB_READ_ONEOF(msg, const envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes*, UPB_SIZE(140, 256), UPB_SIZE(144, 264), 31, NULL); } UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_preserve_external_request_id(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(23, 23), bool); } UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_merge_slashes(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(24, 24), bool); } UPB_INLINE int32_t envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_server_header_transformation(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(12, 12), int32_t); } @@ -229,6 +233,10 @@ UPB_INLINE const envoy_extensions_filters_network_http_connection_manager_v3_Loc UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_strip_matching_host_port(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(26, 26), bool); } UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_has_stream_error_on_invalid_http_message(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg) { return _upb_hasbit(msg, 18); } UPB_INLINE const struct google_protobuf_BoolValue* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_stream_error_on_invalid_http_message(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(120, 216), const struct google_protobuf_BoolValue*); } +UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_has_request_headers_timeout(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg) { return _upb_hasbit(msg, 19); } +UPB_INLINE const struct google_protobuf_Duration* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_request_headers_timeout(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(124, 224), const struct google_protobuf_Duration*); } +UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_has_strip_any_host_port(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg) { return _upb_getoneofcase(msg, UPB_SIZE(152, 272)) == 42; } +UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_strip_any_host_port(const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg) { return UPB_READ_ONEOF(msg, bool, UPB_SIZE(148, 268), UPB_SIZE(152, 272), 42, false); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_codec_type(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, int32_t value) { *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t) = value; @@ -237,7 +245,7 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http *UPB_PTR_AT(msg, UPB_SIZE(28, 32), upb_strview) = value; } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_rds(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, envoy_extensions_filters_network_http_connection_manager_v3_Rds* value) { - UPB_WRITE_ONEOF(msg, envoy_extensions_filters_network_http_connection_manager_v3_Rds*, UPB_SIZE(136, 248), value, UPB_SIZE(140, 256), 3); + UPB_WRITE_ONEOF(msg, envoy_extensions_filters_network_http_connection_manager_v3_Rds*, UPB_SIZE(140, 256), value, UPB_SIZE(144, 264), 3); } UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_Rds* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_rds(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, upb_arena *arena) { struct envoy_extensions_filters_network_http_connection_manager_v3_Rds* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_Rds*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_rds(msg); @@ -249,7 +257,7 @@ UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_Rd return sub; } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_route_config(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, struct envoy_config_route_v3_RouteConfiguration* value) { - UPB_WRITE_ONEOF(msg, struct envoy_config_route_v3_RouteConfiguration*, UPB_SIZE(136, 248), value, UPB_SIZE(140, 256), 4); + UPB_WRITE_ONEOF(msg, struct envoy_config_route_v3_RouteConfiguration*, UPB_SIZE(140, 256), value, UPB_SIZE(144, 264), 4); } UPB_INLINE struct envoy_config_route_v3_RouteConfiguration* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_route_config(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, upb_arena *arena) { struct envoy_config_route_v3_RouteConfiguration* sub = (struct envoy_config_route_v3_RouteConfiguration*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_route_config(msg); @@ -261,15 +269,15 @@ UPB_INLINE struct envoy_config_route_v3_RouteConfiguration* envoy_extensions_fil return sub; } UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter** envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_http_filters(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, size_t *len) { - return (envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter**)_upb_array_mutable_accessor(msg, UPB_SIZE(124, 224), len); + return (envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter**)_upb_array_mutable_accessor(msg, UPB_SIZE(128, 232), len); } UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter** envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_resize_http_filters(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, size_t len, upb_arena *arena) { - return (envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter**)_upb_array_resize_accessor2(msg, UPB_SIZE(124, 224), len, UPB_SIZE(2, 3), arena); + return (envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter**)_upb_array_resize_accessor2(msg, UPB_SIZE(128, 232), len, UPB_SIZE(2, 3), arena); } UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_add_http_filters(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, upb_arena *arena) { struct envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter*)_upb_msg_new(&envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_msginit, arena); bool ok = _upb_array_append_accessor2( - msg, UPB_SIZE(124, 224), UPB_SIZE(2, 3), &sub, arena); + msg, UPB_SIZE(128, 232), UPB_SIZE(2, 3), &sub, arena); if (!ok) return NULL; return sub; } @@ -342,15 +350,15 @@ UPB_INLINE struct google_protobuf_Duration* envoy_extensions_filters_network_htt return sub; } UPB_INLINE struct envoy_config_accesslog_v3_AccessLog** envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_access_log(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, size_t *len) { - return (struct envoy_config_accesslog_v3_AccessLog**)_upb_array_mutable_accessor(msg, UPB_SIZE(128, 232), len); + return (struct envoy_config_accesslog_v3_AccessLog**)_upb_array_mutable_accessor(msg, UPB_SIZE(132, 240), len); } UPB_INLINE struct envoy_config_accesslog_v3_AccessLog** envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_resize_access_log(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, size_t len, upb_arena *arena) { - return (struct envoy_config_accesslog_v3_AccessLog**)_upb_array_resize_accessor2(msg, UPB_SIZE(128, 232), len, UPB_SIZE(2, 3), arena); + return (struct envoy_config_accesslog_v3_AccessLog**)_upb_array_resize_accessor2(msg, UPB_SIZE(132, 240), len, UPB_SIZE(2, 3), arena); } UPB_INLINE struct envoy_config_accesslog_v3_AccessLog* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_add_access_log(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, upb_arena *arena) { struct envoy_config_accesslog_v3_AccessLog* sub = (struct envoy_config_accesslog_v3_AccessLog*)_upb_msg_new(&envoy_config_accesslog_v3_AccessLog_msginit, arena); bool ok = _upb_array_append_accessor2( - msg, UPB_SIZE(128, 232), UPB_SIZE(2, 3), &sub, arena); + msg, UPB_SIZE(132, 240), UPB_SIZE(2, 3), &sub, arena); if (!ok) return NULL; return sub; } @@ -412,15 +420,15 @@ UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Http *UPB_PTR_AT(msg, UPB_SIZE(44, 64), upb_strview) = value; } UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig** envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_upgrade_configs(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, size_t *len) { - return (envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig**)_upb_array_mutable_accessor(msg, UPB_SIZE(132, 240), len); + return (envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig**)_upb_array_mutable_accessor(msg, UPB_SIZE(136, 248), len); } UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig** envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_resize_upgrade_configs(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, size_t len, upb_arena *arena) { - return (envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig**)_upb_array_resize_accessor2(msg, UPB_SIZE(132, 240), len, UPB_SIZE(2, 3), arena); + return (envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig**)_upb_array_resize_accessor2(msg, UPB_SIZE(136, 248), len, UPB_SIZE(2, 3), arena); } UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_add_upgrade_configs(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, upb_arena *arena) { struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig*)_upb_msg_new(&envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_UpgradeConfig_msginit, arena); bool ok = _upb_array_append_accessor2( - msg, UPB_SIZE(132, 240), UPB_SIZE(2, 3), &sub, arena); + msg, UPB_SIZE(136, 248), UPB_SIZE(2, 3), &sub, arena); if (!ok) return NULL; return sub; } @@ -503,7 +511,7 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_filters_network_ht return sub; } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_scoped_routes(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes* value) { - UPB_WRITE_ONEOF(msg, envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes*, UPB_SIZE(136, 248), value, UPB_SIZE(140, 256), 31); + UPB_WRITE_ONEOF(msg, envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes*, UPB_SIZE(140, 256), value, UPB_SIZE(144, 264), 31); } UPB_INLINE struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_scoped_routes(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, upb_arena *arena) { struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes* sub = (struct envoy_extensions_filters_network_http_connection_manager_v3_ScopedRoutes*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_scoped_routes(msg); @@ -581,6 +589,22 @@ UPB_INLINE struct google_protobuf_BoolValue* envoy_extensions_filters_network_ht } return sub; } +UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_request_headers_timeout(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, struct google_protobuf_Duration* value) { + _upb_sethas(msg, 19); + *UPB_PTR_AT(msg, UPB_SIZE(124, 224), struct google_protobuf_Duration*) = value; +} +UPB_INLINE struct google_protobuf_Duration* envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_mutable_request_headers_timeout(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, upb_arena *arena) { + struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_request_headers_timeout(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Duration*)_upb_msg_new(&google_protobuf_Duration_msginit, arena); + if (!sub) return NULL; + envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_request_headers_timeout(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_set_strip_any_host_port(envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager *msg, bool value) { + UPB_WRITE_ONEOF(msg, bool, UPB_SIZE(148, 268), value, UPB_SIZE(152, 272), 42); +} /* envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.Tracing */ @@ -1005,8 +1029,6 @@ UPB_INLINE char *envoy_extensions_filters_network_http_connection_manager_v3_Rds UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_Rds_has_config_source(const envoy_extensions_filters_network_http_connection_manager_v3_Rds *msg) { return _upb_hasbit(msg, 1); } UPB_INLINE const struct envoy_config_core_v3_ConfigSource* envoy_extensions_filters_network_http_connection_manager_v3_Rds_config_source(const envoy_extensions_filters_network_http_connection_manager_v3_Rds *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(12, 24), const struct envoy_config_core_v3_ConfigSource*); } UPB_INLINE upb_strview envoy_extensions_filters_network_http_connection_manager_v3_Rds_route_config_name(const envoy_extensions_filters_network_http_connection_manager_v3_Rds *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview); } -UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_Rds_has_rds_resource_locator(const envoy_extensions_filters_network_http_connection_manager_v3_Rds *msg) { return _upb_hasbit(msg, 2); } -UPB_INLINE const struct udpa_core_v1_ResourceLocator* envoy_extensions_filters_network_http_connection_manager_v3_Rds_rds_resource_locator(const envoy_extensions_filters_network_http_connection_manager_v3_Rds *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(16, 32), const struct udpa_core_v1_ResourceLocator*); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Rds_set_config_source(envoy_extensions_filters_network_http_connection_manager_v3_Rds *msg, struct envoy_config_core_v3_ConfigSource* value) { _upb_sethas(msg, 1); @@ -1024,19 +1046,6 @@ UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_extensions_filters_ne UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Rds_set_route_config_name(envoy_extensions_filters_network_http_connection_manager_v3_Rds *msg, upb_strview value) { *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview) = value; } -UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_Rds_set_rds_resource_locator(envoy_extensions_filters_network_http_connection_manager_v3_Rds *msg, struct udpa_core_v1_ResourceLocator* value) { - _upb_sethas(msg, 2); - *UPB_PTR_AT(msg, UPB_SIZE(16, 32), struct udpa_core_v1_ResourceLocator*) = value; -} -UPB_INLINE struct udpa_core_v1_ResourceLocator* envoy_extensions_filters_network_http_connection_manager_v3_Rds_mutable_rds_resource_locator(envoy_extensions_filters_network_http_connection_manager_v3_Rds *msg, upb_arena *arena) { - struct udpa_core_v1_ResourceLocator* sub = (struct udpa_core_v1_ResourceLocator*)envoy_extensions_filters_network_http_connection_manager_v3_Rds_rds_resource_locator(msg); - if (sub == NULL) { - sub = (struct udpa_core_v1_ResourceLocator*)_upb_msg_new(&udpa_core_v1_ResourceLocator_msginit, arena); - if (!sub) return NULL; - envoy_extensions_filters_network_http_connection_manager_v3_Rds_set_rds_resource_locator(msg, sub); - } - return sub; -} /* envoy.extensions.filters.network.http_connection_manager.v3.ScopedRouteConfigurationsList */ @@ -1393,19 +1402,20 @@ typedef enum { envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_config_type_config_discovery = 5, envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_config_type_NOT_SET = 0 } envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_config_type_oneofcases; -UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_config_type_oneofcases envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_config_type_case(const envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter* msg) { return (envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_config_type_oneofcases)*UPB_PTR_AT(msg, UPB_SIZE(12, 24), int32_t); } +UPB_INLINE envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_config_type_oneofcases envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_config_type_case(const envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter* msg) { return (envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_config_type_oneofcases)*UPB_PTR_AT(msg, UPB_SIZE(16, 32), int32_t); } -UPB_INLINE upb_strview envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_name(const envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(0, 0), upb_strview); } -UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_has_typed_config(const envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter *msg) { return _upb_getoneofcase(msg, UPB_SIZE(12, 24)) == 4; } -UPB_INLINE const struct google_protobuf_Any* envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_typed_config(const envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter *msg) { return UPB_READ_ONEOF(msg, const struct google_protobuf_Any*, UPB_SIZE(8, 16), UPB_SIZE(12, 24), 4, NULL); } -UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_has_config_discovery(const envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter *msg) { return _upb_getoneofcase(msg, UPB_SIZE(12, 24)) == 5; } -UPB_INLINE const struct envoy_config_core_v3_ExtensionConfigSource* envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_config_discovery(const envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter *msg) { return UPB_READ_ONEOF(msg, const struct envoy_config_core_v3_ExtensionConfigSource*, UPB_SIZE(8, 16), UPB_SIZE(12, 24), 5, NULL); } +UPB_INLINE upb_strview envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_name(const envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview); } +UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_has_typed_config(const envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter *msg) { return _upb_getoneofcase(msg, UPB_SIZE(16, 32)) == 4; } +UPB_INLINE const struct google_protobuf_Any* envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_typed_config(const envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter *msg) { return UPB_READ_ONEOF(msg, const struct google_protobuf_Any*, UPB_SIZE(12, 24), UPB_SIZE(16, 32), 4, NULL); } +UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_has_config_discovery(const envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter *msg) { return _upb_getoneofcase(msg, UPB_SIZE(16, 32)) == 5; } +UPB_INLINE const struct envoy_config_core_v3_ExtensionConfigSource* envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_config_discovery(const envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter *msg) { return UPB_READ_ONEOF(msg, const struct envoy_config_core_v3_ExtensionConfigSource*, UPB_SIZE(12, 24), UPB_SIZE(16, 32), 5, NULL); } +UPB_INLINE bool envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_is_optional(const envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(0, 0), bool); } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_set_name(envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter *msg, upb_strview value) { - *UPB_PTR_AT(msg, UPB_SIZE(0, 0), upb_strview) = value; + *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview) = value; } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_set_typed_config(envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter *msg, struct google_protobuf_Any* value) { - UPB_WRITE_ONEOF(msg, struct google_protobuf_Any*, UPB_SIZE(8, 16), value, UPB_SIZE(12, 24), 4); + UPB_WRITE_ONEOF(msg, struct google_protobuf_Any*, UPB_SIZE(12, 24), value, UPB_SIZE(16, 32), 4); } UPB_INLINE struct google_protobuf_Any* envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_mutable_typed_config(envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter *msg, upb_arena *arena) { struct google_protobuf_Any* sub = (struct google_protobuf_Any*)envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_typed_config(msg); @@ -1417,7 +1427,7 @@ UPB_INLINE struct google_protobuf_Any* envoy_extensions_filters_network_http_con return sub; } UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_set_config_discovery(envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter *msg, struct envoy_config_core_v3_ExtensionConfigSource* value) { - UPB_WRITE_ONEOF(msg, struct envoy_config_core_v3_ExtensionConfigSource*, UPB_SIZE(8, 16), value, UPB_SIZE(12, 24), 5); + UPB_WRITE_ONEOF(msg, struct envoy_config_core_v3_ExtensionConfigSource*, UPB_SIZE(12, 24), value, UPB_SIZE(16, 32), 5); } UPB_INLINE struct envoy_config_core_v3_ExtensionConfigSource* envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_mutable_config_discovery(envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter *msg, upb_arena *arena) { struct envoy_config_core_v3_ExtensionConfigSource* sub = (struct envoy_config_core_v3_ExtensionConfigSource*)envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_config_discovery(msg); @@ -1428,6 +1438,9 @@ UPB_INLINE struct envoy_config_core_v3_ExtensionConfigSource* envoy_extensions_f } return sub; } +UPB_INLINE void envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_set_is_optional(envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter *msg, bool value) { + *UPB_PTR_AT(msg, UPB_SIZE(0, 0), bool) = value; +} /* envoy.extensions.filters.network.http_connection_manager.v3.RequestIDExtension */ diff --git a/grpc/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.c b/grpc/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.c index 9ae915cd..44d63a49 100644 --- a/grpc/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.c +++ b/grpc/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.c @@ -9,7 +9,6 @@ #include <stddef.h> #include "upb/msg.h" #include "envoy/extensions/transport_sockets/tls/v3/cert.upb.h" -#include "udpa/annotations/status.upb.h" #include "envoy/extensions/transport_sockets/tls/v3/common.upb.h" #include "envoy/extensions/transport_sockets/tls/v3/secret.upb.h" #include "envoy/extensions/transport_sockets/tls/v3/tls.upb.h" diff --git a/grpc/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.c b/grpc/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.c index f2dd45cb..247f262e 100644 --- a/grpc/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.c +++ b/grpc/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.c @@ -12,7 +12,6 @@ #include "envoy/config/core/v3/base.upb.h" #include "envoy/type/matcher/v3/string.upb.h" #include "google/protobuf/any.upb.h" -#include "google/protobuf/struct.upb.h" #include "google/protobuf/wrappers.upb.h" #include "udpa/annotations/sensitive.upb.h" #include "udpa/annotations/status.upb.h" @@ -49,24 +48,26 @@ const upb_msglayout envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider UPB_SIZE(16, 32), 2, false, 255, }; -static const upb_msglayout *const envoy_extensions_transport_sockets_tls_v3_TlsCertificate_submsgs[2] = { +static const upb_msglayout *const envoy_extensions_transport_sockets_tls_v3_TlsCertificate_submsgs[3] = { &envoy_config_core_v3_DataSource_msginit, + &envoy_config_core_v3_WatchedDirectory_msginit, &envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider_msginit, }; -static const upb_msglayout_field envoy_extensions_transport_sockets_tls_v3_TlsCertificate__fields[6] = { +static const upb_msglayout_field envoy_extensions_transport_sockets_tls_v3_TlsCertificate__fields[7] = { {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, {2, UPB_SIZE(8, 16), 2, 0, 11, 1}, {3, UPB_SIZE(12, 24), 3, 0, 11, 1}, {4, UPB_SIZE(16, 32), 4, 0, 11, 1}, - {5, UPB_SIZE(24, 48), 0, 0, 11, 3}, - {6, UPB_SIZE(20, 40), 5, 1, 11, 1}, + {5, UPB_SIZE(28, 56), 0, 0, 11, 3}, + {6, UPB_SIZE(20, 40), 5, 2, 11, 1}, + {7, UPB_SIZE(24, 48), 6, 1, 11, 1}, }; const upb_msglayout envoy_extensions_transport_sockets_tls_v3_TlsCertificate_msginit = { &envoy_extensions_transport_sockets_tls_v3_TlsCertificate_submsgs[0], &envoy_extensions_transport_sockets_tls_v3_TlsCertificate__fields[0], - UPB_SIZE(32, 56), 6, false, 255, + UPB_SIZE(32, 64), 7, false, 255, }; static const upb_msglayout *const envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_submsgs[1] = { @@ -83,27 +84,29 @@ const upb_msglayout envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKe UPB_SIZE(8, 8), 1, false, 255, }; -static const upb_msglayout *const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_submsgs[3] = { +static const upb_msglayout *const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_submsgs[4] = { &envoy_config_core_v3_DataSource_msginit, + &envoy_config_core_v3_WatchedDirectory_msginit, &envoy_type_matcher_v3_StringMatcher_msginit, &google_protobuf_BoolValue_msginit, }; -static const upb_msglayout_field envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext__fields[8] = { +static const upb_msglayout_field envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext__fields[9] = { {1, UPB_SIZE(12, 16), 1, 0, 11, 1}, - {2, UPB_SIZE(24, 40), 0, 0, 9, 3}, - {3, UPB_SIZE(28, 48), 0, 0, 9, 3}, - {6, UPB_SIZE(16, 24), 2, 2, 11, 1}, + {2, UPB_SIZE(28, 48), 0, 0, 9, 3}, + {3, UPB_SIZE(32, 56), 0, 0, 9, 3}, + {6, UPB_SIZE(16, 24), 2, 3, 11, 1}, {7, UPB_SIZE(20, 32), 3, 0, 11, 1}, {8, UPB_SIZE(8, 8), 0, 0, 8, 1}, - {9, UPB_SIZE(32, 56), 0, 1, 11, 3}, + {9, UPB_SIZE(36, 64), 0, 2, 11, 3}, {10, UPB_SIZE(4, 4), 0, 0, 14, 1}, + {11, UPB_SIZE(24, 40), 4, 1, 11, 1}, }; const upb_msglayout envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_msginit = { &envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_submsgs[0], &envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext__fields[0], - UPB_SIZE(40, 64), 8, false, 255, + UPB_SIZE(40, 72), 9, false, 255, }; #include "upb/port_undef.inc" diff --git a/grpc/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.h b/grpc/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.h index 59b0edbd..73b534aa 100644 --- a/grpc/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.h +++ b/grpc/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.h @@ -36,10 +36,12 @@ extern const upb_msglayout envoy_extensions_transport_sockets_tls_v3_TlsCertific extern const upb_msglayout envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_msginit; extern const upb_msglayout envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_msginit; struct envoy_config_core_v3_DataSource; +struct envoy_config_core_v3_WatchedDirectory; struct envoy_type_matcher_v3_StringMatcher; struct google_protobuf_Any; struct google_protobuf_BoolValue; extern const upb_msglayout envoy_config_core_v3_DataSource_msginit; +extern const upb_msglayout envoy_config_core_v3_WatchedDirectory_msginit; extern const upb_msglayout envoy_type_matcher_v3_StringMatcher_msginit; extern const upb_msglayout google_protobuf_Any_msginit; extern const upb_msglayout google_protobuf_BoolValue_msginit; @@ -184,10 +186,12 @@ UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_TlsCertificate_has_pas UPB_INLINE const struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_password(const envoy_extensions_transport_sockets_tls_v3_TlsCertificate *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(12, 24), const struct envoy_config_core_v3_DataSource*); } UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_TlsCertificate_has_ocsp_staple(const envoy_extensions_transport_sockets_tls_v3_TlsCertificate *msg) { return _upb_hasbit(msg, 4); } UPB_INLINE const struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_ocsp_staple(const envoy_extensions_transport_sockets_tls_v3_TlsCertificate *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(16, 32), const struct envoy_config_core_v3_DataSource*); } -UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_TlsCertificate_has_signed_certificate_timestamp(const envoy_extensions_transport_sockets_tls_v3_TlsCertificate *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(24, 48)); } -UPB_INLINE const struct envoy_config_core_v3_DataSource* const* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_signed_certificate_timestamp(const envoy_extensions_transport_sockets_tls_v3_TlsCertificate *msg, size_t *len) { return (const struct envoy_config_core_v3_DataSource* const*)_upb_array_accessor(msg, UPB_SIZE(24, 48), len); } +UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_TlsCertificate_has_signed_certificate_timestamp(const envoy_extensions_transport_sockets_tls_v3_TlsCertificate *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(28, 56)); } +UPB_INLINE const struct envoy_config_core_v3_DataSource* const* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_signed_certificate_timestamp(const envoy_extensions_transport_sockets_tls_v3_TlsCertificate *msg, size_t *len) { return (const struct envoy_config_core_v3_DataSource* const*)_upb_array_accessor(msg, UPB_SIZE(28, 56), len); } UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_TlsCertificate_has_private_key_provider(const envoy_extensions_transport_sockets_tls_v3_TlsCertificate *msg) { return _upb_hasbit(msg, 5); } UPB_INLINE const envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_private_key_provider(const envoy_extensions_transport_sockets_tls_v3_TlsCertificate *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(20, 40), const envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider*); } +UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_TlsCertificate_has_watched_directory(const envoy_extensions_transport_sockets_tls_v3_TlsCertificate *msg) { return _upb_hasbit(msg, 6); } +UPB_INLINE const struct envoy_config_core_v3_WatchedDirectory* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_watched_directory(const envoy_extensions_transport_sockets_tls_v3_TlsCertificate *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(24, 48), const struct envoy_config_core_v3_WatchedDirectory*); } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsCertificate_set_certificate_chain(envoy_extensions_transport_sockets_tls_v3_TlsCertificate *msg, struct envoy_config_core_v3_DataSource* value) { _upb_sethas(msg, 1); @@ -242,15 +246,15 @@ UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_transport_so return sub; } UPB_INLINE struct envoy_config_core_v3_DataSource** envoy_extensions_transport_sockets_tls_v3_TlsCertificate_mutable_signed_certificate_timestamp(envoy_extensions_transport_sockets_tls_v3_TlsCertificate *msg, size_t *len) { - return (struct envoy_config_core_v3_DataSource**)_upb_array_mutable_accessor(msg, UPB_SIZE(24, 48), len); + return (struct envoy_config_core_v3_DataSource**)_upb_array_mutable_accessor(msg, UPB_SIZE(28, 56), len); } UPB_INLINE struct envoy_config_core_v3_DataSource** envoy_extensions_transport_sockets_tls_v3_TlsCertificate_resize_signed_certificate_timestamp(envoy_extensions_transport_sockets_tls_v3_TlsCertificate *msg, size_t len, upb_arena *arena) { - return (struct envoy_config_core_v3_DataSource**)_upb_array_resize_accessor2(msg, UPB_SIZE(24, 48), len, UPB_SIZE(2, 3), arena); + return (struct envoy_config_core_v3_DataSource**)_upb_array_resize_accessor2(msg, UPB_SIZE(28, 56), len, UPB_SIZE(2, 3), arena); } UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_add_signed_certificate_timestamp(envoy_extensions_transport_sockets_tls_v3_TlsCertificate *msg, upb_arena *arena) { struct envoy_config_core_v3_DataSource* sub = (struct envoy_config_core_v3_DataSource*)_upb_msg_new(&envoy_config_core_v3_DataSource_msginit, arena); bool ok = _upb_array_append_accessor2( - msg, UPB_SIZE(24, 48), UPB_SIZE(2, 3), &sub, arena); + msg, UPB_SIZE(28, 56), UPB_SIZE(2, 3), &sub, arena); if (!ok) return NULL; return sub; } @@ -267,6 +271,19 @@ UPB_INLINE struct envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider* } return sub; } +UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_TlsCertificate_set_watched_directory(envoy_extensions_transport_sockets_tls_v3_TlsCertificate *msg, struct envoy_config_core_v3_WatchedDirectory* value) { + _upb_sethas(msg, 6); + *UPB_PTR_AT(msg, UPB_SIZE(24, 48), struct envoy_config_core_v3_WatchedDirectory*) = value; +} +UPB_INLINE struct envoy_config_core_v3_WatchedDirectory* envoy_extensions_transport_sockets_tls_v3_TlsCertificate_mutable_watched_directory(envoy_extensions_transport_sockets_tls_v3_TlsCertificate *msg, upb_arena *arena) { + struct envoy_config_core_v3_WatchedDirectory* sub = (struct envoy_config_core_v3_WatchedDirectory*)envoy_extensions_transport_sockets_tls_v3_TlsCertificate_watched_directory(msg); + if (sub == NULL) { + sub = (struct envoy_config_core_v3_WatchedDirectory*)_upb_msg_new(&envoy_config_core_v3_WatchedDirectory_msginit, arena); + if (!sub) return NULL; + envoy_extensions_transport_sockets_tls_v3_TlsCertificate_set_watched_directory(msg, sub); + } + return sub; +} /* envoy.extensions.transport_sockets.tls.v3.TlsSessionTicketKeys */ @@ -327,16 +344,18 @@ UPB_INLINE char *envoy_extensions_transport_sockets_tls_v3_CertificateValidation UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_has_trusted_ca(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg) { return _upb_hasbit(msg, 1); } UPB_INLINE const struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_trusted_ca(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(12, 16), const struct envoy_config_core_v3_DataSource*); } -UPB_INLINE upb_strview const* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_verify_certificate_hash(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, size_t *len) { return (upb_strview const*)_upb_array_accessor(msg, UPB_SIZE(24, 40), len); } -UPB_INLINE upb_strview const* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_verify_certificate_spki(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, size_t *len) { return (upb_strview const*)_upb_array_accessor(msg, UPB_SIZE(28, 48), len); } +UPB_INLINE upb_strview const* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_verify_certificate_hash(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, size_t *len) { return (upb_strview const*)_upb_array_accessor(msg, UPB_SIZE(28, 48), len); } +UPB_INLINE upb_strview const* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_verify_certificate_spki(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, size_t *len) { return (upb_strview const*)_upb_array_accessor(msg, UPB_SIZE(32, 56), len); } UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_has_require_signed_certificate_timestamp(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg) { return _upb_hasbit(msg, 2); } UPB_INLINE const struct google_protobuf_BoolValue* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_require_signed_certificate_timestamp(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(16, 24), const struct google_protobuf_BoolValue*); } UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_has_crl(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg) { return _upb_hasbit(msg, 3); } UPB_INLINE const struct envoy_config_core_v3_DataSource* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_crl(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(20, 32), const struct envoy_config_core_v3_DataSource*); } UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_allow_expired_certificate(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(8, 8), bool); } -UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_has_match_subject_alt_names(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(32, 56)); } -UPB_INLINE const struct envoy_type_matcher_v3_StringMatcher* const* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_match_subject_alt_names(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, size_t *len) { return (const struct envoy_type_matcher_v3_StringMatcher* const*)_upb_array_accessor(msg, UPB_SIZE(32, 56), len); } +UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_has_match_subject_alt_names(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(36, 64)); } +UPB_INLINE const struct envoy_type_matcher_v3_StringMatcher* const* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_match_subject_alt_names(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, size_t *len) { return (const struct envoy_type_matcher_v3_StringMatcher* const*)_upb_array_accessor(msg, UPB_SIZE(36, 64), len); } UPB_INLINE int32_t envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_trust_chain_verification(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t); } +UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_has_watched_directory(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg) { return _upb_hasbit(msg, 4); } +UPB_INLINE const struct envoy_config_core_v3_WatchedDirectory* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_watched_directory(const envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(24, 40), const struct envoy_config_core_v3_WatchedDirectory*); } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_trusted_ca(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, struct envoy_config_core_v3_DataSource* value) { _upb_sethas(msg, 1); @@ -352,23 +371,23 @@ UPB_INLINE struct envoy_config_core_v3_DataSource* envoy_extensions_transport_so return sub; } UPB_INLINE upb_strview* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_mutable_verify_certificate_hash(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, size_t *len) { - return (upb_strview*)_upb_array_mutable_accessor(msg, UPB_SIZE(24, 40), len); + return (upb_strview*)_upb_array_mutable_accessor(msg, UPB_SIZE(28, 48), len); } UPB_INLINE upb_strview* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_resize_verify_certificate_hash(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, size_t len, upb_arena *arena) { - return (upb_strview*)_upb_array_resize_accessor2(msg, UPB_SIZE(24, 40), len, UPB_SIZE(3, 4), arena); + return (upb_strview*)_upb_array_resize_accessor2(msg, UPB_SIZE(28, 48), len, UPB_SIZE(3, 4), arena); } UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_add_verify_certificate_hash(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, upb_strview val, upb_arena *arena) { - return _upb_array_append_accessor2(msg, UPB_SIZE(24, 40), UPB_SIZE(3, 4), &val, + return _upb_array_append_accessor2(msg, UPB_SIZE(28, 48), UPB_SIZE(3, 4), &val, arena); } UPB_INLINE upb_strview* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_mutable_verify_certificate_spki(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, size_t *len) { - return (upb_strview*)_upb_array_mutable_accessor(msg, UPB_SIZE(28, 48), len); + return (upb_strview*)_upb_array_mutable_accessor(msg, UPB_SIZE(32, 56), len); } UPB_INLINE upb_strview* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_resize_verify_certificate_spki(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, size_t len, upb_arena *arena) { - return (upb_strview*)_upb_array_resize_accessor2(msg, UPB_SIZE(28, 48), len, UPB_SIZE(3, 4), arena); + return (upb_strview*)_upb_array_resize_accessor2(msg, UPB_SIZE(32, 56), len, UPB_SIZE(3, 4), arena); } UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_add_verify_certificate_spki(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, upb_strview val, upb_arena *arena) { - return _upb_array_append_accessor2(msg, UPB_SIZE(28, 48), UPB_SIZE(3, 4), &val, + return _upb_array_append_accessor2(msg, UPB_SIZE(32, 56), UPB_SIZE(3, 4), &val, arena); } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_require_signed_certificate_timestamp(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, struct google_protobuf_BoolValue* value) { @@ -401,21 +420,34 @@ UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationC *UPB_PTR_AT(msg, UPB_SIZE(8, 8), bool) = value; } UPB_INLINE struct envoy_type_matcher_v3_StringMatcher** envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_mutable_match_subject_alt_names(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, size_t *len) { - return (struct envoy_type_matcher_v3_StringMatcher**)_upb_array_mutable_accessor(msg, UPB_SIZE(32, 56), len); + return (struct envoy_type_matcher_v3_StringMatcher**)_upb_array_mutable_accessor(msg, UPB_SIZE(36, 64), len); } UPB_INLINE struct envoy_type_matcher_v3_StringMatcher** envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_resize_match_subject_alt_names(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, size_t len, upb_arena *arena) { - return (struct envoy_type_matcher_v3_StringMatcher**)_upb_array_resize_accessor2(msg, UPB_SIZE(32, 56), len, UPB_SIZE(2, 3), arena); + return (struct envoy_type_matcher_v3_StringMatcher**)_upb_array_resize_accessor2(msg, UPB_SIZE(36, 64), len, UPB_SIZE(2, 3), arena); } UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_add_match_subject_alt_names(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, upb_arena *arena) { struct envoy_type_matcher_v3_StringMatcher* sub = (struct envoy_type_matcher_v3_StringMatcher*)_upb_msg_new(&envoy_type_matcher_v3_StringMatcher_msginit, arena); bool ok = _upb_array_append_accessor2( - msg, UPB_SIZE(32, 56), UPB_SIZE(2, 3), &sub, arena); + msg, UPB_SIZE(36, 64), UPB_SIZE(2, 3), &sub, arena); if (!ok) return NULL; return sub; } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_trust_chain_verification(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, int32_t value) { *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t) = value; } +UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_watched_directory(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, struct envoy_config_core_v3_WatchedDirectory* value) { + _upb_sethas(msg, 4); + *UPB_PTR_AT(msg, UPB_SIZE(24, 40), struct envoy_config_core_v3_WatchedDirectory*) = value; +} +UPB_INLINE struct envoy_config_core_v3_WatchedDirectory* envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_mutable_watched_directory(envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext *msg, upb_arena *arena) { + struct envoy_config_core_v3_WatchedDirectory* sub = (struct envoy_config_core_v3_WatchedDirectory*)envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_watched_directory(msg); + if (sub == NULL) { + sub = (struct envoy_config_core_v3_WatchedDirectory*)_upb_msg_new(&envoy_config_core_v3_WatchedDirectory_msginit, arena); + if (!sub) return NULL; + envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_set_watched_directory(msg, sub); + } + return sub; +} #ifdef __cplusplus } /* extern "C" */ diff --git a/grpc/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.c b/grpc/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.c index 6dd02962..6717a17a 100644 --- a/grpc/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.c +++ b/grpc/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.c @@ -12,11 +12,10 @@ #include "envoy/config/core/v3/base.upb.h" #include "envoy/config/core/v3/config_source.upb.h" #include "envoy/extensions/transport_sockets/tls/v3/common.upb.h" -#include "udpa/core/v1/resource_locator.upb.h" -#include "udpa/annotations/migrate.upb.h" #include "udpa/annotations/sensitive.upb.h" #include "udpa/annotations/status.upb.h" #include "udpa/annotations/versioning.upb.h" +#include "validate/validate.upb.h" #include "upb/port_def.inc" @@ -34,21 +33,19 @@ const upb_msglayout envoy_extensions_transport_sockets_tls_v3_GenericSecret_msgi UPB_SIZE(8, 16), 1, false, 255, }; -static const upb_msglayout *const envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_submsgs[2] = { +static const upb_msglayout *const envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_submsgs[1] = { &envoy_config_core_v3_ConfigSource_msginit, - &udpa_core_v1_ResourceLocator_msginit, }; -static const upb_msglayout_field envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig__fields[3] = { +static const upb_msglayout_field envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig__fields[2] = { {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, {2, UPB_SIZE(12, 24), 1, 0, 11, 1}, - {3, UPB_SIZE(16, 32), 2, 1, 11, 1}, }; const upb_msglayout envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_msginit = { &envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_submsgs[0], &envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig__fields[0], - UPB_SIZE(24, 48), 3, false, 255, + UPB_SIZE(16, 32), 2, false, 255, }; static const upb_msglayout *const envoy_extensions_transport_sockets_tls_v3_Secret_submsgs[4] = { diff --git a/grpc/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.h b/grpc/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.h index fa33aa94..c576e0ad 100644 --- a/grpc/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.h +++ b/grpc/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.h @@ -34,13 +34,11 @@ struct envoy_config_core_v3_DataSource; struct envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext; struct envoy_extensions_transport_sockets_tls_v3_TlsCertificate; struct envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys; -struct udpa_core_v1_ResourceLocator; extern const upb_msglayout envoy_config_core_v3_ConfigSource_msginit; extern const upb_msglayout envoy_config_core_v3_DataSource_msginit; extern const upb_msglayout envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_msginit; extern const upb_msglayout envoy_extensions_transport_sockets_tls_v3_TlsCertificate_msginit; extern const upb_msglayout envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys_msginit; -extern const upb_msglayout udpa_core_v1_ResourceLocator_msginit; /* envoy.extensions.transport_sockets.tls.v3.GenericSecret */ @@ -103,8 +101,6 @@ UPB_INLINE char *envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_seria UPB_INLINE upb_strview envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_name(const envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview); } UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_has_sds_config(const envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig *msg) { return _upb_hasbit(msg, 1); } UPB_INLINE const struct envoy_config_core_v3_ConfigSource* envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_sds_config(const envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(12, 24), const struct envoy_config_core_v3_ConfigSource*); } -UPB_INLINE bool envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_has_sds_resource_locator(const envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig *msg) { return _upb_hasbit(msg, 2); } -UPB_INLINE const struct udpa_core_v1_ResourceLocator* envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_sds_resource_locator(const envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(16, 32), const struct udpa_core_v1_ResourceLocator*); } UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_set_name(envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig *msg, upb_strview value) { *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview) = value; @@ -122,19 +118,6 @@ UPB_INLINE struct envoy_config_core_v3_ConfigSource* envoy_extensions_transport_ } return sub; } -UPB_INLINE void envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_set_sds_resource_locator(envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig *msg, struct udpa_core_v1_ResourceLocator* value) { - _upb_sethas(msg, 2); - *UPB_PTR_AT(msg, UPB_SIZE(16, 32), struct udpa_core_v1_ResourceLocator*) = value; -} -UPB_INLINE struct udpa_core_v1_ResourceLocator* envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_mutable_sds_resource_locator(envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig *msg, upb_arena *arena) { - struct udpa_core_v1_ResourceLocator* sub = (struct udpa_core_v1_ResourceLocator*)envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_sds_resource_locator(msg); - if (sub == NULL) { - sub = (struct udpa_core_v1_ResourceLocator*)_upb_msg_new(&udpa_core_v1_ResourceLocator_msginit, arena); - if (!sub) return NULL; - envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_set_sds_resource_locator(msg, sub); - } - return sub; -} /* envoy.extensions.transport_sockets.tls.v3.Secret */ diff --git a/grpc/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls.upb.c b/grpc/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls.upb.c index 7a5072b4..ad5494ce 100644 --- a/grpc/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls.upb.c +++ b/grpc/src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls.upb.c @@ -12,7 +12,6 @@ #include "envoy/config/core/v3/extension.upb.h" #include "envoy/extensions/transport_sockets/tls/v3/common.upb.h" #include "envoy/extensions/transport_sockets/tls/v3/secret.upb.h" -#include "google/protobuf/any.upb.h" #include "google/protobuf/duration.upb.h" #include "google/protobuf/wrappers.upb.h" #include "udpa/annotations/migrate.upb.h" diff --git a/grpc/src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.c b/grpc/src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.c index 9bed2c35..a5b6ac46 100644 --- a/grpc/src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.c +++ b/grpc/src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.c @@ -11,10 +11,8 @@ #include "envoy/service/discovery/v3/discovery.upb.h" #include "envoy/config/core/v3/base.upb.h" #include "google/protobuf/any.upb.h" +#include "google/protobuf/duration.upb.h" #include "google/rpc/status.upb.h" -#include "udpa/core/v1/resource_locator.upb.h" -#include "udpa/core/v1/resource_name.upb.h" -#include "udpa/annotations/migrate.upb.h" #include "udpa/annotations/status.upb.h" #include "udpa/annotations/versioning.upb.h" @@ -60,14 +58,13 @@ const upb_msglayout envoy_service_discovery_v3_DiscoveryResponse_msginit = { UPB_SIZE(40, 80), 6, false, 255, }; -static const upb_msglayout *const envoy_service_discovery_v3_DeltaDiscoveryRequest_submsgs[4] = { +static const upb_msglayout *const envoy_service_discovery_v3_DeltaDiscoveryRequest_submsgs[3] = { &envoy_config_core_v3_Node_msginit, &envoy_service_discovery_v3_DeltaDiscoveryRequest_InitialResourceVersionsEntry_msginit, &google_rpc_Status_msginit, - &udpa_core_v1_ResourceLocator_msginit, }; -static const upb_msglayout_field envoy_service_discovery_v3_DeltaDiscoveryRequest__fields[9] = { +static const upb_msglayout_field envoy_service_discovery_v3_DeltaDiscoveryRequest__fields[7] = { {1, UPB_SIZE(20, 40), 1, 0, 11, 1}, {2, UPB_SIZE(4, 8), 0, 0, 9, 1}, {3, UPB_SIZE(28, 56), 0, 0, 9, 3}, @@ -75,14 +72,12 @@ static const upb_msglayout_field envoy_service_discovery_v3_DeltaDiscoveryReques {5, UPB_SIZE(36, 72), 0, 1, 11, _UPB_LABEL_MAP}, {6, UPB_SIZE(12, 24), 0, 0, 9, 1}, {7, UPB_SIZE(24, 48), 2, 2, 11, 1}, - {8, UPB_SIZE(40, 80), 0, 3, 11, 3}, - {9, UPB_SIZE(44, 88), 0, 3, 11, 3}, }; const upb_msglayout envoy_service_discovery_v3_DeltaDiscoveryRequest_msginit = { &envoy_service_discovery_v3_DeltaDiscoveryRequest_submsgs[0], &envoy_service_discovery_v3_DeltaDiscoveryRequest__fields[0], - UPB_SIZE(48, 96), 9, false, 255, + UPB_SIZE(40, 80), 7, false, 255, }; static const upb_msglayout_field envoy_service_discovery_v3_DeltaDiscoveryRequest_InitialResourceVersionsEntry__fields[2] = { @@ -97,17 +92,17 @@ const upb_msglayout envoy_service_discovery_v3_DeltaDiscoveryRequest_InitialReso }; static const upb_msglayout *const envoy_service_discovery_v3_DeltaDiscoveryResponse_submsgs[2] = { + &envoy_config_core_v3_ControlPlane_msginit, &envoy_service_discovery_v3_Resource_msginit, - &udpa_core_v1_ResourceName_msginit, }; static const upb_msglayout_field envoy_service_discovery_v3_DeltaDiscoveryResponse__fields[6] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, - {2, UPB_SIZE(24, 48), 0, 0, 11, 3}, - {4, UPB_SIZE(8, 16), 0, 0, 9, 1}, - {5, UPB_SIZE(16, 32), 0, 0, 9, 1}, - {6, UPB_SIZE(28, 56), 0, 0, 9, 3}, - {7, UPB_SIZE(32, 64), 0, 1, 11, 3}, + {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, + {2, UPB_SIZE(32, 64), 0, 1, 11, 3}, + {4, UPB_SIZE(12, 24), 0, 0, 9, 1}, + {5, UPB_SIZE(20, 40), 0, 0, 9, 1}, + {6, UPB_SIZE(36, 72), 0, 0, 9, 3}, + {7, UPB_SIZE(28, 56), 1, 0, 11, 1}, }; const upb_msglayout envoy_service_discovery_v3_DeltaDiscoveryResponse_msginit = { @@ -116,23 +111,35 @@ const upb_msglayout envoy_service_discovery_v3_DeltaDiscoveryResponse_msginit = UPB_SIZE(40, 80), 6, false, 255, }; -static const upb_msglayout *const envoy_service_discovery_v3_Resource_submsgs[2] = { +static const upb_msglayout *const envoy_service_discovery_v3_Resource_submsgs[3] = { + &envoy_service_discovery_v3_Resource_CacheControl_msginit, &google_protobuf_Any_msginit, - &udpa_core_v1_ResourceName_msginit, + &google_protobuf_Duration_msginit, }; -static const upb_msglayout_field envoy_service_discovery_v3_Resource__fields[5] = { +static const upb_msglayout_field envoy_service_discovery_v3_Resource__fields[6] = { {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(20, 40), 1, 0, 11, 1}, + {2, UPB_SIZE(20, 40), 1, 1, 11, 1}, {3, UPB_SIZE(12, 24), 0, 0, 9, 1}, - {4, UPB_SIZE(28, 56), 0, 0, 9, 3}, - {5, UPB_SIZE(24, 48), 2, 1, 11, 1}, + {4, UPB_SIZE(32, 64), 0, 0, 9, 3}, + {6, UPB_SIZE(24, 48), 2, 2, 11, 1}, + {7, UPB_SIZE(28, 56), 3, 0, 11, 1}, }; const upb_msglayout envoy_service_discovery_v3_Resource_msginit = { &envoy_service_discovery_v3_Resource_submsgs[0], &envoy_service_discovery_v3_Resource__fields[0], - UPB_SIZE(32, 64), 5, false, 255, + UPB_SIZE(40, 80), 6, false, 255, +}; + +static const upb_msglayout_field envoy_service_discovery_v3_Resource_CacheControl__fields[1] = { + {1, UPB_SIZE(0, 0), 0, 0, 8, 1}, +}; + +const upb_msglayout envoy_service_discovery_v3_Resource_CacheControl_msginit = { + NULL, + &envoy_service_discovery_v3_Resource_CacheControl__fields[0], + UPB_SIZE(8, 8), 1, false, 255, }; #include "upb/port_undef.inc" diff --git a/grpc/src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.h b/grpc/src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.h index 715319bf..def27876 100644 --- a/grpc/src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.h +++ b/grpc/src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.h @@ -26,30 +26,31 @@ struct envoy_service_discovery_v3_DeltaDiscoveryRequest; struct envoy_service_discovery_v3_DeltaDiscoveryRequest_InitialResourceVersionsEntry; struct envoy_service_discovery_v3_DeltaDiscoveryResponse; struct envoy_service_discovery_v3_Resource; +struct envoy_service_discovery_v3_Resource_CacheControl; typedef struct envoy_service_discovery_v3_DiscoveryRequest envoy_service_discovery_v3_DiscoveryRequest; typedef struct envoy_service_discovery_v3_DiscoveryResponse envoy_service_discovery_v3_DiscoveryResponse; typedef struct envoy_service_discovery_v3_DeltaDiscoveryRequest envoy_service_discovery_v3_DeltaDiscoveryRequest; typedef struct envoy_service_discovery_v3_DeltaDiscoveryRequest_InitialResourceVersionsEntry envoy_service_discovery_v3_DeltaDiscoveryRequest_InitialResourceVersionsEntry; typedef struct envoy_service_discovery_v3_DeltaDiscoveryResponse envoy_service_discovery_v3_DeltaDiscoveryResponse; typedef struct envoy_service_discovery_v3_Resource envoy_service_discovery_v3_Resource; +typedef struct envoy_service_discovery_v3_Resource_CacheControl envoy_service_discovery_v3_Resource_CacheControl; extern const upb_msglayout envoy_service_discovery_v3_DiscoveryRequest_msginit; extern const upb_msglayout envoy_service_discovery_v3_DiscoveryResponse_msginit; extern const upb_msglayout envoy_service_discovery_v3_DeltaDiscoveryRequest_msginit; extern const upb_msglayout envoy_service_discovery_v3_DeltaDiscoveryRequest_InitialResourceVersionsEntry_msginit; extern const upb_msglayout envoy_service_discovery_v3_DeltaDiscoveryResponse_msginit; extern const upb_msglayout envoy_service_discovery_v3_Resource_msginit; +extern const upb_msglayout envoy_service_discovery_v3_Resource_CacheControl_msginit; struct envoy_config_core_v3_ControlPlane; struct envoy_config_core_v3_Node; struct google_protobuf_Any; +struct google_protobuf_Duration; struct google_rpc_Status; -struct udpa_core_v1_ResourceLocator; -struct udpa_core_v1_ResourceName; extern const upb_msglayout envoy_config_core_v3_ControlPlane_msginit; extern const upb_msglayout envoy_config_core_v3_Node_msginit; extern const upb_msglayout google_protobuf_Any_msginit; +extern const upb_msglayout google_protobuf_Duration_msginit; extern const upb_msglayout google_rpc_Status_msginit; -extern const upb_msglayout udpa_core_v1_ResourceLocator_msginit; -extern const upb_msglayout udpa_core_v1_ResourceName_msginit; /* envoy.service.discovery.v3.DiscoveryRequest */ @@ -227,10 +228,6 @@ UPB_INLINE const envoy_service_discovery_v3_DeltaDiscoveryRequest_InitialResourc UPB_INLINE upb_strview envoy_service_discovery_v3_DeltaDiscoveryRequest_response_nonce(const envoy_service_discovery_v3_DeltaDiscoveryRequest *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(12, 24), upb_strview); } UPB_INLINE bool envoy_service_discovery_v3_DeltaDiscoveryRequest_has_error_detail(const envoy_service_discovery_v3_DeltaDiscoveryRequest *msg) { return _upb_hasbit(msg, 2); } UPB_INLINE const struct google_rpc_Status* envoy_service_discovery_v3_DeltaDiscoveryRequest_error_detail(const envoy_service_discovery_v3_DeltaDiscoveryRequest *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(24, 48), const struct google_rpc_Status*); } -UPB_INLINE bool envoy_service_discovery_v3_DeltaDiscoveryRequest_has_udpa_resources_subscribe(const envoy_service_discovery_v3_DeltaDiscoveryRequest *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(40, 80)); } -UPB_INLINE const struct udpa_core_v1_ResourceLocator* const* envoy_service_discovery_v3_DeltaDiscoveryRequest_udpa_resources_subscribe(const envoy_service_discovery_v3_DeltaDiscoveryRequest *msg, size_t *len) { return (const struct udpa_core_v1_ResourceLocator* const*)_upb_array_accessor(msg, UPB_SIZE(40, 80), len); } -UPB_INLINE bool envoy_service_discovery_v3_DeltaDiscoveryRequest_has_udpa_resources_unsubscribe(const envoy_service_discovery_v3_DeltaDiscoveryRequest *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(44, 88)); } -UPB_INLINE const struct udpa_core_v1_ResourceLocator* const* envoy_service_discovery_v3_DeltaDiscoveryRequest_udpa_resources_unsubscribe(const envoy_service_discovery_v3_DeltaDiscoveryRequest *msg, size_t *len) { return (const struct udpa_core_v1_ResourceLocator* const*)_upb_array_accessor(msg, UPB_SIZE(44, 88), len); } UPB_INLINE void envoy_service_discovery_v3_DeltaDiscoveryRequest_set_node(envoy_service_discovery_v3_DeltaDiscoveryRequest *msg, struct envoy_config_core_v3_Node* value) { _upb_sethas(msg, 1); @@ -288,32 +285,6 @@ UPB_INLINE struct google_rpc_Status* envoy_service_discovery_v3_DeltaDiscoveryRe } return sub; } -UPB_INLINE struct udpa_core_v1_ResourceLocator** envoy_service_discovery_v3_DeltaDiscoveryRequest_mutable_udpa_resources_subscribe(envoy_service_discovery_v3_DeltaDiscoveryRequest *msg, size_t *len) { - return (struct udpa_core_v1_ResourceLocator**)_upb_array_mutable_accessor(msg, UPB_SIZE(40, 80), len); -} -UPB_INLINE struct udpa_core_v1_ResourceLocator** envoy_service_discovery_v3_DeltaDiscoveryRequest_resize_udpa_resources_subscribe(envoy_service_discovery_v3_DeltaDiscoveryRequest *msg, size_t len, upb_arena *arena) { - return (struct udpa_core_v1_ResourceLocator**)_upb_array_resize_accessor2(msg, UPB_SIZE(40, 80), len, UPB_SIZE(2, 3), arena); -} -UPB_INLINE struct udpa_core_v1_ResourceLocator* envoy_service_discovery_v3_DeltaDiscoveryRequest_add_udpa_resources_subscribe(envoy_service_discovery_v3_DeltaDiscoveryRequest *msg, upb_arena *arena) { - struct udpa_core_v1_ResourceLocator* sub = (struct udpa_core_v1_ResourceLocator*)_upb_msg_new(&udpa_core_v1_ResourceLocator_msginit, arena); - bool ok = _upb_array_append_accessor2( - msg, UPB_SIZE(40, 80), UPB_SIZE(2, 3), &sub, arena); - if (!ok) return NULL; - return sub; -} -UPB_INLINE struct udpa_core_v1_ResourceLocator** envoy_service_discovery_v3_DeltaDiscoveryRequest_mutable_udpa_resources_unsubscribe(envoy_service_discovery_v3_DeltaDiscoveryRequest *msg, size_t *len) { - return (struct udpa_core_v1_ResourceLocator**)_upb_array_mutable_accessor(msg, UPB_SIZE(44, 88), len); -} -UPB_INLINE struct udpa_core_v1_ResourceLocator** envoy_service_discovery_v3_DeltaDiscoveryRequest_resize_udpa_resources_unsubscribe(envoy_service_discovery_v3_DeltaDiscoveryRequest *msg, size_t len, upb_arena *arena) { - return (struct udpa_core_v1_ResourceLocator**)_upb_array_resize_accessor2(msg, UPB_SIZE(44, 88), len, UPB_SIZE(2, 3), arena); -} -UPB_INLINE struct udpa_core_v1_ResourceLocator* envoy_service_discovery_v3_DeltaDiscoveryRequest_add_udpa_resources_unsubscribe(envoy_service_discovery_v3_DeltaDiscoveryRequest *msg, upb_arena *arena) { - struct udpa_core_v1_ResourceLocator* sub = (struct udpa_core_v1_ResourceLocator*)_upb_msg_new(&udpa_core_v1_ResourceLocator_msginit, arena); - bool ok = _upb_array_append_accessor2( - msg, UPB_SIZE(44, 88), UPB_SIZE(2, 3), &sub, arena); - if (!ok) return NULL; - return sub; -} /* envoy.service.discovery.v3.DeltaDiscoveryRequest.InitialResourceVersionsEntry */ @@ -352,58 +323,58 @@ UPB_INLINE char *envoy_service_discovery_v3_DeltaDiscoveryResponse_serialize(con return upb_encode(msg, &envoy_service_discovery_v3_DeltaDiscoveryResponse_msginit, arena, len); } -UPB_INLINE upb_strview envoy_service_discovery_v3_DeltaDiscoveryResponse_system_version_info(const envoy_service_discovery_v3_DeltaDiscoveryResponse *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(0, 0), upb_strview); } -UPB_INLINE bool envoy_service_discovery_v3_DeltaDiscoveryResponse_has_resources(const envoy_service_discovery_v3_DeltaDiscoveryResponse *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(24, 48)); } -UPB_INLINE const envoy_service_discovery_v3_Resource* const* envoy_service_discovery_v3_DeltaDiscoveryResponse_resources(const envoy_service_discovery_v3_DeltaDiscoveryResponse *msg, size_t *len) { return (const envoy_service_discovery_v3_Resource* const*)_upb_array_accessor(msg, UPB_SIZE(24, 48), len); } -UPB_INLINE upb_strview envoy_service_discovery_v3_DeltaDiscoveryResponse_type_url(const envoy_service_discovery_v3_DeltaDiscoveryResponse *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(8, 16), upb_strview); } -UPB_INLINE upb_strview envoy_service_discovery_v3_DeltaDiscoveryResponse_nonce(const envoy_service_discovery_v3_DeltaDiscoveryResponse *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(16, 32), upb_strview); } -UPB_INLINE upb_strview const* envoy_service_discovery_v3_DeltaDiscoveryResponse_removed_resources(const envoy_service_discovery_v3_DeltaDiscoveryResponse *msg, size_t *len) { return (upb_strview const*)_upb_array_accessor(msg, UPB_SIZE(28, 56), len); } -UPB_INLINE bool envoy_service_discovery_v3_DeltaDiscoveryResponse_has_udpa_removed_resources(const envoy_service_discovery_v3_DeltaDiscoveryResponse *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(32, 64)); } -UPB_INLINE const struct udpa_core_v1_ResourceName* const* envoy_service_discovery_v3_DeltaDiscoveryResponse_udpa_removed_resources(const envoy_service_discovery_v3_DeltaDiscoveryResponse *msg, size_t *len) { return (const struct udpa_core_v1_ResourceName* const*)_upb_array_accessor(msg, UPB_SIZE(32, 64), len); } +UPB_INLINE upb_strview envoy_service_discovery_v3_DeltaDiscoveryResponse_system_version_info(const envoy_service_discovery_v3_DeltaDiscoveryResponse *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview); } +UPB_INLINE bool envoy_service_discovery_v3_DeltaDiscoveryResponse_has_resources(const envoy_service_discovery_v3_DeltaDiscoveryResponse *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(32, 64)); } +UPB_INLINE const envoy_service_discovery_v3_Resource* const* envoy_service_discovery_v3_DeltaDiscoveryResponse_resources(const envoy_service_discovery_v3_DeltaDiscoveryResponse *msg, size_t *len) { return (const envoy_service_discovery_v3_Resource* const*)_upb_array_accessor(msg, UPB_SIZE(32, 64), len); } +UPB_INLINE upb_strview envoy_service_discovery_v3_DeltaDiscoveryResponse_type_url(const envoy_service_discovery_v3_DeltaDiscoveryResponse *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(12, 24), upb_strview); } +UPB_INLINE upb_strview envoy_service_discovery_v3_DeltaDiscoveryResponse_nonce(const envoy_service_discovery_v3_DeltaDiscoveryResponse *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(20, 40), upb_strview); } +UPB_INLINE upb_strview const* envoy_service_discovery_v3_DeltaDiscoveryResponse_removed_resources(const envoy_service_discovery_v3_DeltaDiscoveryResponse *msg, size_t *len) { return (upb_strview const*)_upb_array_accessor(msg, UPB_SIZE(36, 72), len); } +UPB_INLINE bool envoy_service_discovery_v3_DeltaDiscoveryResponse_has_control_plane(const envoy_service_discovery_v3_DeltaDiscoveryResponse *msg) { return _upb_hasbit(msg, 1); } +UPB_INLINE const struct envoy_config_core_v3_ControlPlane* envoy_service_discovery_v3_DeltaDiscoveryResponse_control_plane(const envoy_service_discovery_v3_DeltaDiscoveryResponse *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(28, 56), const struct envoy_config_core_v3_ControlPlane*); } UPB_INLINE void envoy_service_discovery_v3_DeltaDiscoveryResponse_set_system_version_info(envoy_service_discovery_v3_DeltaDiscoveryResponse *msg, upb_strview value) { - *UPB_PTR_AT(msg, UPB_SIZE(0, 0), upb_strview) = value; + *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview) = value; } UPB_INLINE envoy_service_discovery_v3_Resource** envoy_service_discovery_v3_DeltaDiscoveryResponse_mutable_resources(envoy_service_discovery_v3_DeltaDiscoveryResponse *msg, size_t *len) { - return (envoy_service_discovery_v3_Resource**)_upb_array_mutable_accessor(msg, UPB_SIZE(24, 48), len); + return (envoy_service_discovery_v3_Resource**)_upb_array_mutable_accessor(msg, UPB_SIZE(32, 64), len); } UPB_INLINE envoy_service_discovery_v3_Resource** envoy_service_discovery_v3_DeltaDiscoveryResponse_resize_resources(envoy_service_discovery_v3_DeltaDiscoveryResponse *msg, size_t len, upb_arena *arena) { - return (envoy_service_discovery_v3_Resource**)_upb_array_resize_accessor2(msg, UPB_SIZE(24, 48), len, UPB_SIZE(2, 3), arena); + return (envoy_service_discovery_v3_Resource**)_upb_array_resize_accessor2(msg, UPB_SIZE(32, 64), len, UPB_SIZE(2, 3), arena); } UPB_INLINE struct envoy_service_discovery_v3_Resource* envoy_service_discovery_v3_DeltaDiscoveryResponse_add_resources(envoy_service_discovery_v3_DeltaDiscoveryResponse *msg, upb_arena *arena) { struct envoy_service_discovery_v3_Resource* sub = (struct envoy_service_discovery_v3_Resource*)_upb_msg_new(&envoy_service_discovery_v3_Resource_msginit, arena); bool ok = _upb_array_append_accessor2( - msg, UPB_SIZE(24, 48), UPB_SIZE(2, 3), &sub, arena); + msg, UPB_SIZE(32, 64), UPB_SIZE(2, 3), &sub, arena); if (!ok) return NULL; return sub; } UPB_INLINE void envoy_service_discovery_v3_DeltaDiscoveryResponse_set_type_url(envoy_service_discovery_v3_DeltaDiscoveryResponse *msg, upb_strview value) { - *UPB_PTR_AT(msg, UPB_SIZE(8, 16), upb_strview) = value; + *UPB_PTR_AT(msg, UPB_SIZE(12, 24), upb_strview) = value; } UPB_INLINE void envoy_service_discovery_v3_DeltaDiscoveryResponse_set_nonce(envoy_service_discovery_v3_DeltaDiscoveryResponse *msg, upb_strview value) { - *UPB_PTR_AT(msg, UPB_SIZE(16, 32), upb_strview) = value; + *UPB_PTR_AT(msg, UPB_SIZE(20, 40), upb_strview) = value; } UPB_INLINE upb_strview* envoy_service_discovery_v3_DeltaDiscoveryResponse_mutable_removed_resources(envoy_service_discovery_v3_DeltaDiscoveryResponse *msg, size_t *len) { - return (upb_strview*)_upb_array_mutable_accessor(msg, UPB_SIZE(28, 56), len); + return (upb_strview*)_upb_array_mutable_accessor(msg, UPB_SIZE(36, 72), len); } UPB_INLINE upb_strview* envoy_service_discovery_v3_DeltaDiscoveryResponse_resize_removed_resources(envoy_service_discovery_v3_DeltaDiscoveryResponse *msg, size_t len, upb_arena *arena) { - return (upb_strview*)_upb_array_resize_accessor2(msg, UPB_SIZE(28, 56), len, UPB_SIZE(3, 4), arena); + return (upb_strview*)_upb_array_resize_accessor2(msg, UPB_SIZE(36, 72), len, UPB_SIZE(3, 4), arena); } UPB_INLINE bool envoy_service_discovery_v3_DeltaDiscoveryResponse_add_removed_resources(envoy_service_discovery_v3_DeltaDiscoveryResponse *msg, upb_strview val, upb_arena *arena) { - return _upb_array_append_accessor2(msg, UPB_SIZE(28, 56), UPB_SIZE(3, 4), &val, + return _upb_array_append_accessor2(msg, UPB_SIZE(36, 72), UPB_SIZE(3, 4), &val, arena); } -UPB_INLINE struct udpa_core_v1_ResourceName** envoy_service_discovery_v3_DeltaDiscoveryResponse_mutable_udpa_removed_resources(envoy_service_discovery_v3_DeltaDiscoveryResponse *msg, size_t *len) { - return (struct udpa_core_v1_ResourceName**)_upb_array_mutable_accessor(msg, UPB_SIZE(32, 64), len); -} -UPB_INLINE struct udpa_core_v1_ResourceName** envoy_service_discovery_v3_DeltaDiscoveryResponse_resize_udpa_removed_resources(envoy_service_discovery_v3_DeltaDiscoveryResponse *msg, size_t len, upb_arena *arena) { - return (struct udpa_core_v1_ResourceName**)_upb_array_resize_accessor2(msg, UPB_SIZE(32, 64), len, UPB_SIZE(2, 3), arena); +UPB_INLINE void envoy_service_discovery_v3_DeltaDiscoveryResponse_set_control_plane(envoy_service_discovery_v3_DeltaDiscoveryResponse *msg, struct envoy_config_core_v3_ControlPlane* value) { + _upb_sethas(msg, 1); + *UPB_PTR_AT(msg, UPB_SIZE(28, 56), struct envoy_config_core_v3_ControlPlane*) = value; } -UPB_INLINE struct udpa_core_v1_ResourceName* envoy_service_discovery_v3_DeltaDiscoveryResponse_add_udpa_removed_resources(envoy_service_discovery_v3_DeltaDiscoveryResponse *msg, upb_arena *arena) { - struct udpa_core_v1_ResourceName* sub = (struct udpa_core_v1_ResourceName*)_upb_msg_new(&udpa_core_v1_ResourceName_msginit, arena); - bool ok = _upb_array_append_accessor2( - msg, UPB_SIZE(32, 64), UPB_SIZE(2, 3), &sub, arena); - if (!ok) return NULL; +UPB_INLINE struct envoy_config_core_v3_ControlPlane* envoy_service_discovery_v3_DeltaDiscoveryResponse_mutable_control_plane(envoy_service_discovery_v3_DeltaDiscoveryResponse *msg, upb_arena *arena) { + struct envoy_config_core_v3_ControlPlane* sub = (struct envoy_config_core_v3_ControlPlane*)envoy_service_discovery_v3_DeltaDiscoveryResponse_control_plane(msg); + if (sub == NULL) { + sub = (struct envoy_config_core_v3_ControlPlane*)_upb_msg_new(&envoy_config_core_v3_ControlPlane_msginit, arena); + if (!sub) return NULL; + envoy_service_discovery_v3_DeltaDiscoveryResponse_set_control_plane(msg, sub); + } return sub; } @@ -431,9 +402,11 @@ UPB_INLINE upb_strview envoy_service_discovery_v3_Resource_version(const envoy_s UPB_INLINE bool envoy_service_discovery_v3_Resource_has_resource(const envoy_service_discovery_v3_Resource *msg) { return _upb_hasbit(msg, 1); } UPB_INLINE const struct google_protobuf_Any* envoy_service_discovery_v3_Resource_resource(const envoy_service_discovery_v3_Resource *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(20, 40), const struct google_protobuf_Any*); } UPB_INLINE upb_strview envoy_service_discovery_v3_Resource_name(const envoy_service_discovery_v3_Resource *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(12, 24), upb_strview); } -UPB_INLINE upb_strview const* envoy_service_discovery_v3_Resource_aliases(const envoy_service_discovery_v3_Resource *msg, size_t *len) { return (upb_strview const*)_upb_array_accessor(msg, UPB_SIZE(28, 56), len); } -UPB_INLINE bool envoy_service_discovery_v3_Resource_has_udpa_resource_name(const envoy_service_discovery_v3_Resource *msg) { return _upb_hasbit(msg, 2); } -UPB_INLINE const struct udpa_core_v1_ResourceName* envoy_service_discovery_v3_Resource_udpa_resource_name(const envoy_service_discovery_v3_Resource *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(24, 48), const struct udpa_core_v1_ResourceName*); } +UPB_INLINE upb_strview const* envoy_service_discovery_v3_Resource_aliases(const envoy_service_discovery_v3_Resource *msg, size_t *len) { return (upb_strview const*)_upb_array_accessor(msg, UPB_SIZE(32, 64), len); } +UPB_INLINE bool envoy_service_discovery_v3_Resource_has_ttl(const envoy_service_discovery_v3_Resource *msg) { return _upb_hasbit(msg, 2); } +UPB_INLINE const struct google_protobuf_Duration* envoy_service_discovery_v3_Resource_ttl(const envoy_service_discovery_v3_Resource *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(24, 48), const struct google_protobuf_Duration*); } +UPB_INLINE bool envoy_service_discovery_v3_Resource_has_cache_control(const envoy_service_discovery_v3_Resource *msg) { return _upb_hasbit(msg, 3); } +UPB_INLINE const envoy_service_discovery_v3_Resource_CacheControl* envoy_service_discovery_v3_Resource_cache_control(const envoy_service_discovery_v3_Resource *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(28, 56), const envoy_service_discovery_v3_Resource_CacheControl*); } UPB_INLINE void envoy_service_discovery_v3_Resource_set_version(envoy_service_discovery_v3_Resource *msg, upb_strview value) { *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview) = value; @@ -455,29 +428,68 @@ UPB_INLINE void envoy_service_discovery_v3_Resource_set_name(envoy_service_disco *UPB_PTR_AT(msg, UPB_SIZE(12, 24), upb_strview) = value; } UPB_INLINE upb_strview* envoy_service_discovery_v3_Resource_mutable_aliases(envoy_service_discovery_v3_Resource *msg, size_t *len) { - return (upb_strview*)_upb_array_mutable_accessor(msg, UPB_SIZE(28, 56), len); + return (upb_strview*)_upb_array_mutable_accessor(msg, UPB_SIZE(32, 64), len); } UPB_INLINE upb_strview* envoy_service_discovery_v3_Resource_resize_aliases(envoy_service_discovery_v3_Resource *msg, size_t len, upb_arena *arena) { - return (upb_strview*)_upb_array_resize_accessor2(msg, UPB_SIZE(28, 56), len, UPB_SIZE(3, 4), arena); + return (upb_strview*)_upb_array_resize_accessor2(msg, UPB_SIZE(32, 64), len, UPB_SIZE(3, 4), arena); } UPB_INLINE bool envoy_service_discovery_v3_Resource_add_aliases(envoy_service_discovery_v3_Resource *msg, upb_strview val, upb_arena *arena) { - return _upb_array_append_accessor2(msg, UPB_SIZE(28, 56), UPB_SIZE(3, 4), &val, + return _upb_array_append_accessor2(msg, UPB_SIZE(32, 64), UPB_SIZE(3, 4), &val, arena); } -UPB_INLINE void envoy_service_discovery_v3_Resource_set_udpa_resource_name(envoy_service_discovery_v3_Resource *msg, struct udpa_core_v1_ResourceName* value) { +UPB_INLINE void envoy_service_discovery_v3_Resource_set_ttl(envoy_service_discovery_v3_Resource *msg, struct google_protobuf_Duration* value) { _upb_sethas(msg, 2); - *UPB_PTR_AT(msg, UPB_SIZE(24, 48), struct udpa_core_v1_ResourceName*) = value; + *UPB_PTR_AT(msg, UPB_SIZE(24, 48), struct google_protobuf_Duration*) = value; +} +UPB_INLINE struct google_protobuf_Duration* envoy_service_discovery_v3_Resource_mutable_ttl(envoy_service_discovery_v3_Resource *msg, upb_arena *arena) { + struct google_protobuf_Duration* sub = (struct google_protobuf_Duration*)envoy_service_discovery_v3_Resource_ttl(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Duration*)_upb_msg_new(&google_protobuf_Duration_msginit, arena); + if (!sub) return NULL; + envoy_service_discovery_v3_Resource_set_ttl(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_service_discovery_v3_Resource_set_cache_control(envoy_service_discovery_v3_Resource *msg, envoy_service_discovery_v3_Resource_CacheControl* value) { + _upb_sethas(msg, 3); + *UPB_PTR_AT(msg, UPB_SIZE(28, 56), envoy_service_discovery_v3_Resource_CacheControl*) = value; } -UPB_INLINE struct udpa_core_v1_ResourceName* envoy_service_discovery_v3_Resource_mutable_udpa_resource_name(envoy_service_discovery_v3_Resource *msg, upb_arena *arena) { - struct udpa_core_v1_ResourceName* sub = (struct udpa_core_v1_ResourceName*)envoy_service_discovery_v3_Resource_udpa_resource_name(msg); +UPB_INLINE struct envoy_service_discovery_v3_Resource_CacheControl* envoy_service_discovery_v3_Resource_mutable_cache_control(envoy_service_discovery_v3_Resource *msg, upb_arena *arena) { + struct envoy_service_discovery_v3_Resource_CacheControl* sub = (struct envoy_service_discovery_v3_Resource_CacheControl*)envoy_service_discovery_v3_Resource_cache_control(msg); if (sub == NULL) { - sub = (struct udpa_core_v1_ResourceName*)_upb_msg_new(&udpa_core_v1_ResourceName_msginit, arena); + sub = (struct envoy_service_discovery_v3_Resource_CacheControl*)_upb_msg_new(&envoy_service_discovery_v3_Resource_CacheControl_msginit, arena); if (!sub) return NULL; - envoy_service_discovery_v3_Resource_set_udpa_resource_name(msg, sub); + envoy_service_discovery_v3_Resource_set_cache_control(msg, sub); } return sub; } +/* envoy.service.discovery.v3.Resource.CacheControl */ + +UPB_INLINE envoy_service_discovery_v3_Resource_CacheControl *envoy_service_discovery_v3_Resource_CacheControl_new(upb_arena *arena) { + return (envoy_service_discovery_v3_Resource_CacheControl *)_upb_msg_new(&envoy_service_discovery_v3_Resource_CacheControl_msginit, arena); +} +UPB_INLINE envoy_service_discovery_v3_Resource_CacheControl *envoy_service_discovery_v3_Resource_CacheControl_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_service_discovery_v3_Resource_CacheControl *ret = envoy_service_discovery_v3_Resource_CacheControl_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_service_discovery_v3_Resource_CacheControl_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_service_discovery_v3_Resource_CacheControl *envoy_service_discovery_v3_Resource_CacheControl_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_service_discovery_v3_Resource_CacheControl *ret = envoy_service_discovery_v3_Resource_CacheControl_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_service_discovery_v3_Resource_CacheControl_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_service_discovery_v3_Resource_CacheControl_serialize(const envoy_service_discovery_v3_Resource_CacheControl *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_service_discovery_v3_Resource_CacheControl_msginit, arena, len); +} + +UPB_INLINE bool envoy_service_discovery_v3_Resource_CacheControl_do_not_cache(const envoy_service_discovery_v3_Resource_CacheControl *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(0, 0), bool); } + +UPB_INLINE void envoy_service_discovery_v3_Resource_CacheControl_set_do_not_cache(envoy_service_discovery_v3_Resource_CacheControl *msg, bool value) { + *UPB_PTR_AT(msg, UPB_SIZE(0, 0), bool) = value; +} + #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/grpc/src/core/ext/upb-generated/envoy/service/endpoint/v3/eds.upb.c b/grpc/src/core/ext/upb-generated/envoy/service/endpoint/v3/eds.upb.c index 1e229231..0af04804 100644 --- a/grpc/src/core/ext/upb-generated/envoy/service/endpoint/v3/eds.upb.c +++ b/grpc/src/core/ext/upb-generated/envoy/service/endpoint/v3/eds.upb.c @@ -11,12 +11,9 @@ #include "envoy/service/endpoint/v3/eds.upb.h" #include "envoy/service/discovery/v3/discovery.upb.h" #include "google/api/annotations.upb.h" -#include "google/protobuf/duration.upb.h" -#include "google/protobuf/wrappers.upb.h" #include "envoy/annotations/resource.upb.h" #include "udpa/annotations/status.upb.h" #include "udpa/annotations/versioning.upb.h" -#include "validate/validate.upb.h" #include "upb/port_def.inc" diff --git a/grpc/src/core/ext/upb-generated/envoy/service/listener/v3/lds.upb.c b/grpc/src/core/ext/upb-generated/envoy/service/listener/v3/lds.upb.c index e00bfc2a..404bfa41 100644 --- a/grpc/src/core/ext/upb-generated/envoy/service/listener/v3/lds.upb.c +++ b/grpc/src/core/ext/upb-generated/envoy/service/listener/v3/lds.upb.c @@ -11,12 +11,9 @@ #include "envoy/service/listener/v3/lds.upb.h" #include "envoy/service/discovery/v3/discovery.upb.h" #include "google/api/annotations.upb.h" -#include "google/protobuf/duration.upb.h" -#include "google/protobuf/wrappers.upb.h" #include "envoy/annotations/resource.upb.h" #include "udpa/annotations/status.upb.h" #include "udpa/annotations/versioning.upb.h" -#include "validate/validate.upb.h" #include "upb/port_def.inc" diff --git a/grpc/src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.c b/grpc/src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.c index c806a85c..68fe078f 100644 --- a/grpc/src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.c +++ b/grpc/src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.c @@ -14,7 +14,6 @@ #include "google/protobuf/duration.upb.h" #include "udpa/annotations/status.upb.h" #include "udpa/annotations/versioning.upb.h" -#include "validate/validate.upb.h" #include "upb/port_def.inc" diff --git a/grpc/src/core/ext/upb-generated/envoy/service/route/v3/rds.upb.c b/grpc/src/core/ext/upb-generated/envoy/service/route/v3/rds.upb.c index 93970b1d..07d17f61 100644 --- a/grpc/src/core/ext/upb-generated/envoy/service/route/v3/rds.upb.c +++ b/grpc/src/core/ext/upb-generated/envoy/service/route/v3/rds.upb.c @@ -11,11 +11,9 @@ #include "envoy/service/route/v3/rds.upb.h" #include "envoy/service/discovery/v3/discovery.upb.h" #include "google/api/annotations.upb.h" -#include "google/protobuf/wrappers.upb.h" #include "envoy/annotations/resource.upb.h" #include "udpa/annotations/status.upb.h" #include "udpa/annotations/versioning.upb.h" -#include "validate/validate.upb.h" #include "upb/port_def.inc" diff --git a/grpc/src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.c b/grpc/src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.c new file mode 100644 index 00000000..40e086cb --- /dev/null +++ b/grpc/src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.c @@ -0,0 +1,93 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * envoy/service/status/v3/csds.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#include <stddef.h> +#include "upb/msg.h" +#include "envoy/service/status/v3/csds.upb.h" +#include "envoy/admin/v3/config_dump.upb.h" +#include "envoy/config/core/v3/base.upb.h" +#include "envoy/type/matcher/v3/node.upb.h" +#include "google/api/annotations.upb.h" +#include "udpa/annotations/migrate.upb.h" +#include "udpa/annotations/status.upb.h" +#include "udpa/annotations/versioning.upb.h" + +#include "upb/port_def.inc" + +static const upb_msglayout *const envoy_service_status_v3_ClientStatusRequest_submsgs[2] = { + &envoy_config_core_v3_Node_msginit, + &envoy_type_matcher_v3_NodeMatcher_msginit, +}; + +static const upb_msglayout_field envoy_service_status_v3_ClientStatusRequest__fields[2] = { + {1, UPB_SIZE(8, 16), 0, 1, 11, 3}, + {2, UPB_SIZE(4, 8), 1, 0, 11, 1}, +}; + +const upb_msglayout envoy_service_status_v3_ClientStatusRequest_msginit = { + &envoy_service_status_v3_ClientStatusRequest_submsgs[0], + &envoy_service_status_v3_ClientStatusRequest__fields[0], + UPB_SIZE(16, 24), 2, false, 255, +}; + +static const upb_msglayout *const envoy_service_status_v3_PerXdsConfig_submsgs[5] = { + &envoy_admin_v3_ClustersConfigDump_msginit, + &envoy_admin_v3_EndpointsConfigDump_msginit, + &envoy_admin_v3_ListenersConfigDump_msginit, + &envoy_admin_v3_RoutesConfigDump_msginit, + &envoy_admin_v3_ScopedRoutesConfigDump_msginit, +}; + +static const upb_msglayout_field envoy_service_status_v3_PerXdsConfig__fields[7] = { + {1, UPB_SIZE(0, 0), 0, 0, 14, 1}, + {2, UPB_SIZE(8, 8), UPB_SIZE(-13, -17), 2, 11, 1}, + {3, UPB_SIZE(8, 8), UPB_SIZE(-13, -17), 0, 11, 1}, + {4, UPB_SIZE(8, 8), UPB_SIZE(-13, -17), 3, 11, 1}, + {5, UPB_SIZE(8, 8), UPB_SIZE(-13, -17), 4, 11, 1}, + {6, UPB_SIZE(8, 8), UPB_SIZE(-13, -17), 1, 11, 1}, + {7, UPB_SIZE(4, 4), 0, 0, 14, 1}, +}; + +const upb_msglayout envoy_service_status_v3_PerXdsConfig_msginit = { + &envoy_service_status_v3_PerXdsConfig_submsgs[0], + &envoy_service_status_v3_PerXdsConfig__fields[0], + UPB_SIZE(16, 24), 7, false, 255, +}; + +static const upb_msglayout *const envoy_service_status_v3_ClientConfig_submsgs[2] = { + &envoy_config_core_v3_Node_msginit, + &envoy_service_status_v3_PerXdsConfig_msginit, +}; + +static const upb_msglayout_field envoy_service_status_v3_ClientConfig__fields[2] = { + {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, + {2, UPB_SIZE(8, 16), 0, 1, 11, 3}, +}; + +const upb_msglayout envoy_service_status_v3_ClientConfig_msginit = { + &envoy_service_status_v3_ClientConfig_submsgs[0], + &envoy_service_status_v3_ClientConfig__fields[0], + UPB_SIZE(16, 24), 2, false, 255, +}; + +static const upb_msglayout *const envoy_service_status_v3_ClientStatusResponse_submsgs[1] = { + &envoy_service_status_v3_ClientConfig_msginit, +}; + +static const upb_msglayout_field envoy_service_status_v3_ClientStatusResponse__fields[1] = { + {1, UPB_SIZE(0, 0), 0, 0, 11, 3}, +}; + +const upb_msglayout envoy_service_status_v3_ClientStatusResponse_msginit = { + &envoy_service_status_v3_ClientStatusResponse_submsgs[0], + &envoy_service_status_v3_ClientStatusResponse__fields[0], + UPB_SIZE(8, 8), 1, false, 255, +}; + +#include "upb/port_undef.inc" + diff --git a/grpc/src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.h b/grpc/src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.h new file mode 100644 index 00000000..87f807cd --- /dev/null +++ b/grpc/src/core/ext/upb-generated/envoy/service/status/v3/csds.upb.h @@ -0,0 +1,323 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * envoy/service/status/v3/csds.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#ifndef ENVOY_SERVICE_STATUS_V3_CSDS_PROTO_UPB_H_ +#define ENVOY_SERVICE_STATUS_V3_CSDS_PROTO_UPB_H_ + +#include "upb/msg.h" +#include "upb/decode.h" +#include "upb/decode_fast.h" +#include "upb/encode.h" + +#include "upb/port_def.inc" + +#ifdef __cplusplus +extern "C" { +#endif + +struct envoy_service_status_v3_ClientStatusRequest; +struct envoy_service_status_v3_PerXdsConfig; +struct envoy_service_status_v3_ClientConfig; +struct envoy_service_status_v3_ClientStatusResponse; +typedef struct envoy_service_status_v3_ClientStatusRequest envoy_service_status_v3_ClientStatusRequest; +typedef struct envoy_service_status_v3_PerXdsConfig envoy_service_status_v3_PerXdsConfig; +typedef struct envoy_service_status_v3_ClientConfig envoy_service_status_v3_ClientConfig; +typedef struct envoy_service_status_v3_ClientStatusResponse envoy_service_status_v3_ClientStatusResponse; +extern const upb_msglayout envoy_service_status_v3_ClientStatusRequest_msginit; +extern const upb_msglayout envoy_service_status_v3_PerXdsConfig_msginit; +extern const upb_msglayout envoy_service_status_v3_ClientConfig_msginit; +extern const upb_msglayout envoy_service_status_v3_ClientStatusResponse_msginit; +struct envoy_admin_v3_ClustersConfigDump; +struct envoy_admin_v3_EndpointsConfigDump; +struct envoy_admin_v3_ListenersConfigDump; +struct envoy_admin_v3_RoutesConfigDump; +struct envoy_admin_v3_ScopedRoutesConfigDump; +struct envoy_config_core_v3_Node; +struct envoy_type_matcher_v3_NodeMatcher; +extern const upb_msglayout envoy_admin_v3_ClustersConfigDump_msginit; +extern const upb_msglayout envoy_admin_v3_EndpointsConfigDump_msginit; +extern const upb_msglayout envoy_admin_v3_ListenersConfigDump_msginit; +extern const upb_msglayout envoy_admin_v3_RoutesConfigDump_msginit; +extern const upb_msglayout envoy_admin_v3_ScopedRoutesConfigDump_msginit; +extern const upb_msglayout envoy_config_core_v3_Node_msginit; +extern const upb_msglayout envoy_type_matcher_v3_NodeMatcher_msginit; + +typedef enum { + envoy_service_status_v3_CLIENT_UNKNOWN = 0, + envoy_service_status_v3_CLIENT_REQUESTED = 1, + envoy_service_status_v3_CLIENT_ACKED = 2, + envoy_service_status_v3_CLIENT_NACKED = 3 +} envoy_service_status_v3_ClientConfigStatus; + +typedef enum { + envoy_service_status_v3_UNKNOWN = 0, + envoy_service_status_v3_SYNCED = 1, + envoy_service_status_v3_NOT_SENT = 2, + envoy_service_status_v3_STALE = 3, + envoy_service_status_v3_ERROR = 4 +} envoy_service_status_v3_ConfigStatus; + + +/* envoy.service.status.v3.ClientStatusRequest */ + +UPB_INLINE envoy_service_status_v3_ClientStatusRequest *envoy_service_status_v3_ClientStatusRequest_new(upb_arena *arena) { + return (envoy_service_status_v3_ClientStatusRequest *)_upb_msg_new(&envoy_service_status_v3_ClientStatusRequest_msginit, arena); +} +UPB_INLINE envoy_service_status_v3_ClientStatusRequest *envoy_service_status_v3_ClientStatusRequest_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_service_status_v3_ClientStatusRequest *ret = envoy_service_status_v3_ClientStatusRequest_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_service_status_v3_ClientStatusRequest_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_service_status_v3_ClientStatusRequest *envoy_service_status_v3_ClientStatusRequest_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_service_status_v3_ClientStatusRequest *ret = envoy_service_status_v3_ClientStatusRequest_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_service_status_v3_ClientStatusRequest_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_service_status_v3_ClientStatusRequest_serialize(const envoy_service_status_v3_ClientStatusRequest *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_service_status_v3_ClientStatusRequest_msginit, arena, len); +} + +UPB_INLINE bool envoy_service_status_v3_ClientStatusRequest_has_node_matchers(const envoy_service_status_v3_ClientStatusRequest *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(8, 16)); } +UPB_INLINE const struct envoy_type_matcher_v3_NodeMatcher* const* envoy_service_status_v3_ClientStatusRequest_node_matchers(const envoy_service_status_v3_ClientStatusRequest *msg, size_t *len) { return (const struct envoy_type_matcher_v3_NodeMatcher* const*)_upb_array_accessor(msg, UPB_SIZE(8, 16), len); } +UPB_INLINE bool envoy_service_status_v3_ClientStatusRequest_has_node(const envoy_service_status_v3_ClientStatusRequest *msg) { return _upb_hasbit(msg, 1); } +UPB_INLINE const struct envoy_config_core_v3_Node* envoy_service_status_v3_ClientStatusRequest_node(const envoy_service_status_v3_ClientStatusRequest *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), const struct envoy_config_core_v3_Node*); } + +UPB_INLINE struct envoy_type_matcher_v3_NodeMatcher** envoy_service_status_v3_ClientStatusRequest_mutable_node_matchers(envoy_service_status_v3_ClientStatusRequest *msg, size_t *len) { + return (struct envoy_type_matcher_v3_NodeMatcher**)_upb_array_mutable_accessor(msg, UPB_SIZE(8, 16), len); +} +UPB_INLINE struct envoy_type_matcher_v3_NodeMatcher** envoy_service_status_v3_ClientStatusRequest_resize_node_matchers(envoy_service_status_v3_ClientStatusRequest *msg, size_t len, upb_arena *arena) { + return (struct envoy_type_matcher_v3_NodeMatcher**)_upb_array_resize_accessor2(msg, UPB_SIZE(8, 16), len, UPB_SIZE(2, 3), arena); +} +UPB_INLINE struct envoy_type_matcher_v3_NodeMatcher* envoy_service_status_v3_ClientStatusRequest_add_node_matchers(envoy_service_status_v3_ClientStatusRequest *msg, upb_arena *arena) { + struct envoy_type_matcher_v3_NodeMatcher* sub = (struct envoy_type_matcher_v3_NodeMatcher*)_upb_msg_new(&envoy_type_matcher_v3_NodeMatcher_msginit, arena); + bool ok = _upb_array_append_accessor2( + msg, UPB_SIZE(8, 16), UPB_SIZE(2, 3), &sub, arena); + if (!ok) return NULL; + return sub; +} +UPB_INLINE void envoy_service_status_v3_ClientStatusRequest_set_node(envoy_service_status_v3_ClientStatusRequest *msg, struct envoy_config_core_v3_Node* value) { + _upb_sethas(msg, 1); + *UPB_PTR_AT(msg, UPB_SIZE(4, 8), struct envoy_config_core_v3_Node*) = value; +} +UPB_INLINE struct envoy_config_core_v3_Node* envoy_service_status_v3_ClientStatusRequest_mutable_node(envoy_service_status_v3_ClientStatusRequest *msg, upb_arena *arena) { + struct envoy_config_core_v3_Node* sub = (struct envoy_config_core_v3_Node*)envoy_service_status_v3_ClientStatusRequest_node(msg); + if (sub == NULL) { + sub = (struct envoy_config_core_v3_Node*)_upb_msg_new(&envoy_config_core_v3_Node_msginit, arena); + if (!sub) return NULL; + envoy_service_status_v3_ClientStatusRequest_set_node(msg, sub); + } + return sub; +} + +/* envoy.service.status.v3.PerXdsConfig */ + +UPB_INLINE envoy_service_status_v3_PerXdsConfig *envoy_service_status_v3_PerXdsConfig_new(upb_arena *arena) { + return (envoy_service_status_v3_PerXdsConfig *)_upb_msg_new(&envoy_service_status_v3_PerXdsConfig_msginit, arena); +} +UPB_INLINE envoy_service_status_v3_PerXdsConfig *envoy_service_status_v3_PerXdsConfig_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_service_status_v3_PerXdsConfig *ret = envoy_service_status_v3_PerXdsConfig_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_service_status_v3_PerXdsConfig_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_service_status_v3_PerXdsConfig *envoy_service_status_v3_PerXdsConfig_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_service_status_v3_PerXdsConfig *ret = envoy_service_status_v3_PerXdsConfig_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_service_status_v3_PerXdsConfig_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_service_status_v3_PerXdsConfig_serialize(const envoy_service_status_v3_PerXdsConfig *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_service_status_v3_PerXdsConfig_msginit, arena, len); +} + +typedef enum { + envoy_service_status_v3_PerXdsConfig_per_xds_config_listener_config = 2, + envoy_service_status_v3_PerXdsConfig_per_xds_config_cluster_config = 3, + envoy_service_status_v3_PerXdsConfig_per_xds_config_route_config = 4, + envoy_service_status_v3_PerXdsConfig_per_xds_config_scoped_route_config = 5, + envoy_service_status_v3_PerXdsConfig_per_xds_config_endpoint_config = 6, + envoy_service_status_v3_PerXdsConfig_per_xds_config_NOT_SET = 0 +} envoy_service_status_v3_PerXdsConfig_per_xds_config_oneofcases; +UPB_INLINE envoy_service_status_v3_PerXdsConfig_per_xds_config_oneofcases envoy_service_status_v3_PerXdsConfig_per_xds_config_case(const envoy_service_status_v3_PerXdsConfig* msg) { return (envoy_service_status_v3_PerXdsConfig_per_xds_config_oneofcases)*UPB_PTR_AT(msg, UPB_SIZE(12, 16), int32_t); } + +UPB_INLINE int32_t envoy_service_status_v3_PerXdsConfig_status(const envoy_service_status_v3_PerXdsConfig *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(0, 0), int32_t); } +UPB_INLINE bool envoy_service_status_v3_PerXdsConfig_has_listener_config(const envoy_service_status_v3_PerXdsConfig *msg) { return _upb_getoneofcase(msg, UPB_SIZE(12, 16)) == 2; } +UPB_INLINE const struct envoy_admin_v3_ListenersConfigDump* envoy_service_status_v3_PerXdsConfig_listener_config(const envoy_service_status_v3_PerXdsConfig *msg) { return UPB_READ_ONEOF(msg, const struct envoy_admin_v3_ListenersConfigDump*, UPB_SIZE(8, 8), UPB_SIZE(12, 16), 2, NULL); } +UPB_INLINE bool envoy_service_status_v3_PerXdsConfig_has_cluster_config(const envoy_service_status_v3_PerXdsConfig *msg) { return _upb_getoneofcase(msg, UPB_SIZE(12, 16)) == 3; } +UPB_INLINE const struct envoy_admin_v3_ClustersConfigDump* envoy_service_status_v3_PerXdsConfig_cluster_config(const envoy_service_status_v3_PerXdsConfig *msg) { return UPB_READ_ONEOF(msg, const struct envoy_admin_v3_ClustersConfigDump*, UPB_SIZE(8, 8), UPB_SIZE(12, 16), 3, NULL); } +UPB_INLINE bool envoy_service_status_v3_PerXdsConfig_has_route_config(const envoy_service_status_v3_PerXdsConfig *msg) { return _upb_getoneofcase(msg, UPB_SIZE(12, 16)) == 4; } +UPB_INLINE const struct envoy_admin_v3_RoutesConfigDump* envoy_service_status_v3_PerXdsConfig_route_config(const envoy_service_status_v3_PerXdsConfig *msg) { return UPB_READ_ONEOF(msg, const struct envoy_admin_v3_RoutesConfigDump*, UPB_SIZE(8, 8), UPB_SIZE(12, 16), 4, NULL); } +UPB_INLINE bool envoy_service_status_v3_PerXdsConfig_has_scoped_route_config(const envoy_service_status_v3_PerXdsConfig *msg) { return _upb_getoneofcase(msg, UPB_SIZE(12, 16)) == 5; } +UPB_INLINE const struct envoy_admin_v3_ScopedRoutesConfigDump* envoy_service_status_v3_PerXdsConfig_scoped_route_config(const envoy_service_status_v3_PerXdsConfig *msg) { return UPB_READ_ONEOF(msg, const struct envoy_admin_v3_ScopedRoutesConfigDump*, UPB_SIZE(8, 8), UPB_SIZE(12, 16), 5, NULL); } +UPB_INLINE bool envoy_service_status_v3_PerXdsConfig_has_endpoint_config(const envoy_service_status_v3_PerXdsConfig *msg) { return _upb_getoneofcase(msg, UPB_SIZE(12, 16)) == 6; } +UPB_INLINE const struct envoy_admin_v3_EndpointsConfigDump* envoy_service_status_v3_PerXdsConfig_endpoint_config(const envoy_service_status_v3_PerXdsConfig *msg) { return UPB_READ_ONEOF(msg, const struct envoy_admin_v3_EndpointsConfigDump*, UPB_SIZE(8, 8), UPB_SIZE(12, 16), 6, NULL); } +UPB_INLINE int32_t envoy_service_status_v3_PerXdsConfig_client_status(const envoy_service_status_v3_PerXdsConfig *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t); } + +UPB_INLINE void envoy_service_status_v3_PerXdsConfig_set_status(envoy_service_status_v3_PerXdsConfig *msg, int32_t value) { + *UPB_PTR_AT(msg, UPB_SIZE(0, 0), int32_t) = value; +} +UPB_INLINE void envoy_service_status_v3_PerXdsConfig_set_listener_config(envoy_service_status_v3_PerXdsConfig *msg, struct envoy_admin_v3_ListenersConfigDump* value) { + UPB_WRITE_ONEOF(msg, struct envoy_admin_v3_ListenersConfigDump*, UPB_SIZE(8, 8), value, UPB_SIZE(12, 16), 2); +} +UPB_INLINE struct envoy_admin_v3_ListenersConfigDump* envoy_service_status_v3_PerXdsConfig_mutable_listener_config(envoy_service_status_v3_PerXdsConfig *msg, upb_arena *arena) { + struct envoy_admin_v3_ListenersConfigDump* sub = (struct envoy_admin_v3_ListenersConfigDump*)envoy_service_status_v3_PerXdsConfig_listener_config(msg); + if (sub == NULL) { + sub = (struct envoy_admin_v3_ListenersConfigDump*)_upb_msg_new(&envoy_admin_v3_ListenersConfigDump_msginit, arena); + if (!sub) return NULL; + envoy_service_status_v3_PerXdsConfig_set_listener_config(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_service_status_v3_PerXdsConfig_set_cluster_config(envoy_service_status_v3_PerXdsConfig *msg, struct envoy_admin_v3_ClustersConfigDump* value) { + UPB_WRITE_ONEOF(msg, struct envoy_admin_v3_ClustersConfigDump*, UPB_SIZE(8, 8), value, UPB_SIZE(12, 16), 3); +} +UPB_INLINE struct envoy_admin_v3_ClustersConfigDump* envoy_service_status_v3_PerXdsConfig_mutable_cluster_config(envoy_service_status_v3_PerXdsConfig *msg, upb_arena *arena) { + struct envoy_admin_v3_ClustersConfigDump* sub = (struct envoy_admin_v3_ClustersConfigDump*)envoy_service_status_v3_PerXdsConfig_cluster_config(msg); + if (sub == NULL) { + sub = (struct envoy_admin_v3_ClustersConfigDump*)_upb_msg_new(&envoy_admin_v3_ClustersConfigDump_msginit, arena); + if (!sub) return NULL; + envoy_service_status_v3_PerXdsConfig_set_cluster_config(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_service_status_v3_PerXdsConfig_set_route_config(envoy_service_status_v3_PerXdsConfig *msg, struct envoy_admin_v3_RoutesConfigDump* value) { + UPB_WRITE_ONEOF(msg, struct envoy_admin_v3_RoutesConfigDump*, UPB_SIZE(8, 8), value, UPB_SIZE(12, 16), 4); +} +UPB_INLINE struct envoy_admin_v3_RoutesConfigDump* envoy_service_status_v3_PerXdsConfig_mutable_route_config(envoy_service_status_v3_PerXdsConfig *msg, upb_arena *arena) { + struct envoy_admin_v3_RoutesConfigDump* sub = (struct envoy_admin_v3_RoutesConfigDump*)envoy_service_status_v3_PerXdsConfig_route_config(msg); + if (sub == NULL) { + sub = (struct envoy_admin_v3_RoutesConfigDump*)_upb_msg_new(&envoy_admin_v3_RoutesConfigDump_msginit, arena); + if (!sub) return NULL; + envoy_service_status_v3_PerXdsConfig_set_route_config(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_service_status_v3_PerXdsConfig_set_scoped_route_config(envoy_service_status_v3_PerXdsConfig *msg, struct envoy_admin_v3_ScopedRoutesConfigDump* value) { + UPB_WRITE_ONEOF(msg, struct envoy_admin_v3_ScopedRoutesConfigDump*, UPB_SIZE(8, 8), value, UPB_SIZE(12, 16), 5); +} +UPB_INLINE struct envoy_admin_v3_ScopedRoutesConfigDump* envoy_service_status_v3_PerXdsConfig_mutable_scoped_route_config(envoy_service_status_v3_PerXdsConfig *msg, upb_arena *arena) { + struct envoy_admin_v3_ScopedRoutesConfigDump* sub = (struct envoy_admin_v3_ScopedRoutesConfigDump*)envoy_service_status_v3_PerXdsConfig_scoped_route_config(msg); + if (sub == NULL) { + sub = (struct envoy_admin_v3_ScopedRoutesConfigDump*)_upb_msg_new(&envoy_admin_v3_ScopedRoutesConfigDump_msginit, arena); + if (!sub) return NULL; + envoy_service_status_v3_PerXdsConfig_set_scoped_route_config(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_service_status_v3_PerXdsConfig_set_endpoint_config(envoy_service_status_v3_PerXdsConfig *msg, struct envoy_admin_v3_EndpointsConfigDump* value) { + UPB_WRITE_ONEOF(msg, struct envoy_admin_v3_EndpointsConfigDump*, UPB_SIZE(8, 8), value, UPB_SIZE(12, 16), 6); +} +UPB_INLINE struct envoy_admin_v3_EndpointsConfigDump* envoy_service_status_v3_PerXdsConfig_mutable_endpoint_config(envoy_service_status_v3_PerXdsConfig *msg, upb_arena *arena) { + struct envoy_admin_v3_EndpointsConfigDump* sub = (struct envoy_admin_v3_EndpointsConfigDump*)envoy_service_status_v3_PerXdsConfig_endpoint_config(msg); + if (sub == NULL) { + sub = (struct envoy_admin_v3_EndpointsConfigDump*)_upb_msg_new(&envoy_admin_v3_EndpointsConfigDump_msginit, arena); + if (!sub) return NULL; + envoy_service_status_v3_PerXdsConfig_set_endpoint_config(msg, sub); + } + return sub; +} +UPB_INLINE void envoy_service_status_v3_PerXdsConfig_set_client_status(envoy_service_status_v3_PerXdsConfig *msg, int32_t value) { + *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t) = value; +} + +/* envoy.service.status.v3.ClientConfig */ + +UPB_INLINE envoy_service_status_v3_ClientConfig *envoy_service_status_v3_ClientConfig_new(upb_arena *arena) { + return (envoy_service_status_v3_ClientConfig *)_upb_msg_new(&envoy_service_status_v3_ClientConfig_msginit, arena); +} +UPB_INLINE envoy_service_status_v3_ClientConfig *envoy_service_status_v3_ClientConfig_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_service_status_v3_ClientConfig *ret = envoy_service_status_v3_ClientConfig_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_service_status_v3_ClientConfig_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_service_status_v3_ClientConfig *envoy_service_status_v3_ClientConfig_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_service_status_v3_ClientConfig *ret = envoy_service_status_v3_ClientConfig_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_service_status_v3_ClientConfig_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_service_status_v3_ClientConfig_serialize(const envoy_service_status_v3_ClientConfig *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_service_status_v3_ClientConfig_msginit, arena, len); +} + +UPB_INLINE bool envoy_service_status_v3_ClientConfig_has_node(const envoy_service_status_v3_ClientConfig *msg) { return _upb_hasbit(msg, 1); } +UPB_INLINE const struct envoy_config_core_v3_Node* envoy_service_status_v3_ClientConfig_node(const envoy_service_status_v3_ClientConfig *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), const struct envoy_config_core_v3_Node*); } +UPB_INLINE bool envoy_service_status_v3_ClientConfig_has_xds_config(const envoy_service_status_v3_ClientConfig *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(8, 16)); } +UPB_INLINE const envoy_service_status_v3_PerXdsConfig* const* envoy_service_status_v3_ClientConfig_xds_config(const envoy_service_status_v3_ClientConfig *msg, size_t *len) { return (const envoy_service_status_v3_PerXdsConfig* const*)_upb_array_accessor(msg, UPB_SIZE(8, 16), len); } + +UPB_INLINE void envoy_service_status_v3_ClientConfig_set_node(envoy_service_status_v3_ClientConfig *msg, struct envoy_config_core_v3_Node* value) { + _upb_sethas(msg, 1); + *UPB_PTR_AT(msg, UPB_SIZE(4, 8), struct envoy_config_core_v3_Node*) = value; +} +UPB_INLINE struct envoy_config_core_v3_Node* envoy_service_status_v3_ClientConfig_mutable_node(envoy_service_status_v3_ClientConfig *msg, upb_arena *arena) { + struct envoy_config_core_v3_Node* sub = (struct envoy_config_core_v3_Node*)envoy_service_status_v3_ClientConfig_node(msg); + if (sub == NULL) { + sub = (struct envoy_config_core_v3_Node*)_upb_msg_new(&envoy_config_core_v3_Node_msginit, arena); + if (!sub) return NULL; + envoy_service_status_v3_ClientConfig_set_node(msg, sub); + } + return sub; +} +UPB_INLINE envoy_service_status_v3_PerXdsConfig** envoy_service_status_v3_ClientConfig_mutable_xds_config(envoy_service_status_v3_ClientConfig *msg, size_t *len) { + return (envoy_service_status_v3_PerXdsConfig**)_upb_array_mutable_accessor(msg, UPB_SIZE(8, 16), len); +} +UPB_INLINE envoy_service_status_v3_PerXdsConfig** envoy_service_status_v3_ClientConfig_resize_xds_config(envoy_service_status_v3_ClientConfig *msg, size_t len, upb_arena *arena) { + return (envoy_service_status_v3_PerXdsConfig**)_upb_array_resize_accessor2(msg, UPB_SIZE(8, 16), len, UPB_SIZE(2, 3), arena); +} +UPB_INLINE struct envoy_service_status_v3_PerXdsConfig* envoy_service_status_v3_ClientConfig_add_xds_config(envoy_service_status_v3_ClientConfig *msg, upb_arena *arena) { + struct envoy_service_status_v3_PerXdsConfig* sub = (struct envoy_service_status_v3_PerXdsConfig*)_upb_msg_new(&envoy_service_status_v3_PerXdsConfig_msginit, arena); + bool ok = _upb_array_append_accessor2( + msg, UPB_SIZE(8, 16), UPB_SIZE(2, 3), &sub, arena); + if (!ok) return NULL; + return sub; +} + +/* envoy.service.status.v3.ClientStatusResponse */ + +UPB_INLINE envoy_service_status_v3_ClientStatusResponse *envoy_service_status_v3_ClientStatusResponse_new(upb_arena *arena) { + return (envoy_service_status_v3_ClientStatusResponse *)_upb_msg_new(&envoy_service_status_v3_ClientStatusResponse_msginit, arena); +} +UPB_INLINE envoy_service_status_v3_ClientStatusResponse *envoy_service_status_v3_ClientStatusResponse_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_service_status_v3_ClientStatusResponse *ret = envoy_service_status_v3_ClientStatusResponse_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_service_status_v3_ClientStatusResponse_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_service_status_v3_ClientStatusResponse *envoy_service_status_v3_ClientStatusResponse_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_service_status_v3_ClientStatusResponse *ret = envoy_service_status_v3_ClientStatusResponse_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_service_status_v3_ClientStatusResponse_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_service_status_v3_ClientStatusResponse_serialize(const envoy_service_status_v3_ClientStatusResponse *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_service_status_v3_ClientStatusResponse_msginit, arena, len); +} + +UPB_INLINE bool envoy_service_status_v3_ClientStatusResponse_has_config(const envoy_service_status_v3_ClientStatusResponse *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(0, 0)); } +UPB_INLINE const envoy_service_status_v3_ClientConfig* const* envoy_service_status_v3_ClientStatusResponse_config(const envoy_service_status_v3_ClientStatusResponse *msg, size_t *len) { return (const envoy_service_status_v3_ClientConfig* const*)_upb_array_accessor(msg, UPB_SIZE(0, 0), len); } + +UPB_INLINE envoy_service_status_v3_ClientConfig** envoy_service_status_v3_ClientStatusResponse_mutable_config(envoy_service_status_v3_ClientStatusResponse *msg, size_t *len) { + return (envoy_service_status_v3_ClientConfig**)_upb_array_mutable_accessor(msg, UPB_SIZE(0, 0), len); +} +UPB_INLINE envoy_service_status_v3_ClientConfig** envoy_service_status_v3_ClientStatusResponse_resize_config(envoy_service_status_v3_ClientStatusResponse *msg, size_t len, upb_arena *arena) { + return (envoy_service_status_v3_ClientConfig**)_upb_array_resize_accessor2(msg, UPB_SIZE(0, 0), len, UPB_SIZE(2, 3), arena); +} +UPB_INLINE struct envoy_service_status_v3_ClientConfig* envoy_service_status_v3_ClientStatusResponse_add_config(envoy_service_status_v3_ClientStatusResponse *msg, upb_arena *arena) { + struct envoy_service_status_v3_ClientConfig* sub = (struct envoy_service_status_v3_ClientConfig*)_upb_msg_new(&envoy_service_status_v3_ClientConfig_msginit, arena); + bool ok = _upb_array_append_accessor2( + msg, UPB_SIZE(0, 0), UPB_SIZE(2, 3), &sub, arena); + if (!ok) return NULL; + return sub; +} + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#include "upb/port_undef.inc" + +#endif /* ENVOY_SERVICE_STATUS_V3_CSDS_PROTO_UPB_H_ */ diff --git a/grpc/src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.c b/grpc/src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.c new file mode 100644 index 00000000..8ef51fb9 --- /dev/null +++ b/grpc/src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.c @@ -0,0 +1,36 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * envoy/type/matcher/v3/node.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#include <stddef.h> +#include "upb/msg.h" +#include "envoy/type/matcher/v3/node.upb.h" +#include "envoy/type/matcher/v3/string.upb.h" +#include "envoy/type/matcher/v3/struct.upb.h" +#include "udpa/annotations/status.upb.h" +#include "udpa/annotations/versioning.upb.h" + +#include "upb/port_def.inc" + +static const upb_msglayout *const envoy_type_matcher_v3_NodeMatcher_submsgs[2] = { + &envoy_type_matcher_v3_StringMatcher_msginit, + &envoy_type_matcher_v3_StructMatcher_msginit, +}; + +static const upb_msglayout_field envoy_type_matcher_v3_NodeMatcher__fields[2] = { + {1, UPB_SIZE(4, 8), 1, 0, 11, 1}, + {2, UPB_SIZE(8, 16), 0, 1, 11, 3}, +}; + +const upb_msglayout envoy_type_matcher_v3_NodeMatcher_msginit = { + &envoy_type_matcher_v3_NodeMatcher_submsgs[0], + &envoy_type_matcher_v3_NodeMatcher__fields[0], + UPB_SIZE(16, 24), 2, false, 255, +}; + +#include "upb/port_undef.inc" + diff --git a/grpc/src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.h b/grpc/src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.h new file mode 100644 index 00000000..94e2257f --- /dev/null +++ b/grpc/src/core/ext/upb-generated/envoy/type/matcher/v3/node.upb.h @@ -0,0 +1,90 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * envoy/type/matcher/v3/node.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#ifndef ENVOY_TYPE_MATCHER_V3_NODE_PROTO_UPB_H_ +#define ENVOY_TYPE_MATCHER_V3_NODE_PROTO_UPB_H_ + +#include "upb/msg.h" +#include "upb/decode.h" +#include "upb/decode_fast.h" +#include "upb/encode.h" + +#include "upb/port_def.inc" + +#ifdef __cplusplus +extern "C" { +#endif + +struct envoy_type_matcher_v3_NodeMatcher; +typedef struct envoy_type_matcher_v3_NodeMatcher envoy_type_matcher_v3_NodeMatcher; +extern const upb_msglayout envoy_type_matcher_v3_NodeMatcher_msginit; +struct envoy_type_matcher_v3_StringMatcher; +struct envoy_type_matcher_v3_StructMatcher; +extern const upb_msglayout envoy_type_matcher_v3_StringMatcher_msginit; +extern const upb_msglayout envoy_type_matcher_v3_StructMatcher_msginit; + + +/* envoy.type.matcher.v3.NodeMatcher */ + +UPB_INLINE envoy_type_matcher_v3_NodeMatcher *envoy_type_matcher_v3_NodeMatcher_new(upb_arena *arena) { + return (envoy_type_matcher_v3_NodeMatcher *)_upb_msg_new(&envoy_type_matcher_v3_NodeMatcher_msginit, arena); +} +UPB_INLINE envoy_type_matcher_v3_NodeMatcher *envoy_type_matcher_v3_NodeMatcher_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_type_matcher_v3_NodeMatcher *ret = envoy_type_matcher_v3_NodeMatcher_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_type_matcher_v3_NodeMatcher_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_type_matcher_v3_NodeMatcher *envoy_type_matcher_v3_NodeMatcher_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_type_matcher_v3_NodeMatcher *ret = envoy_type_matcher_v3_NodeMatcher_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_type_matcher_v3_NodeMatcher_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_type_matcher_v3_NodeMatcher_serialize(const envoy_type_matcher_v3_NodeMatcher *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_type_matcher_v3_NodeMatcher_msginit, arena, len); +} + +UPB_INLINE bool envoy_type_matcher_v3_NodeMatcher_has_node_id(const envoy_type_matcher_v3_NodeMatcher *msg) { return _upb_hasbit(msg, 1); } +UPB_INLINE const struct envoy_type_matcher_v3_StringMatcher* envoy_type_matcher_v3_NodeMatcher_node_id(const envoy_type_matcher_v3_NodeMatcher *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), const struct envoy_type_matcher_v3_StringMatcher*); } +UPB_INLINE bool envoy_type_matcher_v3_NodeMatcher_has_node_metadatas(const envoy_type_matcher_v3_NodeMatcher *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(8, 16)); } +UPB_INLINE const struct envoy_type_matcher_v3_StructMatcher* const* envoy_type_matcher_v3_NodeMatcher_node_metadatas(const envoy_type_matcher_v3_NodeMatcher *msg, size_t *len) { return (const struct envoy_type_matcher_v3_StructMatcher* const*)_upb_array_accessor(msg, UPB_SIZE(8, 16), len); } + +UPB_INLINE void envoy_type_matcher_v3_NodeMatcher_set_node_id(envoy_type_matcher_v3_NodeMatcher *msg, struct envoy_type_matcher_v3_StringMatcher* value) { + _upb_sethas(msg, 1); + *UPB_PTR_AT(msg, UPB_SIZE(4, 8), struct envoy_type_matcher_v3_StringMatcher*) = value; +} +UPB_INLINE struct envoy_type_matcher_v3_StringMatcher* envoy_type_matcher_v3_NodeMatcher_mutable_node_id(envoy_type_matcher_v3_NodeMatcher *msg, upb_arena *arena) { + struct envoy_type_matcher_v3_StringMatcher* sub = (struct envoy_type_matcher_v3_StringMatcher*)envoy_type_matcher_v3_NodeMatcher_node_id(msg); + if (sub == NULL) { + sub = (struct envoy_type_matcher_v3_StringMatcher*)_upb_msg_new(&envoy_type_matcher_v3_StringMatcher_msginit, arena); + if (!sub) return NULL; + envoy_type_matcher_v3_NodeMatcher_set_node_id(msg, sub); + } + return sub; +} +UPB_INLINE struct envoy_type_matcher_v3_StructMatcher** envoy_type_matcher_v3_NodeMatcher_mutable_node_metadatas(envoy_type_matcher_v3_NodeMatcher *msg, size_t *len) { + return (struct envoy_type_matcher_v3_StructMatcher**)_upb_array_mutable_accessor(msg, UPB_SIZE(8, 16), len); +} +UPB_INLINE struct envoy_type_matcher_v3_StructMatcher** envoy_type_matcher_v3_NodeMatcher_resize_node_metadatas(envoy_type_matcher_v3_NodeMatcher *msg, size_t len, upb_arena *arena) { + return (struct envoy_type_matcher_v3_StructMatcher**)_upb_array_resize_accessor2(msg, UPB_SIZE(8, 16), len, UPB_SIZE(2, 3), arena); +} +UPB_INLINE struct envoy_type_matcher_v3_StructMatcher* envoy_type_matcher_v3_NodeMatcher_add_node_metadatas(envoy_type_matcher_v3_NodeMatcher *msg, upb_arena *arena) { + struct envoy_type_matcher_v3_StructMatcher* sub = (struct envoy_type_matcher_v3_StructMatcher*)_upb_msg_new(&envoy_type_matcher_v3_StructMatcher_msginit, arena); + bool ok = _upb_array_append_accessor2( + msg, UPB_SIZE(8, 16), UPB_SIZE(2, 3), &sub, arena); + if (!ok) return NULL; + return sub; +} + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#include "upb/port_undef.inc" + +#endif /* ENVOY_TYPE_MATCHER_V3_NODE_PROTO_UPB_H_ */ diff --git a/grpc/src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.c b/grpc/src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.c index 073e5063..e84e4f7c 100644 --- a/grpc/src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.c +++ b/grpc/src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.c @@ -10,7 +10,6 @@ #include "upb/msg.h" #include "envoy/type/matcher/v3/string.upb.h" #include "envoy/type/matcher/v3/regex.upb.h" -#include "envoy/annotations/deprecation.upb.h" #include "udpa/annotations/status.upb.h" #include "udpa/annotations/versioning.upb.h" #include "validate/validate.upb.h" diff --git a/grpc/src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.c b/grpc/src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.c new file mode 100644 index 00000000..05ea6a3f --- /dev/null +++ b/grpc/src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.c @@ -0,0 +1,46 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * envoy/type/matcher/v3/struct.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#include <stddef.h> +#include "upb/msg.h" +#include "envoy/type/matcher/v3/struct.upb.h" +#include "envoy/type/matcher/v3/value.upb.h" +#include "udpa/annotations/status.upb.h" +#include "udpa/annotations/versioning.upb.h" +#include "validate/validate.upb.h" + +#include "upb/port_def.inc" + +static const upb_msglayout *const envoy_type_matcher_v3_StructMatcher_submsgs[2] = { + &envoy_type_matcher_v3_StructMatcher_PathSegment_msginit, + &envoy_type_matcher_v3_ValueMatcher_msginit, +}; + +static const upb_msglayout_field envoy_type_matcher_v3_StructMatcher__fields[2] = { + {2, UPB_SIZE(8, 16), 0, 0, 11, 3}, + {3, UPB_SIZE(4, 8), 1, 1, 11, 1}, +}; + +const upb_msglayout envoy_type_matcher_v3_StructMatcher_msginit = { + &envoy_type_matcher_v3_StructMatcher_submsgs[0], + &envoy_type_matcher_v3_StructMatcher__fields[0], + UPB_SIZE(16, 24), 2, false, 255, +}; + +static const upb_msglayout_field envoy_type_matcher_v3_StructMatcher_PathSegment__fields[1] = { + {1, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 9, 1}, +}; + +const upb_msglayout envoy_type_matcher_v3_StructMatcher_PathSegment_msginit = { + NULL, + &envoy_type_matcher_v3_StructMatcher_PathSegment__fields[0], + UPB_SIZE(16, 32), 1, false, 255, +}; + +#include "upb/port_undef.inc" + diff --git a/grpc/src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.h b/grpc/src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.h new file mode 100644 index 00000000..53e52138 --- /dev/null +++ b/grpc/src/core/ext/upb-generated/envoy/type/matcher/v3/struct.upb.h @@ -0,0 +1,124 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * envoy/type/matcher/v3/struct.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#ifndef ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPB_H_ +#define ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPB_H_ + +#include "upb/msg.h" +#include "upb/decode.h" +#include "upb/decode_fast.h" +#include "upb/encode.h" + +#include "upb/port_def.inc" + +#ifdef __cplusplus +extern "C" { +#endif + +struct envoy_type_matcher_v3_StructMatcher; +struct envoy_type_matcher_v3_StructMatcher_PathSegment; +typedef struct envoy_type_matcher_v3_StructMatcher envoy_type_matcher_v3_StructMatcher; +typedef struct envoy_type_matcher_v3_StructMatcher_PathSegment envoy_type_matcher_v3_StructMatcher_PathSegment; +extern const upb_msglayout envoy_type_matcher_v3_StructMatcher_msginit; +extern const upb_msglayout envoy_type_matcher_v3_StructMatcher_PathSegment_msginit; +struct envoy_type_matcher_v3_ValueMatcher; +extern const upb_msglayout envoy_type_matcher_v3_ValueMatcher_msginit; + + +/* envoy.type.matcher.v3.StructMatcher */ + +UPB_INLINE envoy_type_matcher_v3_StructMatcher *envoy_type_matcher_v3_StructMatcher_new(upb_arena *arena) { + return (envoy_type_matcher_v3_StructMatcher *)_upb_msg_new(&envoy_type_matcher_v3_StructMatcher_msginit, arena); +} +UPB_INLINE envoy_type_matcher_v3_StructMatcher *envoy_type_matcher_v3_StructMatcher_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_type_matcher_v3_StructMatcher *ret = envoy_type_matcher_v3_StructMatcher_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_type_matcher_v3_StructMatcher_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_type_matcher_v3_StructMatcher *envoy_type_matcher_v3_StructMatcher_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_type_matcher_v3_StructMatcher *ret = envoy_type_matcher_v3_StructMatcher_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_type_matcher_v3_StructMatcher_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_type_matcher_v3_StructMatcher_serialize(const envoy_type_matcher_v3_StructMatcher *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_type_matcher_v3_StructMatcher_msginit, arena, len); +} + +UPB_INLINE bool envoy_type_matcher_v3_StructMatcher_has_path(const envoy_type_matcher_v3_StructMatcher *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(8, 16)); } +UPB_INLINE const envoy_type_matcher_v3_StructMatcher_PathSegment* const* envoy_type_matcher_v3_StructMatcher_path(const envoy_type_matcher_v3_StructMatcher *msg, size_t *len) { return (const envoy_type_matcher_v3_StructMatcher_PathSegment* const*)_upb_array_accessor(msg, UPB_SIZE(8, 16), len); } +UPB_INLINE bool envoy_type_matcher_v3_StructMatcher_has_value(const envoy_type_matcher_v3_StructMatcher *msg) { return _upb_hasbit(msg, 1); } +UPB_INLINE const struct envoy_type_matcher_v3_ValueMatcher* envoy_type_matcher_v3_StructMatcher_value(const envoy_type_matcher_v3_StructMatcher *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), const struct envoy_type_matcher_v3_ValueMatcher*); } + +UPB_INLINE envoy_type_matcher_v3_StructMatcher_PathSegment** envoy_type_matcher_v3_StructMatcher_mutable_path(envoy_type_matcher_v3_StructMatcher *msg, size_t *len) { + return (envoy_type_matcher_v3_StructMatcher_PathSegment**)_upb_array_mutable_accessor(msg, UPB_SIZE(8, 16), len); +} +UPB_INLINE envoy_type_matcher_v3_StructMatcher_PathSegment** envoy_type_matcher_v3_StructMatcher_resize_path(envoy_type_matcher_v3_StructMatcher *msg, size_t len, upb_arena *arena) { + return (envoy_type_matcher_v3_StructMatcher_PathSegment**)_upb_array_resize_accessor2(msg, UPB_SIZE(8, 16), len, UPB_SIZE(2, 3), arena); +} +UPB_INLINE struct envoy_type_matcher_v3_StructMatcher_PathSegment* envoy_type_matcher_v3_StructMatcher_add_path(envoy_type_matcher_v3_StructMatcher *msg, upb_arena *arena) { + struct envoy_type_matcher_v3_StructMatcher_PathSegment* sub = (struct envoy_type_matcher_v3_StructMatcher_PathSegment*)_upb_msg_new(&envoy_type_matcher_v3_StructMatcher_PathSegment_msginit, arena); + bool ok = _upb_array_append_accessor2( + msg, UPB_SIZE(8, 16), UPB_SIZE(2, 3), &sub, arena); + if (!ok) return NULL; + return sub; +} +UPB_INLINE void envoy_type_matcher_v3_StructMatcher_set_value(envoy_type_matcher_v3_StructMatcher *msg, struct envoy_type_matcher_v3_ValueMatcher* value) { + _upb_sethas(msg, 1); + *UPB_PTR_AT(msg, UPB_SIZE(4, 8), struct envoy_type_matcher_v3_ValueMatcher*) = value; +} +UPB_INLINE struct envoy_type_matcher_v3_ValueMatcher* envoy_type_matcher_v3_StructMatcher_mutable_value(envoy_type_matcher_v3_StructMatcher *msg, upb_arena *arena) { + struct envoy_type_matcher_v3_ValueMatcher* sub = (struct envoy_type_matcher_v3_ValueMatcher*)envoy_type_matcher_v3_StructMatcher_value(msg); + if (sub == NULL) { + sub = (struct envoy_type_matcher_v3_ValueMatcher*)_upb_msg_new(&envoy_type_matcher_v3_ValueMatcher_msginit, arena); + if (!sub) return NULL; + envoy_type_matcher_v3_StructMatcher_set_value(msg, sub); + } + return sub; +} + +/* envoy.type.matcher.v3.StructMatcher.PathSegment */ + +UPB_INLINE envoy_type_matcher_v3_StructMatcher_PathSegment *envoy_type_matcher_v3_StructMatcher_PathSegment_new(upb_arena *arena) { + return (envoy_type_matcher_v3_StructMatcher_PathSegment *)_upb_msg_new(&envoy_type_matcher_v3_StructMatcher_PathSegment_msginit, arena); +} +UPB_INLINE envoy_type_matcher_v3_StructMatcher_PathSegment *envoy_type_matcher_v3_StructMatcher_PathSegment_parse(const char *buf, size_t size, + upb_arena *arena) { + envoy_type_matcher_v3_StructMatcher_PathSegment *ret = envoy_type_matcher_v3_StructMatcher_PathSegment_new(arena); + return (ret && upb_decode(buf, size, ret, &envoy_type_matcher_v3_StructMatcher_PathSegment_msginit, arena)) ? ret : NULL; +} +UPB_INLINE envoy_type_matcher_v3_StructMatcher_PathSegment *envoy_type_matcher_v3_StructMatcher_PathSegment_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + envoy_type_matcher_v3_StructMatcher_PathSegment *ret = envoy_type_matcher_v3_StructMatcher_PathSegment_new(arena); + return (ret && _upb_decode(buf, size, ret, &envoy_type_matcher_v3_StructMatcher_PathSegment_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *envoy_type_matcher_v3_StructMatcher_PathSegment_serialize(const envoy_type_matcher_v3_StructMatcher_PathSegment *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &envoy_type_matcher_v3_StructMatcher_PathSegment_msginit, arena, len); +} + +typedef enum { + envoy_type_matcher_v3_StructMatcher_PathSegment_segment_key = 1, + envoy_type_matcher_v3_StructMatcher_PathSegment_segment_NOT_SET = 0 +} envoy_type_matcher_v3_StructMatcher_PathSegment_segment_oneofcases; +UPB_INLINE envoy_type_matcher_v3_StructMatcher_PathSegment_segment_oneofcases envoy_type_matcher_v3_StructMatcher_PathSegment_segment_case(const envoy_type_matcher_v3_StructMatcher_PathSegment* msg) { return (envoy_type_matcher_v3_StructMatcher_PathSegment_segment_oneofcases)*UPB_PTR_AT(msg, UPB_SIZE(8, 16), int32_t); } + +UPB_INLINE bool envoy_type_matcher_v3_StructMatcher_PathSegment_has_key(const envoy_type_matcher_v3_StructMatcher_PathSegment *msg) { return _upb_getoneofcase(msg, UPB_SIZE(8, 16)) == 1; } +UPB_INLINE upb_strview envoy_type_matcher_v3_StructMatcher_PathSegment_key(const envoy_type_matcher_v3_StructMatcher_PathSegment *msg) { return UPB_READ_ONEOF(msg, upb_strview, UPB_SIZE(0, 0), UPB_SIZE(8, 16), 1, upb_strview_make("", strlen(""))); } + +UPB_INLINE void envoy_type_matcher_v3_StructMatcher_PathSegment_set_key(envoy_type_matcher_v3_StructMatcher_PathSegment *msg, upb_strview value) { + UPB_WRITE_ONEOF(msg, upb_strview, UPB_SIZE(0, 0), value, UPB_SIZE(8, 16), 1); +} + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#include "upb/port_undef.inc" + +#endif /* ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPB_H_ */ diff --git a/grpc/src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.c b/grpc/src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.c index d3962ea6..4bbf5758 100644 --- a/grpc/src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.c +++ b/grpc/src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.c @@ -189,21 +189,23 @@ const upb_msglayout google_api_expr_v1alpha1_Constant_msginit = { UPB_SIZE(16, 32), 9, false, 255, }; -static const upb_msglayout *const google_api_expr_v1alpha1_SourceInfo_submsgs[1] = { +static const upb_msglayout *const google_api_expr_v1alpha1_SourceInfo_submsgs[2] = { + &google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry_msginit, &google_api_expr_v1alpha1_SourceInfo_PositionsEntry_msginit, }; -static const upb_msglayout_field google_api_expr_v1alpha1_SourceInfo__fields[4] = { +static const upb_msglayout_field google_api_expr_v1alpha1_SourceInfo__fields[5] = { {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, {2, UPB_SIZE(8, 16), 0, 0, 9, 1}, {3, UPB_SIZE(16, 32), 0, 0, 5, _UPB_LABEL_PACKED}, - {4, UPB_SIZE(20, 40), 0, 0, 11, _UPB_LABEL_MAP}, + {4, UPB_SIZE(20, 40), 0, 1, 11, _UPB_LABEL_MAP}, + {5, UPB_SIZE(24, 48), 0, 0, 11, _UPB_LABEL_MAP}, }; const upb_msglayout google_api_expr_v1alpha1_SourceInfo_msginit = { &google_api_expr_v1alpha1_SourceInfo_submsgs[0], &google_api_expr_v1alpha1_SourceInfo__fields[0], - UPB_SIZE(24, 48), 4, false, 255, + UPB_SIZE(32, 64), 5, false, 255, }; static const upb_msglayout_field google_api_expr_v1alpha1_SourceInfo_PositionsEntry__fields[2] = { @@ -217,6 +219,21 @@ const upb_msglayout google_api_expr_v1alpha1_SourceInfo_PositionsEntry_msginit = UPB_SIZE(16, 32), 2, false, 255, }; +static const upb_msglayout *const google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry_submsgs[1] = { + &google_api_expr_v1alpha1_Expr_msginit, +}; + +static const upb_msglayout_field google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry__fields[2] = { + {1, UPB_SIZE(0, 0), 0, 0, 3, 1}, + {2, UPB_SIZE(8, 16), 0, 0, 11, 1}, +}; + +const upb_msglayout google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry_msginit = { + &google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry_submsgs[0], + &google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry__fields[0], + UPB_SIZE(16, 32), 2, false, 255, +}; + static const upb_msglayout_field google_api_expr_v1alpha1_SourcePosition__fields[4] = { {1, UPB_SIZE(12, 16), 0, 0, 9, 1}, {2, UPB_SIZE(0, 0), 0, 0, 5, 1}, diff --git a/grpc/src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.h b/grpc/src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.h index 861c3a58..ffa7925a 100644 --- a/grpc/src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.h +++ b/grpc/src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.h @@ -32,6 +32,7 @@ struct google_api_expr_v1alpha1_Expr_Comprehension; struct google_api_expr_v1alpha1_Constant; struct google_api_expr_v1alpha1_SourceInfo; struct google_api_expr_v1alpha1_SourceInfo_PositionsEntry; +struct google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry; struct google_api_expr_v1alpha1_SourcePosition; typedef struct google_api_expr_v1alpha1_ParsedExpr google_api_expr_v1alpha1_ParsedExpr; typedef struct google_api_expr_v1alpha1_Expr google_api_expr_v1alpha1_Expr; @@ -45,6 +46,7 @@ typedef struct google_api_expr_v1alpha1_Expr_Comprehension google_api_expr_v1alp typedef struct google_api_expr_v1alpha1_Constant google_api_expr_v1alpha1_Constant; typedef struct google_api_expr_v1alpha1_SourceInfo google_api_expr_v1alpha1_SourceInfo; typedef struct google_api_expr_v1alpha1_SourceInfo_PositionsEntry google_api_expr_v1alpha1_SourceInfo_PositionsEntry; +typedef struct google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry; typedef struct google_api_expr_v1alpha1_SourcePosition google_api_expr_v1alpha1_SourcePosition; extern const upb_msglayout google_api_expr_v1alpha1_ParsedExpr_msginit; extern const upb_msglayout google_api_expr_v1alpha1_Expr_msginit; @@ -58,6 +60,7 @@ extern const upb_msglayout google_api_expr_v1alpha1_Expr_Comprehension_msginit; extern const upb_msglayout google_api_expr_v1alpha1_Constant_msginit; extern const upb_msglayout google_api_expr_v1alpha1_SourceInfo_msginit; extern const upb_msglayout google_api_expr_v1alpha1_SourceInfo_PositionsEntry_msginit; +extern const upb_msglayout google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry_msginit; extern const upb_msglayout google_api_expr_v1alpha1_SourcePosition_msginit; struct google_protobuf_Duration; struct google_protobuf_Timestamp; @@ -756,6 +759,10 @@ UPB_INLINE bool google_api_expr_v1alpha1_SourceInfo_has_positions(const google_a UPB_INLINE size_t google_api_expr_v1alpha1_SourceInfo_positions_size(const google_api_expr_v1alpha1_SourceInfo *msg) {return _upb_msg_map_size(msg, UPB_SIZE(20, 40)); } UPB_INLINE bool google_api_expr_v1alpha1_SourceInfo_positions_get(const google_api_expr_v1alpha1_SourceInfo *msg, int64_t key, int32_t *val) { return _upb_msg_map_get(msg, UPB_SIZE(20, 40), &key, sizeof(key), val, sizeof(*val)); } UPB_INLINE const google_api_expr_v1alpha1_SourceInfo_PositionsEntry* google_api_expr_v1alpha1_SourceInfo_positions_next(const google_api_expr_v1alpha1_SourceInfo *msg, size_t* iter) { return (const google_api_expr_v1alpha1_SourceInfo_PositionsEntry*)_upb_msg_map_next(msg, UPB_SIZE(20, 40), iter); } +UPB_INLINE bool google_api_expr_v1alpha1_SourceInfo_has_macro_calls(const google_api_expr_v1alpha1_SourceInfo *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(24, 48)); } +UPB_INLINE size_t google_api_expr_v1alpha1_SourceInfo_macro_calls_size(const google_api_expr_v1alpha1_SourceInfo *msg) {return _upb_msg_map_size(msg, UPB_SIZE(24, 48)); } +UPB_INLINE bool google_api_expr_v1alpha1_SourceInfo_macro_calls_get(const google_api_expr_v1alpha1_SourceInfo *msg, int64_t key, google_api_expr_v1alpha1_Expr* *val) { return _upb_msg_map_get(msg, UPB_SIZE(24, 48), &key, sizeof(key), val, sizeof(*val)); } +UPB_INLINE const google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry* google_api_expr_v1alpha1_SourceInfo_macro_calls_next(const google_api_expr_v1alpha1_SourceInfo *msg, size_t* iter) { return (const google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry*)_upb_msg_map_next(msg, UPB_SIZE(24, 48), iter); } UPB_INLINE void google_api_expr_v1alpha1_SourceInfo_set_syntax_version(google_api_expr_v1alpha1_SourceInfo *msg, upb_strview value) { *UPB_PTR_AT(msg, UPB_SIZE(0, 0), upb_strview) = value; @@ -777,6 +784,10 @@ UPB_INLINE void google_api_expr_v1alpha1_SourceInfo_positions_clear(google_api_e UPB_INLINE bool google_api_expr_v1alpha1_SourceInfo_positions_set(google_api_expr_v1alpha1_SourceInfo *msg, int64_t key, int32_t val, upb_arena *a) { return _upb_msg_map_set(msg, UPB_SIZE(20, 40), &key, sizeof(key), &val, sizeof(val), a); } UPB_INLINE bool google_api_expr_v1alpha1_SourceInfo_positions_delete(google_api_expr_v1alpha1_SourceInfo *msg, int64_t key) { return _upb_msg_map_delete(msg, UPB_SIZE(20, 40), &key, sizeof(key)); } UPB_INLINE google_api_expr_v1alpha1_SourceInfo_PositionsEntry* google_api_expr_v1alpha1_SourceInfo_positions_nextmutable(google_api_expr_v1alpha1_SourceInfo *msg, size_t* iter) { return (google_api_expr_v1alpha1_SourceInfo_PositionsEntry*)_upb_msg_map_next(msg, UPB_SIZE(20, 40), iter); } +UPB_INLINE void google_api_expr_v1alpha1_SourceInfo_macro_calls_clear(google_api_expr_v1alpha1_SourceInfo *msg) { _upb_msg_map_clear(msg, UPB_SIZE(24, 48)); } +UPB_INLINE bool google_api_expr_v1alpha1_SourceInfo_macro_calls_set(google_api_expr_v1alpha1_SourceInfo *msg, int64_t key, google_api_expr_v1alpha1_Expr* val, upb_arena *a) { return _upb_msg_map_set(msg, UPB_SIZE(24, 48), &key, sizeof(key), &val, sizeof(val), a); } +UPB_INLINE bool google_api_expr_v1alpha1_SourceInfo_macro_calls_delete(google_api_expr_v1alpha1_SourceInfo *msg, int64_t key) { return _upb_msg_map_delete(msg, UPB_SIZE(24, 48), &key, sizeof(key)); } +UPB_INLINE google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry* google_api_expr_v1alpha1_SourceInfo_macro_calls_nextmutable(google_api_expr_v1alpha1_SourceInfo *msg, size_t* iter) { return (google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry*)_upb_msg_map_next(msg, UPB_SIZE(24, 48), iter); } /* google.api.expr.v1alpha1.SourceInfo.PositionsEntry */ @@ -795,6 +806,24 @@ UPB_INLINE void google_api_expr_v1alpha1_SourceInfo_PositionsEntry_set_value(goo _upb_msg_map_set_value(msg, &value, sizeof(int32_t)); } +/* google.api.expr.v1alpha1.SourceInfo.MacroCallsEntry */ + +UPB_INLINE int64_t google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry_key(const google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry *msg) { + int64_t ret; + _upb_msg_map_key(msg, &ret, sizeof(ret)); + return ret; +} +UPB_INLINE bool google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry_has_value(const google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(8, 16)); } +UPB_INLINE const google_api_expr_v1alpha1_Expr* google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry_value(const google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry *msg) { + google_api_expr_v1alpha1_Expr* ret; + _upb_msg_map_value(msg, &ret, sizeof(ret)); + return ret; +} + +UPB_INLINE void google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry_set_value(google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry *msg, google_api_expr_v1alpha1_Expr* value) { + _upb_msg_map_set_value(msg, &value, sizeof(google_api_expr_v1alpha1_Expr*)); +} + /* google.api.expr.v1alpha1.SourcePosition */ UPB_INLINE google_api_expr_v1alpha1_SourcePosition *google_api_expr_v1alpha1_SourcePosition_new(upb_arena *arena) { diff --git a/grpc/src/core/ext/upb-generated/src/proto/grpc/auth/v1/authz_policy.upb.c b/grpc/src/core/ext/upb-generated/src/proto/grpc/auth/v1/authz_policy.upb.c new file mode 100644 index 00000000..62947d66 --- /dev/null +++ b/grpc/src/core/ext/upb-generated/src/proto/grpc/auth/v1/authz_policy.upb.c @@ -0,0 +1,85 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * src/proto/grpc/auth/v1/authz_policy.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#include <stddef.h> +#include "upb/msg.h" +#include "src/proto/grpc/auth/v1/authz_policy.upb.h" + +#include "upb/port_def.inc" + +static const upb_msglayout_field grpc_auth_v1_Peer__fields[1] = { + {1, UPB_SIZE(0, 0), 0, 0, 9, 3}, +}; + +const upb_msglayout grpc_auth_v1_Peer_msginit = { + NULL, + &grpc_auth_v1_Peer__fields[0], + UPB_SIZE(8, 8), 1, false, 255, +}; + +static const upb_msglayout_field grpc_auth_v1_Header__fields[2] = { + {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, + {2, UPB_SIZE(8, 16), 0, 0, 9, 3}, +}; + +const upb_msglayout grpc_auth_v1_Header_msginit = { + NULL, + &grpc_auth_v1_Header__fields[0], + UPB_SIZE(16, 32), 2, false, 255, +}; + +static const upb_msglayout *const grpc_auth_v1_Request_submsgs[1] = { + &grpc_auth_v1_Header_msginit, +}; + +static const upb_msglayout_field grpc_auth_v1_Request__fields[2] = { + {1, UPB_SIZE(0, 0), 0, 0, 9, 3}, + {3, UPB_SIZE(4, 8), 0, 0, 11, 3}, +}; + +const upb_msglayout grpc_auth_v1_Request_msginit = { + &grpc_auth_v1_Request_submsgs[0], + &grpc_auth_v1_Request__fields[0], + UPB_SIZE(8, 16), 2, false, 255, +}; + +static const upb_msglayout *const grpc_auth_v1_Rule_submsgs[2] = { + &grpc_auth_v1_Peer_msginit, + &grpc_auth_v1_Request_msginit, +}; + +static const upb_msglayout_field grpc_auth_v1_Rule__fields[3] = { + {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, + {2, UPB_SIZE(12, 24), 1, 0, 11, 1}, + {3, UPB_SIZE(16, 32), 2, 1, 11, 1}, +}; + +const upb_msglayout grpc_auth_v1_Rule_msginit = { + &grpc_auth_v1_Rule_submsgs[0], + &grpc_auth_v1_Rule__fields[0], + UPB_SIZE(24, 48), 3, false, 255, +}; + +static const upb_msglayout *const grpc_auth_v1_AuthorizationPolicy_submsgs[1] = { + &grpc_auth_v1_Rule_msginit, +}; + +static const upb_msglayout_field grpc_auth_v1_AuthorizationPolicy__fields[3] = { + {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, + {2, UPB_SIZE(8, 16), 0, 0, 11, 3}, + {3, UPB_SIZE(12, 24), 0, 0, 11, 3}, +}; + +const upb_msglayout grpc_auth_v1_AuthorizationPolicy_msginit = { + &grpc_auth_v1_AuthorizationPolicy_submsgs[0], + &grpc_auth_v1_AuthorizationPolicy__fields[0], + UPB_SIZE(16, 32), 3, false, 255, +}; + +#include "upb/port_undef.inc" + diff --git a/grpc/src/core/ext/upb-generated/src/proto/grpc/auth/v1/authz_policy.upb.h b/grpc/src/core/ext/upb-generated/src/proto/grpc/auth/v1/authz_policy.upb.h new file mode 100644 index 00000000..2177b9df --- /dev/null +++ b/grpc/src/core/ext/upb-generated/src/proto/grpc/auth/v1/authz_policy.upb.h @@ -0,0 +1,276 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * src/proto/grpc/auth/v1/authz_policy.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#ifndef SRC_PROTO_GRPC_AUTH_V1_AUTHZ_POLICY_PROTO_UPB_H_ +#define SRC_PROTO_GRPC_AUTH_V1_AUTHZ_POLICY_PROTO_UPB_H_ + +#include "upb/msg.h" +#include "upb/decode.h" +#include "upb/decode_fast.h" +#include "upb/encode.h" + +#include "upb/port_def.inc" + +#ifdef __cplusplus +extern "C" { +#endif + +struct grpc_auth_v1_Peer; +struct grpc_auth_v1_Header; +struct grpc_auth_v1_Request; +struct grpc_auth_v1_Rule; +struct grpc_auth_v1_AuthorizationPolicy; +typedef struct grpc_auth_v1_Peer grpc_auth_v1_Peer; +typedef struct grpc_auth_v1_Header grpc_auth_v1_Header; +typedef struct grpc_auth_v1_Request grpc_auth_v1_Request; +typedef struct grpc_auth_v1_Rule grpc_auth_v1_Rule; +typedef struct grpc_auth_v1_AuthorizationPolicy grpc_auth_v1_AuthorizationPolicy; +extern const upb_msglayout grpc_auth_v1_Peer_msginit; +extern const upb_msglayout grpc_auth_v1_Header_msginit; +extern const upb_msglayout grpc_auth_v1_Request_msginit; +extern const upb_msglayout grpc_auth_v1_Rule_msginit; +extern const upb_msglayout grpc_auth_v1_AuthorizationPolicy_msginit; + + +/* grpc.auth.v1.Peer */ + +UPB_INLINE grpc_auth_v1_Peer *grpc_auth_v1_Peer_new(upb_arena *arena) { + return (grpc_auth_v1_Peer *)_upb_msg_new(&grpc_auth_v1_Peer_msginit, arena); +} +UPB_INLINE grpc_auth_v1_Peer *grpc_auth_v1_Peer_parse(const char *buf, size_t size, + upb_arena *arena) { + grpc_auth_v1_Peer *ret = grpc_auth_v1_Peer_new(arena); + return (ret && upb_decode(buf, size, ret, &grpc_auth_v1_Peer_msginit, arena)) ? ret : NULL; +} +UPB_INLINE grpc_auth_v1_Peer *grpc_auth_v1_Peer_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + grpc_auth_v1_Peer *ret = grpc_auth_v1_Peer_new(arena); + return (ret && _upb_decode(buf, size, ret, &grpc_auth_v1_Peer_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *grpc_auth_v1_Peer_serialize(const grpc_auth_v1_Peer *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &grpc_auth_v1_Peer_msginit, arena, len); +} + +UPB_INLINE upb_strview const* grpc_auth_v1_Peer_principals(const grpc_auth_v1_Peer *msg, size_t *len) { return (upb_strview const*)_upb_array_accessor(msg, UPB_SIZE(0, 0), len); } + +UPB_INLINE upb_strview* grpc_auth_v1_Peer_mutable_principals(grpc_auth_v1_Peer *msg, size_t *len) { + return (upb_strview*)_upb_array_mutable_accessor(msg, UPB_SIZE(0, 0), len); +} +UPB_INLINE upb_strview* grpc_auth_v1_Peer_resize_principals(grpc_auth_v1_Peer *msg, size_t len, upb_arena *arena) { + return (upb_strview*)_upb_array_resize_accessor2(msg, UPB_SIZE(0, 0), len, UPB_SIZE(3, 4), arena); +} +UPB_INLINE bool grpc_auth_v1_Peer_add_principals(grpc_auth_v1_Peer *msg, upb_strview val, upb_arena *arena) { + return _upb_array_append_accessor2(msg, UPB_SIZE(0, 0), UPB_SIZE(3, 4), &val, + arena); +} + +/* grpc.auth.v1.Header */ + +UPB_INLINE grpc_auth_v1_Header *grpc_auth_v1_Header_new(upb_arena *arena) { + return (grpc_auth_v1_Header *)_upb_msg_new(&grpc_auth_v1_Header_msginit, arena); +} +UPB_INLINE grpc_auth_v1_Header *grpc_auth_v1_Header_parse(const char *buf, size_t size, + upb_arena *arena) { + grpc_auth_v1_Header *ret = grpc_auth_v1_Header_new(arena); + return (ret && upb_decode(buf, size, ret, &grpc_auth_v1_Header_msginit, arena)) ? ret : NULL; +} +UPB_INLINE grpc_auth_v1_Header *grpc_auth_v1_Header_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + grpc_auth_v1_Header *ret = grpc_auth_v1_Header_new(arena); + return (ret && _upb_decode(buf, size, ret, &grpc_auth_v1_Header_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *grpc_auth_v1_Header_serialize(const grpc_auth_v1_Header *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &grpc_auth_v1_Header_msginit, arena, len); +} + +UPB_INLINE upb_strview grpc_auth_v1_Header_key(const grpc_auth_v1_Header *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(0, 0), upb_strview); } +UPB_INLINE upb_strview const* grpc_auth_v1_Header_values(const grpc_auth_v1_Header *msg, size_t *len) { return (upb_strview const*)_upb_array_accessor(msg, UPB_SIZE(8, 16), len); } + +UPB_INLINE void grpc_auth_v1_Header_set_key(grpc_auth_v1_Header *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(0, 0), upb_strview) = value; +} +UPB_INLINE upb_strview* grpc_auth_v1_Header_mutable_values(grpc_auth_v1_Header *msg, size_t *len) { + return (upb_strview*)_upb_array_mutable_accessor(msg, UPB_SIZE(8, 16), len); +} +UPB_INLINE upb_strview* grpc_auth_v1_Header_resize_values(grpc_auth_v1_Header *msg, size_t len, upb_arena *arena) { + return (upb_strview*)_upb_array_resize_accessor2(msg, UPB_SIZE(8, 16), len, UPB_SIZE(3, 4), arena); +} +UPB_INLINE bool grpc_auth_v1_Header_add_values(grpc_auth_v1_Header *msg, upb_strview val, upb_arena *arena) { + return _upb_array_append_accessor2(msg, UPB_SIZE(8, 16), UPB_SIZE(3, 4), &val, + arena); +} + +/* grpc.auth.v1.Request */ + +UPB_INLINE grpc_auth_v1_Request *grpc_auth_v1_Request_new(upb_arena *arena) { + return (grpc_auth_v1_Request *)_upb_msg_new(&grpc_auth_v1_Request_msginit, arena); +} +UPB_INLINE grpc_auth_v1_Request *grpc_auth_v1_Request_parse(const char *buf, size_t size, + upb_arena *arena) { + grpc_auth_v1_Request *ret = grpc_auth_v1_Request_new(arena); + return (ret && upb_decode(buf, size, ret, &grpc_auth_v1_Request_msginit, arena)) ? ret : NULL; +} +UPB_INLINE grpc_auth_v1_Request *grpc_auth_v1_Request_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + grpc_auth_v1_Request *ret = grpc_auth_v1_Request_new(arena); + return (ret && _upb_decode(buf, size, ret, &grpc_auth_v1_Request_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *grpc_auth_v1_Request_serialize(const grpc_auth_v1_Request *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &grpc_auth_v1_Request_msginit, arena, len); +} + +UPB_INLINE upb_strview const* grpc_auth_v1_Request_paths(const grpc_auth_v1_Request *msg, size_t *len) { return (upb_strview const*)_upb_array_accessor(msg, UPB_SIZE(0, 0), len); } +UPB_INLINE bool grpc_auth_v1_Request_has_headers(const grpc_auth_v1_Request *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(4, 8)); } +UPB_INLINE const grpc_auth_v1_Header* const* grpc_auth_v1_Request_headers(const grpc_auth_v1_Request *msg, size_t *len) { return (const grpc_auth_v1_Header* const*)_upb_array_accessor(msg, UPB_SIZE(4, 8), len); } + +UPB_INLINE upb_strview* grpc_auth_v1_Request_mutable_paths(grpc_auth_v1_Request *msg, size_t *len) { + return (upb_strview*)_upb_array_mutable_accessor(msg, UPB_SIZE(0, 0), len); +} +UPB_INLINE upb_strview* grpc_auth_v1_Request_resize_paths(grpc_auth_v1_Request *msg, size_t len, upb_arena *arena) { + return (upb_strview*)_upb_array_resize_accessor2(msg, UPB_SIZE(0, 0), len, UPB_SIZE(3, 4), arena); +} +UPB_INLINE bool grpc_auth_v1_Request_add_paths(grpc_auth_v1_Request *msg, upb_strview val, upb_arena *arena) { + return _upb_array_append_accessor2(msg, UPB_SIZE(0, 0), UPB_SIZE(3, 4), &val, + arena); +} +UPB_INLINE grpc_auth_v1_Header** grpc_auth_v1_Request_mutable_headers(grpc_auth_v1_Request *msg, size_t *len) { + return (grpc_auth_v1_Header**)_upb_array_mutable_accessor(msg, UPB_SIZE(4, 8), len); +} +UPB_INLINE grpc_auth_v1_Header** grpc_auth_v1_Request_resize_headers(grpc_auth_v1_Request *msg, size_t len, upb_arena *arena) { + return (grpc_auth_v1_Header**)_upb_array_resize_accessor2(msg, UPB_SIZE(4, 8), len, UPB_SIZE(2, 3), arena); +} +UPB_INLINE struct grpc_auth_v1_Header* grpc_auth_v1_Request_add_headers(grpc_auth_v1_Request *msg, upb_arena *arena) { + struct grpc_auth_v1_Header* sub = (struct grpc_auth_v1_Header*)_upb_msg_new(&grpc_auth_v1_Header_msginit, arena); + bool ok = _upb_array_append_accessor2( + msg, UPB_SIZE(4, 8), UPB_SIZE(2, 3), &sub, arena); + if (!ok) return NULL; + return sub; +} + +/* grpc.auth.v1.Rule */ + +UPB_INLINE grpc_auth_v1_Rule *grpc_auth_v1_Rule_new(upb_arena *arena) { + return (grpc_auth_v1_Rule *)_upb_msg_new(&grpc_auth_v1_Rule_msginit, arena); +} +UPB_INLINE grpc_auth_v1_Rule *grpc_auth_v1_Rule_parse(const char *buf, size_t size, + upb_arena *arena) { + grpc_auth_v1_Rule *ret = grpc_auth_v1_Rule_new(arena); + return (ret && upb_decode(buf, size, ret, &grpc_auth_v1_Rule_msginit, arena)) ? ret : NULL; +} +UPB_INLINE grpc_auth_v1_Rule *grpc_auth_v1_Rule_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + grpc_auth_v1_Rule *ret = grpc_auth_v1_Rule_new(arena); + return (ret && _upb_decode(buf, size, ret, &grpc_auth_v1_Rule_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *grpc_auth_v1_Rule_serialize(const grpc_auth_v1_Rule *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &grpc_auth_v1_Rule_msginit, arena, len); +} + +UPB_INLINE upb_strview grpc_auth_v1_Rule_name(const grpc_auth_v1_Rule *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview); } +UPB_INLINE bool grpc_auth_v1_Rule_has_source(const grpc_auth_v1_Rule *msg) { return _upb_hasbit(msg, 1); } +UPB_INLINE const grpc_auth_v1_Peer* grpc_auth_v1_Rule_source(const grpc_auth_v1_Rule *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(12, 24), const grpc_auth_v1_Peer*); } +UPB_INLINE bool grpc_auth_v1_Rule_has_request(const grpc_auth_v1_Rule *msg) { return _upb_hasbit(msg, 2); } +UPB_INLINE const grpc_auth_v1_Request* grpc_auth_v1_Rule_request(const grpc_auth_v1_Rule *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(16, 32), const grpc_auth_v1_Request*); } + +UPB_INLINE void grpc_auth_v1_Rule_set_name(grpc_auth_v1_Rule *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview) = value; +} +UPB_INLINE void grpc_auth_v1_Rule_set_source(grpc_auth_v1_Rule *msg, grpc_auth_v1_Peer* value) { + _upb_sethas(msg, 1); + *UPB_PTR_AT(msg, UPB_SIZE(12, 24), grpc_auth_v1_Peer*) = value; +} +UPB_INLINE struct grpc_auth_v1_Peer* grpc_auth_v1_Rule_mutable_source(grpc_auth_v1_Rule *msg, upb_arena *arena) { + struct grpc_auth_v1_Peer* sub = (struct grpc_auth_v1_Peer*)grpc_auth_v1_Rule_source(msg); + if (sub == NULL) { + sub = (struct grpc_auth_v1_Peer*)_upb_msg_new(&grpc_auth_v1_Peer_msginit, arena); + if (!sub) return NULL; + grpc_auth_v1_Rule_set_source(msg, sub); + } + return sub; +} +UPB_INLINE void grpc_auth_v1_Rule_set_request(grpc_auth_v1_Rule *msg, grpc_auth_v1_Request* value) { + _upb_sethas(msg, 2); + *UPB_PTR_AT(msg, UPB_SIZE(16, 32), grpc_auth_v1_Request*) = value; +} +UPB_INLINE struct grpc_auth_v1_Request* grpc_auth_v1_Rule_mutable_request(grpc_auth_v1_Rule *msg, upb_arena *arena) { + struct grpc_auth_v1_Request* sub = (struct grpc_auth_v1_Request*)grpc_auth_v1_Rule_request(msg); + if (sub == NULL) { + sub = (struct grpc_auth_v1_Request*)_upb_msg_new(&grpc_auth_v1_Request_msginit, arena); + if (!sub) return NULL; + grpc_auth_v1_Rule_set_request(msg, sub); + } + return sub; +} + +/* grpc.auth.v1.AuthorizationPolicy */ + +UPB_INLINE grpc_auth_v1_AuthorizationPolicy *grpc_auth_v1_AuthorizationPolicy_new(upb_arena *arena) { + return (grpc_auth_v1_AuthorizationPolicy *)_upb_msg_new(&grpc_auth_v1_AuthorizationPolicy_msginit, arena); +} +UPB_INLINE grpc_auth_v1_AuthorizationPolicy *grpc_auth_v1_AuthorizationPolicy_parse(const char *buf, size_t size, + upb_arena *arena) { + grpc_auth_v1_AuthorizationPolicy *ret = grpc_auth_v1_AuthorizationPolicy_new(arena); + return (ret && upb_decode(buf, size, ret, &grpc_auth_v1_AuthorizationPolicy_msginit, arena)) ? ret : NULL; +} +UPB_INLINE grpc_auth_v1_AuthorizationPolicy *grpc_auth_v1_AuthorizationPolicy_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + grpc_auth_v1_AuthorizationPolicy *ret = grpc_auth_v1_AuthorizationPolicy_new(arena); + return (ret && _upb_decode(buf, size, ret, &grpc_auth_v1_AuthorizationPolicy_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *grpc_auth_v1_AuthorizationPolicy_serialize(const grpc_auth_v1_AuthorizationPolicy *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &grpc_auth_v1_AuthorizationPolicy_msginit, arena, len); +} + +UPB_INLINE upb_strview grpc_auth_v1_AuthorizationPolicy_name(const grpc_auth_v1_AuthorizationPolicy *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(0, 0), upb_strview); } +UPB_INLINE bool grpc_auth_v1_AuthorizationPolicy_has_deny_rules(const grpc_auth_v1_AuthorizationPolicy *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(8, 16)); } +UPB_INLINE const grpc_auth_v1_Rule* const* grpc_auth_v1_AuthorizationPolicy_deny_rules(const grpc_auth_v1_AuthorizationPolicy *msg, size_t *len) { return (const grpc_auth_v1_Rule* const*)_upb_array_accessor(msg, UPB_SIZE(8, 16), len); } +UPB_INLINE bool grpc_auth_v1_AuthorizationPolicy_has_allow_rules(const grpc_auth_v1_AuthorizationPolicy *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(12, 24)); } +UPB_INLINE const grpc_auth_v1_Rule* const* grpc_auth_v1_AuthorizationPolicy_allow_rules(const grpc_auth_v1_AuthorizationPolicy *msg, size_t *len) { return (const grpc_auth_v1_Rule* const*)_upb_array_accessor(msg, UPB_SIZE(12, 24), len); } + +UPB_INLINE void grpc_auth_v1_AuthorizationPolicy_set_name(grpc_auth_v1_AuthorizationPolicy *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(0, 0), upb_strview) = value; +} +UPB_INLINE grpc_auth_v1_Rule** grpc_auth_v1_AuthorizationPolicy_mutable_deny_rules(grpc_auth_v1_AuthorizationPolicy *msg, size_t *len) { + return (grpc_auth_v1_Rule**)_upb_array_mutable_accessor(msg, UPB_SIZE(8, 16), len); +} +UPB_INLINE grpc_auth_v1_Rule** grpc_auth_v1_AuthorizationPolicy_resize_deny_rules(grpc_auth_v1_AuthorizationPolicy *msg, size_t len, upb_arena *arena) { + return (grpc_auth_v1_Rule**)_upb_array_resize_accessor2(msg, UPB_SIZE(8, 16), len, UPB_SIZE(2, 3), arena); +} +UPB_INLINE struct grpc_auth_v1_Rule* grpc_auth_v1_AuthorizationPolicy_add_deny_rules(grpc_auth_v1_AuthorizationPolicy *msg, upb_arena *arena) { + struct grpc_auth_v1_Rule* sub = (struct grpc_auth_v1_Rule*)_upb_msg_new(&grpc_auth_v1_Rule_msginit, arena); + bool ok = _upb_array_append_accessor2( + msg, UPB_SIZE(8, 16), UPB_SIZE(2, 3), &sub, arena); + if (!ok) return NULL; + return sub; +} +UPB_INLINE grpc_auth_v1_Rule** grpc_auth_v1_AuthorizationPolicy_mutable_allow_rules(grpc_auth_v1_AuthorizationPolicy *msg, size_t *len) { + return (grpc_auth_v1_Rule**)_upb_array_mutable_accessor(msg, UPB_SIZE(12, 24), len); +} +UPB_INLINE grpc_auth_v1_Rule** grpc_auth_v1_AuthorizationPolicy_resize_allow_rules(grpc_auth_v1_AuthorizationPolicy *msg, size_t len, upb_arena *arena) { + return (grpc_auth_v1_Rule**)_upb_array_resize_accessor2(msg, UPB_SIZE(12, 24), len, UPB_SIZE(2, 3), arena); +} +UPB_INLINE struct grpc_auth_v1_Rule* grpc_auth_v1_AuthorizationPolicy_add_allow_rules(grpc_auth_v1_AuthorizationPolicy *msg, upb_arena *arena) { + struct grpc_auth_v1_Rule* sub = (struct grpc_auth_v1_Rule*)_upb_msg_new(&grpc_auth_v1_Rule_msginit, arena); + bool ok = _upb_array_append_accessor2( + msg, UPB_SIZE(12, 24), UPB_SIZE(2, 3), &sub, arena); + if (!ok) return NULL; + return sub; +} + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#include "upb/port_undef.inc" + +#endif /* SRC_PROTO_GRPC_AUTH_V1_AUTHZ_POLICY_PROTO_UPB_H_ */ diff --git a/grpc/src/core/ext/upb-generated/udpa/core/v1/authority.upb.h b/grpc/src/core/ext/upb-generated/udpa/core/v1/authority.upb.h deleted file mode 100644 index cc7fc1b7..00000000 --- a/grpc/src/core/ext/upb-generated/udpa/core/v1/authority.upb.h +++ /dev/null @@ -1,60 +0,0 @@ -/* This file was generated by upbc (the upb compiler) from the input - * file: - * - * udpa/core/v1/authority.proto - * - * Do not edit -- your changes will be discarded when the file is - * regenerated. */ - -#ifndef UDPA_CORE_V1_AUTHORITY_PROTO_UPB_H_ -#define UDPA_CORE_V1_AUTHORITY_PROTO_UPB_H_ - -#include "upb/msg.h" -#include "upb/decode.h" -#include "upb/decode_fast.h" -#include "upb/encode.h" - -#include "upb/port_def.inc" - -#ifdef __cplusplus -extern "C" { -#endif - -struct udpa_core_v1_Authority; -typedef struct udpa_core_v1_Authority udpa_core_v1_Authority; -extern const upb_msglayout udpa_core_v1_Authority_msginit; - - -/* udpa.core.v1.Authority */ - -UPB_INLINE udpa_core_v1_Authority *udpa_core_v1_Authority_new(upb_arena *arena) { - return (udpa_core_v1_Authority *)_upb_msg_new(&udpa_core_v1_Authority_msginit, arena); -} -UPB_INLINE udpa_core_v1_Authority *udpa_core_v1_Authority_parse(const char *buf, size_t size, - upb_arena *arena) { - udpa_core_v1_Authority *ret = udpa_core_v1_Authority_new(arena); - return (ret && upb_decode(buf, size, ret, &udpa_core_v1_Authority_msginit, arena)) ? ret : NULL; -} -UPB_INLINE udpa_core_v1_Authority *udpa_core_v1_Authority_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { - udpa_core_v1_Authority *ret = udpa_core_v1_Authority_new(arena); - return (ret && _upb_decode(buf, size, ret, &udpa_core_v1_Authority_msginit, arena, options)) - ? ret : NULL; -} -UPB_INLINE char *udpa_core_v1_Authority_serialize(const udpa_core_v1_Authority *msg, upb_arena *arena, size_t *len) { - return upb_encode(msg, &udpa_core_v1_Authority_msginit, arena, len); -} - -UPB_INLINE upb_strview udpa_core_v1_Authority_name(const udpa_core_v1_Authority *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(0, 0), upb_strview); } - -UPB_INLINE void udpa_core_v1_Authority_set_name(udpa_core_v1_Authority *msg, upb_strview value) { - *UPB_PTR_AT(msg, UPB_SIZE(0, 0), upb_strview) = value; -} - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#include "upb/port_undef.inc" - -#endif /* UDPA_CORE_V1_AUTHORITY_PROTO_UPB_H_ */ diff --git a/grpc/src/core/ext/upb-generated/udpa/core/v1/collection_entry.upb.c b/grpc/src/core/ext/upb-generated/udpa/core/v1/collection_entry.upb.c deleted file mode 100644 index f6ba895c..00000000 --- a/grpc/src/core/ext/upb-generated/udpa/core/v1/collection_entry.upb.c +++ /dev/null @@ -1,52 +0,0 @@ -/* This file was generated by upbc (the upb compiler) from the input - * file: - * - * udpa/core/v1/collection_entry.proto - * - * Do not edit -- your changes will be discarded when the file is - * regenerated. */ - -#include <stddef.h> -#include "upb/msg.h" -#include "udpa/core/v1/collection_entry.upb.h" -#include "google/protobuf/any.upb.h" -#include "udpa/annotations/status.upb.h" -#include "udpa/core/v1/resource_locator.upb.h" -#include "validate/validate.upb.h" - -#include "upb/port_def.inc" - -static const upb_msglayout *const udpa_core_v1_CollectionEntry_submsgs[2] = { - &udpa_core_v1_CollectionEntry_InlineEntry_msginit, - &udpa_core_v1_ResourceLocator_msginit, -}; - -static const upb_msglayout_field udpa_core_v1_CollectionEntry__fields[2] = { - {1, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 1, 11, 1}, - {2, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 11, 1}, -}; - -const upb_msglayout udpa_core_v1_CollectionEntry_msginit = { - &udpa_core_v1_CollectionEntry_submsgs[0], - &udpa_core_v1_CollectionEntry__fields[0], - UPB_SIZE(8, 16), 2, false, 255, -}; - -static const upb_msglayout *const udpa_core_v1_CollectionEntry_InlineEntry_submsgs[1] = { - &google_protobuf_Any_msginit, -}; - -static const upb_msglayout_field udpa_core_v1_CollectionEntry_InlineEntry__fields[3] = { - {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {2, UPB_SIZE(12, 24), 0, 0, 9, 1}, - {3, UPB_SIZE(20, 40), 1, 0, 11, 1}, -}; - -const upb_msglayout udpa_core_v1_CollectionEntry_InlineEntry_msginit = { - &udpa_core_v1_CollectionEntry_InlineEntry_submsgs[0], - &udpa_core_v1_CollectionEntry_InlineEntry__fields[0], - UPB_SIZE(24, 48), 3, false, 255, -}; - -#include "upb/port_undef.inc" - diff --git a/grpc/src/core/ext/upb-generated/udpa/core/v1/collection_entry.upb.h b/grpc/src/core/ext/upb-generated/udpa/core/v1/collection_entry.upb.h deleted file mode 100644 index bf76af4a..00000000 --- a/grpc/src/core/ext/upb-generated/udpa/core/v1/collection_entry.upb.h +++ /dev/null @@ -1,143 +0,0 @@ -/* This file was generated by upbc (the upb compiler) from the input - * file: - * - * udpa/core/v1/collection_entry.proto - * - * Do not edit -- your changes will be discarded when the file is - * regenerated. */ - -#ifndef UDPA_CORE_V1_COLLECTION_ENTRY_PROTO_UPB_H_ -#define UDPA_CORE_V1_COLLECTION_ENTRY_PROTO_UPB_H_ - -#include "upb/msg.h" -#include "upb/decode.h" -#include "upb/decode_fast.h" -#include "upb/encode.h" - -#include "upb/port_def.inc" - -#ifdef __cplusplus -extern "C" { -#endif - -struct udpa_core_v1_CollectionEntry; -struct udpa_core_v1_CollectionEntry_InlineEntry; -typedef struct udpa_core_v1_CollectionEntry udpa_core_v1_CollectionEntry; -typedef struct udpa_core_v1_CollectionEntry_InlineEntry udpa_core_v1_CollectionEntry_InlineEntry; -extern const upb_msglayout udpa_core_v1_CollectionEntry_msginit; -extern const upb_msglayout udpa_core_v1_CollectionEntry_InlineEntry_msginit; -struct google_protobuf_Any; -struct udpa_core_v1_ResourceLocator; -extern const upb_msglayout google_protobuf_Any_msginit; -extern const upb_msglayout udpa_core_v1_ResourceLocator_msginit; - - -/* udpa.core.v1.CollectionEntry */ - -UPB_INLINE udpa_core_v1_CollectionEntry *udpa_core_v1_CollectionEntry_new(upb_arena *arena) { - return (udpa_core_v1_CollectionEntry *)_upb_msg_new(&udpa_core_v1_CollectionEntry_msginit, arena); -} -UPB_INLINE udpa_core_v1_CollectionEntry *udpa_core_v1_CollectionEntry_parse(const char *buf, size_t size, - upb_arena *arena) { - udpa_core_v1_CollectionEntry *ret = udpa_core_v1_CollectionEntry_new(arena); - return (ret && upb_decode(buf, size, ret, &udpa_core_v1_CollectionEntry_msginit, arena)) ? ret : NULL; -} -UPB_INLINE udpa_core_v1_CollectionEntry *udpa_core_v1_CollectionEntry_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { - udpa_core_v1_CollectionEntry *ret = udpa_core_v1_CollectionEntry_new(arena); - return (ret && _upb_decode(buf, size, ret, &udpa_core_v1_CollectionEntry_msginit, arena, options)) - ? ret : NULL; -} -UPB_INLINE char *udpa_core_v1_CollectionEntry_serialize(const udpa_core_v1_CollectionEntry *msg, upb_arena *arena, size_t *len) { - return upb_encode(msg, &udpa_core_v1_CollectionEntry_msginit, arena, len); -} - -typedef enum { - udpa_core_v1_CollectionEntry_resource_specifier_locator = 1, - udpa_core_v1_CollectionEntry_resource_specifier_inline_entry = 2, - udpa_core_v1_CollectionEntry_resource_specifier_NOT_SET = 0 -} udpa_core_v1_CollectionEntry_resource_specifier_oneofcases; -UPB_INLINE udpa_core_v1_CollectionEntry_resource_specifier_oneofcases udpa_core_v1_CollectionEntry_resource_specifier_case(const udpa_core_v1_CollectionEntry* msg) { return (udpa_core_v1_CollectionEntry_resource_specifier_oneofcases)*UPB_PTR_AT(msg, UPB_SIZE(4, 8), int32_t); } - -UPB_INLINE bool udpa_core_v1_CollectionEntry_has_locator(const udpa_core_v1_CollectionEntry *msg) { return _upb_getoneofcase(msg, UPB_SIZE(4, 8)) == 1; } -UPB_INLINE const struct udpa_core_v1_ResourceLocator* udpa_core_v1_CollectionEntry_locator(const udpa_core_v1_CollectionEntry *msg) { return UPB_READ_ONEOF(msg, const struct udpa_core_v1_ResourceLocator*, UPB_SIZE(0, 0), UPB_SIZE(4, 8), 1, NULL); } -UPB_INLINE bool udpa_core_v1_CollectionEntry_has_inline_entry(const udpa_core_v1_CollectionEntry *msg) { return _upb_getoneofcase(msg, UPB_SIZE(4, 8)) == 2; } -UPB_INLINE const udpa_core_v1_CollectionEntry_InlineEntry* udpa_core_v1_CollectionEntry_inline_entry(const udpa_core_v1_CollectionEntry *msg) { return UPB_READ_ONEOF(msg, const udpa_core_v1_CollectionEntry_InlineEntry*, UPB_SIZE(0, 0), UPB_SIZE(4, 8), 2, NULL); } - -UPB_INLINE void udpa_core_v1_CollectionEntry_set_locator(udpa_core_v1_CollectionEntry *msg, struct udpa_core_v1_ResourceLocator* value) { - UPB_WRITE_ONEOF(msg, struct udpa_core_v1_ResourceLocator*, UPB_SIZE(0, 0), value, UPB_SIZE(4, 8), 1); -} -UPB_INLINE struct udpa_core_v1_ResourceLocator* udpa_core_v1_CollectionEntry_mutable_locator(udpa_core_v1_CollectionEntry *msg, upb_arena *arena) { - struct udpa_core_v1_ResourceLocator* sub = (struct udpa_core_v1_ResourceLocator*)udpa_core_v1_CollectionEntry_locator(msg); - if (sub == NULL) { - sub = (struct udpa_core_v1_ResourceLocator*)_upb_msg_new(&udpa_core_v1_ResourceLocator_msginit, arena); - if (!sub) return NULL; - udpa_core_v1_CollectionEntry_set_locator(msg, sub); - } - return sub; -} -UPB_INLINE void udpa_core_v1_CollectionEntry_set_inline_entry(udpa_core_v1_CollectionEntry *msg, udpa_core_v1_CollectionEntry_InlineEntry* value) { - UPB_WRITE_ONEOF(msg, udpa_core_v1_CollectionEntry_InlineEntry*, UPB_SIZE(0, 0), value, UPB_SIZE(4, 8), 2); -} -UPB_INLINE struct udpa_core_v1_CollectionEntry_InlineEntry* udpa_core_v1_CollectionEntry_mutable_inline_entry(udpa_core_v1_CollectionEntry *msg, upb_arena *arena) { - struct udpa_core_v1_CollectionEntry_InlineEntry* sub = (struct udpa_core_v1_CollectionEntry_InlineEntry*)udpa_core_v1_CollectionEntry_inline_entry(msg); - if (sub == NULL) { - sub = (struct udpa_core_v1_CollectionEntry_InlineEntry*)_upb_msg_new(&udpa_core_v1_CollectionEntry_InlineEntry_msginit, arena); - if (!sub) return NULL; - udpa_core_v1_CollectionEntry_set_inline_entry(msg, sub); - } - return sub; -} - -/* udpa.core.v1.CollectionEntry.InlineEntry */ - -UPB_INLINE udpa_core_v1_CollectionEntry_InlineEntry *udpa_core_v1_CollectionEntry_InlineEntry_new(upb_arena *arena) { - return (udpa_core_v1_CollectionEntry_InlineEntry *)_upb_msg_new(&udpa_core_v1_CollectionEntry_InlineEntry_msginit, arena); -} -UPB_INLINE udpa_core_v1_CollectionEntry_InlineEntry *udpa_core_v1_CollectionEntry_InlineEntry_parse(const char *buf, size_t size, - upb_arena *arena) { - udpa_core_v1_CollectionEntry_InlineEntry *ret = udpa_core_v1_CollectionEntry_InlineEntry_new(arena); - return (ret && upb_decode(buf, size, ret, &udpa_core_v1_CollectionEntry_InlineEntry_msginit, arena)) ? ret : NULL; -} -UPB_INLINE udpa_core_v1_CollectionEntry_InlineEntry *udpa_core_v1_CollectionEntry_InlineEntry_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { - udpa_core_v1_CollectionEntry_InlineEntry *ret = udpa_core_v1_CollectionEntry_InlineEntry_new(arena); - return (ret && _upb_decode(buf, size, ret, &udpa_core_v1_CollectionEntry_InlineEntry_msginit, arena, options)) - ? ret : NULL; -} -UPB_INLINE char *udpa_core_v1_CollectionEntry_InlineEntry_serialize(const udpa_core_v1_CollectionEntry_InlineEntry *msg, upb_arena *arena, size_t *len) { - return upb_encode(msg, &udpa_core_v1_CollectionEntry_InlineEntry_msginit, arena, len); -} - -UPB_INLINE upb_strview udpa_core_v1_CollectionEntry_InlineEntry_name(const udpa_core_v1_CollectionEntry_InlineEntry *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview); } -UPB_INLINE upb_strview udpa_core_v1_CollectionEntry_InlineEntry_version(const udpa_core_v1_CollectionEntry_InlineEntry *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(12, 24), upb_strview); } -UPB_INLINE bool udpa_core_v1_CollectionEntry_InlineEntry_has_resource(const udpa_core_v1_CollectionEntry_InlineEntry *msg) { return _upb_hasbit(msg, 1); } -UPB_INLINE const struct google_protobuf_Any* udpa_core_v1_CollectionEntry_InlineEntry_resource(const udpa_core_v1_CollectionEntry_InlineEntry *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(20, 40), const struct google_protobuf_Any*); } - -UPB_INLINE void udpa_core_v1_CollectionEntry_InlineEntry_set_name(udpa_core_v1_CollectionEntry_InlineEntry *msg, upb_strview value) { - *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview) = value; -} -UPB_INLINE void udpa_core_v1_CollectionEntry_InlineEntry_set_version(udpa_core_v1_CollectionEntry_InlineEntry *msg, upb_strview value) { - *UPB_PTR_AT(msg, UPB_SIZE(12, 24), upb_strview) = value; -} -UPB_INLINE void udpa_core_v1_CollectionEntry_InlineEntry_set_resource(udpa_core_v1_CollectionEntry_InlineEntry *msg, struct google_protobuf_Any* value) { - _upb_sethas(msg, 1); - *UPB_PTR_AT(msg, UPB_SIZE(20, 40), struct google_protobuf_Any*) = value; -} -UPB_INLINE struct google_protobuf_Any* udpa_core_v1_CollectionEntry_InlineEntry_mutable_resource(udpa_core_v1_CollectionEntry_InlineEntry *msg, upb_arena *arena) { - struct google_protobuf_Any* sub = (struct google_protobuf_Any*)udpa_core_v1_CollectionEntry_InlineEntry_resource(msg); - if (sub == NULL) { - sub = (struct google_protobuf_Any*)_upb_msg_new(&google_protobuf_Any_msginit, arena); - if (!sub) return NULL; - udpa_core_v1_CollectionEntry_InlineEntry_set_resource(msg, sub); - } - return sub; -} - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#include "upb/port_undef.inc" - -#endif /* UDPA_CORE_V1_COLLECTION_ENTRY_PROTO_UPB_H_ */ diff --git a/grpc/src/core/ext/upb-generated/udpa/core/v1/context_params.upb.c b/grpc/src/core/ext/upb-generated/udpa/core/v1/context_params.upb.c deleted file mode 100644 index fae1ad0b..00000000 --- a/grpc/src/core/ext/upb-generated/udpa/core/v1/context_params.upb.c +++ /dev/null @@ -1,42 +0,0 @@ -/* This file was generated by upbc (the upb compiler) from the input - * file: - * - * udpa/core/v1/context_params.proto - * - * Do not edit -- your changes will be discarded when the file is - * regenerated. */ - -#include <stddef.h> -#include "upb/msg.h" -#include "udpa/core/v1/context_params.upb.h" -#include "udpa/annotations/status.upb.h" - -#include "upb/port_def.inc" - -static const upb_msglayout *const udpa_core_v1_ContextParams_submsgs[1] = { - &udpa_core_v1_ContextParams_ParamsEntry_msginit, -}; - -static const upb_msglayout_field udpa_core_v1_ContextParams__fields[1] = { - {1, UPB_SIZE(0, 0), 0, 0, 11, _UPB_LABEL_MAP}, -}; - -const upb_msglayout udpa_core_v1_ContextParams_msginit = { - &udpa_core_v1_ContextParams_submsgs[0], - &udpa_core_v1_ContextParams__fields[0], - UPB_SIZE(8, 8), 1, false, 255, -}; - -static const upb_msglayout_field udpa_core_v1_ContextParams_ParamsEntry__fields[2] = { - {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, - {2, UPB_SIZE(8, 16), 0, 0, 9, 1}, -}; - -const upb_msglayout udpa_core_v1_ContextParams_ParamsEntry_msginit = { - NULL, - &udpa_core_v1_ContextParams_ParamsEntry__fields[0], - UPB_SIZE(16, 32), 2, false, 255, -}; - -#include "upb/port_undef.inc" - diff --git a/grpc/src/core/ext/upb-generated/udpa/core/v1/context_params.upb.h b/grpc/src/core/ext/upb-generated/udpa/core/v1/context_params.upb.h deleted file mode 100644 index 2d62de94..00000000 --- a/grpc/src/core/ext/upb-generated/udpa/core/v1/context_params.upb.h +++ /dev/null @@ -1,84 +0,0 @@ -/* This file was generated by upbc (the upb compiler) from the input - * file: - * - * udpa/core/v1/context_params.proto - * - * Do not edit -- your changes will be discarded when the file is - * regenerated. */ - -#ifndef UDPA_CORE_V1_CONTEXT_PARAMS_PROTO_UPB_H_ -#define UDPA_CORE_V1_CONTEXT_PARAMS_PROTO_UPB_H_ - -#include "upb/msg.h" -#include "upb/decode.h" -#include "upb/decode_fast.h" -#include "upb/encode.h" - -#include "upb/port_def.inc" - -#ifdef __cplusplus -extern "C" { -#endif - -struct udpa_core_v1_ContextParams; -struct udpa_core_v1_ContextParams_ParamsEntry; -typedef struct udpa_core_v1_ContextParams udpa_core_v1_ContextParams; -typedef struct udpa_core_v1_ContextParams_ParamsEntry udpa_core_v1_ContextParams_ParamsEntry; -extern const upb_msglayout udpa_core_v1_ContextParams_msginit; -extern const upb_msglayout udpa_core_v1_ContextParams_ParamsEntry_msginit; - - -/* udpa.core.v1.ContextParams */ - -UPB_INLINE udpa_core_v1_ContextParams *udpa_core_v1_ContextParams_new(upb_arena *arena) { - return (udpa_core_v1_ContextParams *)_upb_msg_new(&udpa_core_v1_ContextParams_msginit, arena); -} -UPB_INLINE udpa_core_v1_ContextParams *udpa_core_v1_ContextParams_parse(const char *buf, size_t size, - upb_arena *arena) { - udpa_core_v1_ContextParams *ret = udpa_core_v1_ContextParams_new(arena); - return (ret && upb_decode(buf, size, ret, &udpa_core_v1_ContextParams_msginit, arena)) ? ret : NULL; -} -UPB_INLINE udpa_core_v1_ContextParams *udpa_core_v1_ContextParams_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { - udpa_core_v1_ContextParams *ret = udpa_core_v1_ContextParams_new(arena); - return (ret && _upb_decode(buf, size, ret, &udpa_core_v1_ContextParams_msginit, arena, options)) - ? ret : NULL; -} -UPB_INLINE char *udpa_core_v1_ContextParams_serialize(const udpa_core_v1_ContextParams *msg, upb_arena *arena, size_t *len) { - return upb_encode(msg, &udpa_core_v1_ContextParams_msginit, arena, len); -} - -UPB_INLINE bool udpa_core_v1_ContextParams_has_params(const udpa_core_v1_ContextParams *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(0, 0)); } -UPB_INLINE size_t udpa_core_v1_ContextParams_params_size(const udpa_core_v1_ContextParams *msg) {return _upb_msg_map_size(msg, UPB_SIZE(0, 0)); } -UPB_INLINE bool udpa_core_v1_ContextParams_params_get(const udpa_core_v1_ContextParams *msg, upb_strview key, upb_strview *val) { return _upb_msg_map_get(msg, UPB_SIZE(0, 0), &key, 0, val, 0); } -UPB_INLINE const udpa_core_v1_ContextParams_ParamsEntry* udpa_core_v1_ContextParams_params_next(const udpa_core_v1_ContextParams *msg, size_t* iter) { return (const udpa_core_v1_ContextParams_ParamsEntry*)_upb_msg_map_next(msg, UPB_SIZE(0, 0), iter); } - -UPB_INLINE void udpa_core_v1_ContextParams_params_clear(udpa_core_v1_ContextParams *msg) { _upb_msg_map_clear(msg, UPB_SIZE(0, 0)); } -UPB_INLINE bool udpa_core_v1_ContextParams_params_set(udpa_core_v1_ContextParams *msg, upb_strview key, upb_strview val, upb_arena *a) { return _upb_msg_map_set(msg, UPB_SIZE(0, 0), &key, 0, &val, 0, a); } -UPB_INLINE bool udpa_core_v1_ContextParams_params_delete(udpa_core_v1_ContextParams *msg, upb_strview key) { return _upb_msg_map_delete(msg, UPB_SIZE(0, 0), &key, 0); } -UPB_INLINE udpa_core_v1_ContextParams_ParamsEntry* udpa_core_v1_ContextParams_params_nextmutable(udpa_core_v1_ContextParams *msg, size_t* iter) { return (udpa_core_v1_ContextParams_ParamsEntry*)_upb_msg_map_next(msg, UPB_SIZE(0, 0), iter); } - -/* udpa.core.v1.ContextParams.ParamsEntry */ - -UPB_INLINE upb_strview udpa_core_v1_ContextParams_ParamsEntry_key(const udpa_core_v1_ContextParams_ParamsEntry *msg) { - upb_strview ret; - _upb_msg_map_key(msg, &ret, 0); - return ret; -} -UPB_INLINE upb_strview udpa_core_v1_ContextParams_ParamsEntry_value(const udpa_core_v1_ContextParams_ParamsEntry *msg) { - upb_strview ret; - _upb_msg_map_value(msg, &ret, 0); - return ret; -} - -UPB_INLINE void udpa_core_v1_ContextParams_ParamsEntry_set_value(udpa_core_v1_ContextParams_ParamsEntry *msg, upb_strview value) { - _upb_msg_map_set_value(msg, &value, 0); -} - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#include "upb/port_undef.inc" - -#endif /* UDPA_CORE_V1_CONTEXT_PARAMS_PROTO_UPB_H_ */ diff --git a/grpc/src/core/ext/upb-generated/udpa/core/v1/resource.upb.h b/grpc/src/core/ext/upb-generated/udpa/core/v1/resource.upb.h deleted file mode 100644 index cff89376..00000000 --- a/grpc/src/core/ext/upb-generated/udpa/core/v1/resource.upb.h +++ /dev/null @@ -1,94 +0,0 @@ -/* This file was generated by upbc (the upb compiler) from the input - * file: - * - * udpa/core/v1/resource.proto - * - * Do not edit -- your changes will be discarded when the file is - * regenerated. */ - -#ifndef UDPA_CORE_V1_RESOURCE_PROTO_UPB_H_ -#define UDPA_CORE_V1_RESOURCE_PROTO_UPB_H_ - -#include "upb/msg.h" -#include "upb/decode.h" -#include "upb/decode_fast.h" -#include "upb/encode.h" - -#include "upb/port_def.inc" - -#ifdef __cplusplus -extern "C" { -#endif - -struct udpa_core_v1_Resource; -typedef struct udpa_core_v1_Resource udpa_core_v1_Resource; -extern const upb_msglayout udpa_core_v1_Resource_msginit; -struct google_protobuf_Any; -struct udpa_core_v1_ResourceName; -extern const upb_msglayout google_protobuf_Any_msginit; -extern const upb_msglayout udpa_core_v1_ResourceName_msginit; - - -/* udpa.core.v1.Resource */ - -UPB_INLINE udpa_core_v1_Resource *udpa_core_v1_Resource_new(upb_arena *arena) { - return (udpa_core_v1_Resource *)_upb_msg_new(&udpa_core_v1_Resource_msginit, arena); -} -UPB_INLINE udpa_core_v1_Resource *udpa_core_v1_Resource_parse(const char *buf, size_t size, - upb_arena *arena) { - udpa_core_v1_Resource *ret = udpa_core_v1_Resource_new(arena); - return (ret && upb_decode(buf, size, ret, &udpa_core_v1_Resource_msginit, arena)) ? ret : NULL; -} -UPB_INLINE udpa_core_v1_Resource *udpa_core_v1_Resource_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { - udpa_core_v1_Resource *ret = udpa_core_v1_Resource_new(arena); - return (ret && _upb_decode(buf, size, ret, &udpa_core_v1_Resource_msginit, arena, options)) - ? ret : NULL; -} -UPB_INLINE char *udpa_core_v1_Resource_serialize(const udpa_core_v1_Resource *msg, upb_arena *arena, size_t *len) { - return upb_encode(msg, &udpa_core_v1_Resource_msginit, arena, len); -} - -UPB_INLINE bool udpa_core_v1_Resource_has_name(const udpa_core_v1_Resource *msg) { return _upb_hasbit(msg, 1); } -UPB_INLINE const struct udpa_core_v1_ResourceName* udpa_core_v1_Resource_name(const udpa_core_v1_Resource *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(12, 24), const struct udpa_core_v1_ResourceName*); } -UPB_INLINE upb_strview udpa_core_v1_Resource_version(const udpa_core_v1_Resource *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview); } -UPB_INLINE bool udpa_core_v1_Resource_has_resource(const udpa_core_v1_Resource *msg) { return _upb_hasbit(msg, 2); } -UPB_INLINE const struct google_protobuf_Any* udpa_core_v1_Resource_resource(const udpa_core_v1_Resource *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(16, 32), const struct google_protobuf_Any*); } - -UPB_INLINE void udpa_core_v1_Resource_set_name(udpa_core_v1_Resource *msg, struct udpa_core_v1_ResourceName* value) { - _upb_sethas(msg, 1); - *UPB_PTR_AT(msg, UPB_SIZE(12, 24), struct udpa_core_v1_ResourceName*) = value; -} -UPB_INLINE struct udpa_core_v1_ResourceName* udpa_core_v1_Resource_mutable_name(udpa_core_v1_Resource *msg, upb_arena *arena) { - struct udpa_core_v1_ResourceName* sub = (struct udpa_core_v1_ResourceName*)udpa_core_v1_Resource_name(msg); - if (sub == NULL) { - sub = (struct udpa_core_v1_ResourceName*)_upb_msg_new(&udpa_core_v1_ResourceName_msginit, arena); - if (!sub) return NULL; - udpa_core_v1_Resource_set_name(msg, sub); - } - return sub; -} -UPB_INLINE void udpa_core_v1_Resource_set_version(udpa_core_v1_Resource *msg, upb_strview value) { - *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview) = value; -} -UPB_INLINE void udpa_core_v1_Resource_set_resource(udpa_core_v1_Resource *msg, struct google_protobuf_Any* value) { - _upb_sethas(msg, 2); - *UPB_PTR_AT(msg, UPB_SIZE(16, 32), struct google_protobuf_Any*) = value; -} -UPB_INLINE struct google_protobuf_Any* udpa_core_v1_Resource_mutable_resource(udpa_core_v1_Resource *msg, upb_arena *arena) { - struct google_protobuf_Any* sub = (struct google_protobuf_Any*)udpa_core_v1_Resource_resource(msg); - if (sub == NULL) { - sub = (struct google_protobuf_Any*)_upb_msg_new(&google_protobuf_Any_msginit, arena); - if (!sub) return NULL; - udpa_core_v1_Resource_set_resource(msg, sub); - } - return sub; -} - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#include "upb/port_undef.inc" - -#endif /* UDPA_CORE_V1_RESOURCE_PROTO_UPB_H_ */ diff --git a/grpc/src/core/ext/upb-generated/udpa/core/v1/resource_locator.upb.c b/grpc/src/core/ext/upb-generated/udpa/core/v1/resource_locator.upb.c deleted file mode 100644 index 5ceb62eb..00000000 --- a/grpc/src/core/ext/upb-generated/udpa/core/v1/resource_locator.upb.c +++ /dev/null @@ -1,54 +0,0 @@ -/* This file was generated by upbc (the upb compiler) from the input - * file: - * - * udpa/core/v1/resource_locator.proto - * - * Do not edit -- your changes will be discarded when the file is - * regenerated. */ - -#include <stddef.h> -#include "upb/msg.h" -#include "udpa/core/v1/resource_locator.upb.h" -#include "udpa/annotations/status.upb.h" -#include "udpa/core/v1/context_params.upb.h" -#include "validate/validate.upb.h" - -#include "upb/port_def.inc" - -static const upb_msglayout *const udpa_core_v1_ResourceLocator_submsgs[2] = { - &udpa_core_v1_ContextParams_msginit, - &udpa_core_v1_ResourceLocator_Directive_msginit, -}; - -static const upb_msglayout_field udpa_core_v1_ResourceLocator__fields[6] = { - {1, UPB_SIZE(0, 0), 0, 0, 14, 1}, - {2, UPB_SIZE(20, 40), 0, 0, 9, 3}, - {3, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {4, UPB_SIZE(12, 24), 0, 0, 9, 1}, - {5, UPB_SIZE(28, 56), UPB_SIZE(-33, -65), 0, 11, 1}, - {6, UPB_SIZE(24, 48), 0, 1, 11, 3}, -}; - -const upb_msglayout udpa_core_v1_ResourceLocator_msginit = { - &udpa_core_v1_ResourceLocator_submsgs[0], - &udpa_core_v1_ResourceLocator__fields[0], - UPB_SIZE(40, 80), 6, false, 255, -}; - -static const upb_msglayout *const udpa_core_v1_ResourceLocator_Directive_submsgs[1] = { - &udpa_core_v1_ResourceLocator_msginit, -}; - -static const upb_msglayout_field udpa_core_v1_ResourceLocator_Directive__fields[2] = { - {1, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 11, 1}, - {2, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 9, 1}, -}; - -const upb_msglayout udpa_core_v1_ResourceLocator_Directive_msginit = { - &udpa_core_v1_ResourceLocator_Directive_submsgs[0], - &udpa_core_v1_ResourceLocator_Directive__fields[0], - UPB_SIZE(16, 32), 2, false, 255, -}; - -#include "upb/port_undef.inc" - diff --git a/grpc/src/core/ext/upb-generated/udpa/core/v1/resource_locator.upb.h b/grpc/src/core/ext/upb-generated/udpa/core/v1/resource_locator.upb.h deleted file mode 100644 index ff52c58f..00000000 --- a/grpc/src/core/ext/upb-generated/udpa/core/v1/resource_locator.upb.h +++ /dev/null @@ -1,173 +0,0 @@ -/* This file was generated by upbc (the upb compiler) from the input - * file: - * - * udpa/core/v1/resource_locator.proto - * - * Do not edit -- your changes will be discarded when the file is - * regenerated. */ - -#ifndef UDPA_CORE_V1_RESOURCE_LOCATOR_PROTO_UPB_H_ -#define UDPA_CORE_V1_RESOURCE_LOCATOR_PROTO_UPB_H_ - -#include "upb/msg.h" -#include "upb/decode.h" -#include "upb/decode_fast.h" -#include "upb/encode.h" - -#include "upb/port_def.inc" - -#ifdef __cplusplus -extern "C" { -#endif - -struct udpa_core_v1_ResourceLocator; -struct udpa_core_v1_ResourceLocator_Directive; -typedef struct udpa_core_v1_ResourceLocator udpa_core_v1_ResourceLocator; -typedef struct udpa_core_v1_ResourceLocator_Directive udpa_core_v1_ResourceLocator_Directive; -extern const upb_msglayout udpa_core_v1_ResourceLocator_msginit; -extern const upb_msglayout udpa_core_v1_ResourceLocator_Directive_msginit; -struct udpa_core_v1_ContextParams; -extern const upb_msglayout udpa_core_v1_ContextParams_msginit; - -typedef enum { - udpa_core_v1_ResourceLocator_UDPA = 0, - udpa_core_v1_ResourceLocator_HTTP = 1, - udpa_core_v1_ResourceLocator_FILE = 2 -} udpa_core_v1_ResourceLocator_Scheme; - - -/* udpa.core.v1.ResourceLocator */ - -UPB_INLINE udpa_core_v1_ResourceLocator *udpa_core_v1_ResourceLocator_new(upb_arena *arena) { - return (udpa_core_v1_ResourceLocator *)_upb_msg_new(&udpa_core_v1_ResourceLocator_msginit, arena); -} -UPB_INLINE udpa_core_v1_ResourceLocator *udpa_core_v1_ResourceLocator_parse(const char *buf, size_t size, - upb_arena *arena) { - udpa_core_v1_ResourceLocator *ret = udpa_core_v1_ResourceLocator_new(arena); - return (ret && upb_decode(buf, size, ret, &udpa_core_v1_ResourceLocator_msginit, arena)) ? ret : NULL; -} -UPB_INLINE udpa_core_v1_ResourceLocator *udpa_core_v1_ResourceLocator_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { - udpa_core_v1_ResourceLocator *ret = udpa_core_v1_ResourceLocator_new(arena); - return (ret && _upb_decode(buf, size, ret, &udpa_core_v1_ResourceLocator_msginit, arena, options)) - ? ret : NULL; -} -UPB_INLINE char *udpa_core_v1_ResourceLocator_serialize(const udpa_core_v1_ResourceLocator *msg, upb_arena *arena, size_t *len) { - return upb_encode(msg, &udpa_core_v1_ResourceLocator_msginit, arena, len); -} - -typedef enum { - udpa_core_v1_ResourceLocator_context_param_specifier_exact_context = 5, - udpa_core_v1_ResourceLocator_context_param_specifier_NOT_SET = 0 -} udpa_core_v1_ResourceLocator_context_param_specifier_oneofcases; -UPB_INLINE udpa_core_v1_ResourceLocator_context_param_specifier_oneofcases udpa_core_v1_ResourceLocator_context_param_specifier_case(const udpa_core_v1_ResourceLocator* msg) { return (udpa_core_v1_ResourceLocator_context_param_specifier_oneofcases)*UPB_PTR_AT(msg, UPB_SIZE(32, 64), int32_t); } - -UPB_INLINE int32_t udpa_core_v1_ResourceLocator_scheme(const udpa_core_v1_ResourceLocator *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(0, 0), int32_t); } -UPB_INLINE upb_strview const* udpa_core_v1_ResourceLocator_id(const udpa_core_v1_ResourceLocator *msg, size_t *len) { return (upb_strview const*)_upb_array_accessor(msg, UPB_SIZE(20, 40), len); } -UPB_INLINE upb_strview udpa_core_v1_ResourceLocator_authority(const udpa_core_v1_ResourceLocator *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview); } -UPB_INLINE upb_strview udpa_core_v1_ResourceLocator_resource_type(const udpa_core_v1_ResourceLocator *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(12, 24), upb_strview); } -UPB_INLINE bool udpa_core_v1_ResourceLocator_has_exact_context(const udpa_core_v1_ResourceLocator *msg) { return _upb_getoneofcase(msg, UPB_SIZE(32, 64)) == 5; } -UPB_INLINE const struct udpa_core_v1_ContextParams* udpa_core_v1_ResourceLocator_exact_context(const udpa_core_v1_ResourceLocator *msg) { return UPB_READ_ONEOF(msg, const struct udpa_core_v1_ContextParams*, UPB_SIZE(28, 56), UPB_SIZE(32, 64), 5, NULL); } -UPB_INLINE bool udpa_core_v1_ResourceLocator_has_directives(const udpa_core_v1_ResourceLocator *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(24, 48)); } -UPB_INLINE const udpa_core_v1_ResourceLocator_Directive* const* udpa_core_v1_ResourceLocator_directives(const udpa_core_v1_ResourceLocator *msg, size_t *len) { return (const udpa_core_v1_ResourceLocator_Directive* const*)_upb_array_accessor(msg, UPB_SIZE(24, 48), len); } - -UPB_INLINE void udpa_core_v1_ResourceLocator_set_scheme(udpa_core_v1_ResourceLocator *msg, int32_t value) { - *UPB_PTR_AT(msg, UPB_SIZE(0, 0), int32_t) = value; -} -UPB_INLINE upb_strview* udpa_core_v1_ResourceLocator_mutable_id(udpa_core_v1_ResourceLocator *msg, size_t *len) { - return (upb_strview*)_upb_array_mutable_accessor(msg, UPB_SIZE(20, 40), len); -} -UPB_INLINE upb_strview* udpa_core_v1_ResourceLocator_resize_id(udpa_core_v1_ResourceLocator *msg, size_t len, upb_arena *arena) { - return (upb_strview*)_upb_array_resize_accessor2(msg, UPB_SIZE(20, 40), len, UPB_SIZE(3, 4), arena); -} -UPB_INLINE bool udpa_core_v1_ResourceLocator_add_id(udpa_core_v1_ResourceLocator *msg, upb_strview val, upb_arena *arena) { - return _upb_array_append_accessor2(msg, UPB_SIZE(20, 40), UPB_SIZE(3, 4), &val, - arena); -} -UPB_INLINE void udpa_core_v1_ResourceLocator_set_authority(udpa_core_v1_ResourceLocator *msg, upb_strview value) { - *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview) = value; -} -UPB_INLINE void udpa_core_v1_ResourceLocator_set_resource_type(udpa_core_v1_ResourceLocator *msg, upb_strview value) { - *UPB_PTR_AT(msg, UPB_SIZE(12, 24), upb_strview) = value; -} -UPB_INLINE void udpa_core_v1_ResourceLocator_set_exact_context(udpa_core_v1_ResourceLocator *msg, struct udpa_core_v1_ContextParams* value) { - UPB_WRITE_ONEOF(msg, struct udpa_core_v1_ContextParams*, UPB_SIZE(28, 56), value, UPB_SIZE(32, 64), 5); -} -UPB_INLINE struct udpa_core_v1_ContextParams* udpa_core_v1_ResourceLocator_mutable_exact_context(udpa_core_v1_ResourceLocator *msg, upb_arena *arena) { - struct udpa_core_v1_ContextParams* sub = (struct udpa_core_v1_ContextParams*)udpa_core_v1_ResourceLocator_exact_context(msg); - if (sub == NULL) { - sub = (struct udpa_core_v1_ContextParams*)_upb_msg_new(&udpa_core_v1_ContextParams_msginit, arena); - if (!sub) return NULL; - udpa_core_v1_ResourceLocator_set_exact_context(msg, sub); - } - return sub; -} -UPB_INLINE udpa_core_v1_ResourceLocator_Directive** udpa_core_v1_ResourceLocator_mutable_directives(udpa_core_v1_ResourceLocator *msg, size_t *len) { - return (udpa_core_v1_ResourceLocator_Directive**)_upb_array_mutable_accessor(msg, UPB_SIZE(24, 48), len); -} -UPB_INLINE udpa_core_v1_ResourceLocator_Directive** udpa_core_v1_ResourceLocator_resize_directives(udpa_core_v1_ResourceLocator *msg, size_t len, upb_arena *arena) { - return (udpa_core_v1_ResourceLocator_Directive**)_upb_array_resize_accessor2(msg, UPB_SIZE(24, 48), len, UPB_SIZE(2, 3), arena); -} -UPB_INLINE struct udpa_core_v1_ResourceLocator_Directive* udpa_core_v1_ResourceLocator_add_directives(udpa_core_v1_ResourceLocator *msg, upb_arena *arena) { - struct udpa_core_v1_ResourceLocator_Directive* sub = (struct udpa_core_v1_ResourceLocator_Directive*)_upb_msg_new(&udpa_core_v1_ResourceLocator_Directive_msginit, arena); - bool ok = _upb_array_append_accessor2( - msg, UPB_SIZE(24, 48), UPB_SIZE(2, 3), &sub, arena); - if (!ok) return NULL; - return sub; -} - -/* udpa.core.v1.ResourceLocator.Directive */ - -UPB_INLINE udpa_core_v1_ResourceLocator_Directive *udpa_core_v1_ResourceLocator_Directive_new(upb_arena *arena) { - return (udpa_core_v1_ResourceLocator_Directive *)_upb_msg_new(&udpa_core_v1_ResourceLocator_Directive_msginit, arena); -} -UPB_INLINE udpa_core_v1_ResourceLocator_Directive *udpa_core_v1_ResourceLocator_Directive_parse(const char *buf, size_t size, - upb_arena *arena) { - udpa_core_v1_ResourceLocator_Directive *ret = udpa_core_v1_ResourceLocator_Directive_new(arena); - return (ret && upb_decode(buf, size, ret, &udpa_core_v1_ResourceLocator_Directive_msginit, arena)) ? ret : NULL; -} -UPB_INLINE udpa_core_v1_ResourceLocator_Directive *udpa_core_v1_ResourceLocator_Directive_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { - udpa_core_v1_ResourceLocator_Directive *ret = udpa_core_v1_ResourceLocator_Directive_new(arena); - return (ret && _upb_decode(buf, size, ret, &udpa_core_v1_ResourceLocator_Directive_msginit, arena, options)) - ? ret : NULL; -} -UPB_INLINE char *udpa_core_v1_ResourceLocator_Directive_serialize(const udpa_core_v1_ResourceLocator_Directive *msg, upb_arena *arena, size_t *len) { - return upb_encode(msg, &udpa_core_v1_ResourceLocator_Directive_msginit, arena, len); -} - -typedef enum { - udpa_core_v1_ResourceLocator_Directive_directive_alt = 1, - udpa_core_v1_ResourceLocator_Directive_directive_entry = 2, - udpa_core_v1_ResourceLocator_Directive_directive_NOT_SET = 0 -} udpa_core_v1_ResourceLocator_Directive_directive_oneofcases; -UPB_INLINE udpa_core_v1_ResourceLocator_Directive_directive_oneofcases udpa_core_v1_ResourceLocator_Directive_directive_case(const udpa_core_v1_ResourceLocator_Directive* msg) { return (udpa_core_v1_ResourceLocator_Directive_directive_oneofcases)*UPB_PTR_AT(msg, UPB_SIZE(8, 16), int32_t); } - -UPB_INLINE bool udpa_core_v1_ResourceLocator_Directive_has_alt(const udpa_core_v1_ResourceLocator_Directive *msg) { return _upb_getoneofcase(msg, UPB_SIZE(8, 16)) == 1; } -UPB_INLINE const udpa_core_v1_ResourceLocator* udpa_core_v1_ResourceLocator_Directive_alt(const udpa_core_v1_ResourceLocator_Directive *msg) { return UPB_READ_ONEOF(msg, const udpa_core_v1_ResourceLocator*, UPB_SIZE(0, 0), UPB_SIZE(8, 16), 1, NULL); } -UPB_INLINE bool udpa_core_v1_ResourceLocator_Directive_has_entry(const udpa_core_v1_ResourceLocator_Directive *msg) { return _upb_getoneofcase(msg, UPB_SIZE(8, 16)) == 2; } -UPB_INLINE upb_strview udpa_core_v1_ResourceLocator_Directive_entry(const udpa_core_v1_ResourceLocator_Directive *msg) { return UPB_READ_ONEOF(msg, upb_strview, UPB_SIZE(0, 0), UPB_SIZE(8, 16), 2, upb_strview_make("", strlen(""))); } - -UPB_INLINE void udpa_core_v1_ResourceLocator_Directive_set_alt(udpa_core_v1_ResourceLocator_Directive *msg, udpa_core_v1_ResourceLocator* value) { - UPB_WRITE_ONEOF(msg, udpa_core_v1_ResourceLocator*, UPB_SIZE(0, 0), value, UPB_SIZE(8, 16), 1); -} -UPB_INLINE struct udpa_core_v1_ResourceLocator* udpa_core_v1_ResourceLocator_Directive_mutable_alt(udpa_core_v1_ResourceLocator_Directive *msg, upb_arena *arena) { - struct udpa_core_v1_ResourceLocator* sub = (struct udpa_core_v1_ResourceLocator*)udpa_core_v1_ResourceLocator_Directive_alt(msg); - if (sub == NULL) { - sub = (struct udpa_core_v1_ResourceLocator*)_upb_msg_new(&udpa_core_v1_ResourceLocator_msginit, arena); - if (!sub) return NULL; - udpa_core_v1_ResourceLocator_Directive_set_alt(msg, sub); - } - return sub; -} -UPB_INLINE void udpa_core_v1_ResourceLocator_Directive_set_entry(udpa_core_v1_ResourceLocator_Directive *msg, upb_strview value) { - UPB_WRITE_ONEOF(msg, upb_strview, UPB_SIZE(0, 0), value, UPB_SIZE(8, 16), 2); -} - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#include "upb/port_undef.inc" - -#endif /* UDPA_CORE_V1_RESOURCE_LOCATOR_PROTO_UPB_H_ */ diff --git a/grpc/src/core/ext/upb-generated/udpa/core/v1/resource_name.upb.c b/grpc/src/core/ext/upb-generated/udpa/core/v1/resource_name.upb.c deleted file mode 100644 index 4bc48b44..00000000 --- a/grpc/src/core/ext/upb-generated/udpa/core/v1/resource_name.upb.c +++ /dev/null @@ -1,36 +0,0 @@ -/* This file was generated by upbc (the upb compiler) from the input - * file: - * - * udpa/core/v1/resource_name.proto - * - * Do not edit -- your changes will be discarded when the file is - * regenerated. */ - -#include <stddef.h> -#include "upb/msg.h" -#include "udpa/core/v1/resource_name.upb.h" -#include "udpa/annotations/status.upb.h" -#include "udpa/core/v1/context_params.upb.h" -#include "validate/validate.upb.h" - -#include "upb/port_def.inc" - -static const upb_msglayout *const udpa_core_v1_ResourceName_submsgs[1] = { - &udpa_core_v1_ContextParams_msginit, -}; - -static const upb_msglayout_field udpa_core_v1_ResourceName__fields[4] = { - {1, UPB_SIZE(24, 48), 0, 0, 9, 3}, - {2, UPB_SIZE(4, 8), 0, 0, 9, 1}, - {3, UPB_SIZE(12, 24), 0, 0, 9, 1}, - {4, UPB_SIZE(20, 40), 1, 0, 11, 1}, -}; - -const upb_msglayout udpa_core_v1_ResourceName_msginit = { - &udpa_core_v1_ResourceName_submsgs[0], - &udpa_core_v1_ResourceName__fields[0], - UPB_SIZE(32, 64), 4, false, 255, -}; - -#include "upb/port_undef.inc" - diff --git a/grpc/src/core/ext/upb-generated/udpa/core/v1/resource_name.upb.h b/grpc/src/core/ext/upb-generated/udpa/core/v1/resource_name.upb.h deleted file mode 100644 index f631a2cb..00000000 --- a/grpc/src/core/ext/upb-generated/udpa/core/v1/resource_name.upb.h +++ /dev/null @@ -1,92 +0,0 @@ -/* This file was generated by upbc (the upb compiler) from the input - * file: - * - * udpa/core/v1/resource_name.proto - * - * Do not edit -- your changes will be discarded when the file is - * regenerated. */ - -#ifndef UDPA_CORE_V1_RESOURCE_NAME_PROTO_UPB_H_ -#define UDPA_CORE_V1_RESOURCE_NAME_PROTO_UPB_H_ - -#include "upb/msg.h" -#include "upb/decode.h" -#include "upb/decode_fast.h" -#include "upb/encode.h" - -#include "upb/port_def.inc" - -#ifdef __cplusplus -extern "C" { -#endif - -struct udpa_core_v1_ResourceName; -typedef struct udpa_core_v1_ResourceName udpa_core_v1_ResourceName; -extern const upb_msglayout udpa_core_v1_ResourceName_msginit; -struct udpa_core_v1_ContextParams; -extern const upb_msglayout udpa_core_v1_ContextParams_msginit; - - -/* udpa.core.v1.ResourceName */ - -UPB_INLINE udpa_core_v1_ResourceName *udpa_core_v1_ResourceName_new(upb_arena *arena) { - return (udpa_core_v1_ResourceName *)_upb_msg_new(&udpa_core_v1_ResourceName_msginit, arena); -} -UPB_INLINE udpa_core_v1_ResourceName *udpa_core_v1_ResourceName_parse(const char *buf, size_t size, - upb_arena *arena) { - udpa_core_v1_ResourceName *ret = udpa_core_v1_ResourceName_new(arena); - return (ret && upb_decode(buf, size, ret, &udpa_core_v1_ResourceName_msginit, arena)) ? ret : NULL; -} -UPB_INLINE udpa_core_v1_ResourceName *udpa_core_v1_ResourceName_parse_ex(const char *buf, size_t size, - upb_arena *arena, int options) { - udpa_core_v1_ResourceName *ret = udpa_core_v1_ResourceName_new(arena); - return (ret && _upb_decode(buf, size, ret, &udpa_core_v1_ResourceName_msginit, arena, options)) - ? ret : NULL; -} -UPB_INLINE char *udpa_core_v1_ResourceName_serialize(const udpa_core_v1_ResourceName *msg, upb_arena *arena, size_t *len) { - return upb_encode(msg, &udpa_core_v1_ResourceName_msginit, arena, len); -} - -UPB_INLINE upb_strview const* udpa_core_v1_ResourceName_id(const udpa_core_v1_ResourceName *msg, size_t *len) { return (upb_strview const*)_upb_array_accessor(msg, UPB_SIZE(24, 48), len); } -UPB_INLINE upb_strview udpa_core_v1_ResourceName_authority(const udpa_core_v1_ResourceName *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview); } -UPB_INLINE upb_strview udpa_core_v1_ResourceName_resource_type(const udpa_core_v1_ResourceName *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(12, 24), upb_strview); } -UPB_INLINE bool udpa_core_v1_ResourceName_has_context(const udpa_core_v1_ResourceName *msg) { return _upb_hasbit(msg, 1); } -UPB_INLINE const struct udpa_core_v1_ContextParams* udpa_core_v1_ResourceName_context(const udpa_core_v1_ResourceName *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(20, 40), const struct udpa_core_v1_ContextParams*); } - -UPB_INLINE upb_strview* udpa_core_v1_ResourceName_mutable_id(udpa_core_v1_ResourceName *msg, size_t *len) { - return (upb_strview*)_upb_array_mutable_accessor(msg, UPB_SIZE(24, 48), len); -} -UPB_INLINE upb_strview* udpa_core_v1_ResourceName_resize_id(udpa_core_v1_ResourceName *msg, size_t len, upb_arena *arena) { - return (upb_strview*)_upb_array_resize_accessor2(msg, UPB_SIZE(24, 48), len, UPB_SIZE(3, 4), arena); -} -UPB_INLINE bool udpa_core_v1_ResourceName_add_id(udpa_core_v1_ResourceName *msg, upb_strview val, upb_arena *arena) { - return _upb_array_append_accessor2(msg, UPB_SIZE(24, 48), UPB_SIZE(3, 4), &val, - arena); -} -UPB_INLINE void udpa_core_v1_ResourceName_set_authority(udpa_core_v1_ResourceName *msg, upb_strview value) { - *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview) = value; -} -UPB_INLINE void udpa_core_v1_ResourceName_set_resource_type(udpa_core_v1_ResourceName *msg, upb_strview value) { - *UPB_PTR_AT(msg, UPB_SIZE(12, 24), upb_strview) = value; -} -UPB_INLINE void udpa_core_v1_ResourceName_set_context(udpa_core_v1_ResourceName *msg, struct udpa_core_v1_ContextParams* value) { - _upb_sethas(msg, 1); - *UPB_PTR_AT(msg, UPB_SIZE(20, 40), struct udpa_core_v1_ContextParams*) = value; -} -UPB_INLINE struct udpa_core_v1_ContextParams* udpa_core_v1_ResourceName_mutable_context(udpa_core_v1_ResourceName *msg, upb_arena *arena) { - struct udpa_core_v1_ContextParams* sub = (struct udpa_core_v1_ContextParams*)udpa_core_v1_ResourceName_context(msg); - if (sub == NULL) { - sub = (struct udpa_core_v1_ContextParams*)_upb_msg_new(&udpa_core_v1_ContextParams_msginit, arena); - if (!sub) return NULL; - udpa_core_v1_ResourceName_set_context(msg, sub); - } - return sub; -} - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#include "upb/port_undef.inc" - -#endif /* UDPA_CORE_V1_RESOURCE_NAME_PROTO_UPB_H_ */ diff --git a/grpc/src/core/ext/upb-generated/udpa/type/v1/typed_struct.upb.c b/grpc/src/core/ext/upb-generated/udpa/type/v1/typed_struct.upb.c new file mode 100644 index 00000000..24407fa6 --- /dev/null +++ b/grpc/src/core/ext/upb-generated/udpa/type/v1/typed_struct.upb.c @@ -0,0 +1,33 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * udpa/type/v1/typed_struct.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#include <stddef.h> +#include "upb/msg.h" +#include "udpa/type/v1/typed_struct.upb.h" +#include "validate/validate.upb.h" +#include "google/protobuf/struct.upb.h" + +#include "upb/port_def.inc" + +static const upb_msglayout *const udpa_type_v1_TypedStruct_submsgs[1] = { + &google_protobuf_Struct_msginit, +}; + +static const upb_msglayout_field udpa_type_v1_TypedStruct__fields[2] = { + {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, + {2, UPB_SIZE(12, 24), 1, 0, 11, 1}, +}; + +const upb_msglayout udpa_type_v1_TypedStruct_msginit = { + &udpa_type_v1_TypedStruct_submsgs[0], + &udpa_type_v1_TypedStruct__fields[0], + UPB_SIZE(16, 32), 2, false, 255, +}; + +#include "upb/port_undef.inc" + diff --git a/grpc/src/core/ext/upb-generated/udpa/type/v1/typed_struct.upb.h b/grpc/src/core/ext/upb-generated/udpa/type/v1/typed_struct.upb.h new file mode 100644 index 00000000..2dd03ff1 --- /dev/null +++ b/grpc/src/core/ext/upb-generated/udpa/type/v1/typed_struct.upb.h @@ -0,0 +1,77 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * udpa/type/v1/typed_struct.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#ifndef UDPA_TYPE_V1_TYPED_STRUCT_PROTO_UPB_H_ +#define UDPA_TYPE_V1_TYPED_STRUCT_PROTO_UPB_H_ + +#include "upb/msg.h" +#include "upb/decode.h" +#include "upb/decode_fast.h" +#include "upb/encode.h" + +#include "upb/port_def.inc" + +#ifdef __cplusplus +extern "C" { +#endif + +struct udpa_type_v1_TypedStruct; +typedef struct udpa_type_v1_TypedStruct udpa_type_v1_TypedStruct; +extern const upb_msglayout udpa_type_v1_TypedStruct_msginit; +struct google_protobuf_Struct; +extern const upb_msglayout google_protobuf_Struct_msginit; + + +/* udpa.type.v1.TypedStruct */ + +UPB_INLINE udpa_type_v1_TypedStruct *udpa_type_v1_TypedStruct_new(upb_arena *arena) { + return (udpa_type_v1_TypedStruct *)_upb_msg_new(&udpa_type_v1_TypedStruct_msginit, arena); +} +UPB_INLINE udpa_type_v1_TypedStruct *udpa_type_v1_TypedStruct_parse(const char *buf, size_t size, + upb_arena *arena) { + udpa_type_v1_TypedStruct *ret = udpa_type_v1_TypedStruct_new(arena); + return (ret && upb_decode(buf, size, ret, &udpa_type_v1_TypedStruct_msginit, arena)) ? ret : NULL; +} +UPB_INLINE udpa_type_v1_TypedStruct *udpa_type_v1_TypedStruct_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + udpa_type_v1_TypedStruct *ret = udpa_type_v1_TypedStruct_new(arena); + return (ret && _upb_decode(buf, size, ret, &udpa_type_v1_TypedStruct_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *udpa_type_v1_TypedStruct_serialize(const udpa_type_v1_TypedStruct *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &udpa_type_v1_TypedStruct_msginit, arena, len); +} + +UPB_INLINE upb_strview udpa_type_v1_TypedStruct_type_url(const udpa_type_v1_TypedStruct *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview); } +UPB_INLINE bool udpa_type_v1_TypedStruct_has_value(const udpa_type_v1_TypedStruct *msg) { return _upb_hasbit(msg, 1); } +UPB_INLINE const struct google_protobuf_Struct* udpa_type_v1_TypedStruct_value(const udpa_type_v1_TypedStruct *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(12, 24), const struct google_protobuf_Struct*); } + +UPB_INLINE void udpa_type_v1_TypedStruct_set_type_url(udpa_type_v1_TypedStruct *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview) = value; +} +UPB_INLINE void udpa_type_v1_TypedStruct_set_value(udpa_type_v1_TypedStruct *msg, struct google_protobuf_Struct* value) { + _upb_sethas(msg, 1); + *UPB_PTR_AT(msg, UPB_SIZE(12, 24), struct google_protobuf_Struct*) = value; +} +UPB_INLINE struct google_protobuf_Struct* udpa_type_v1_TypedStruct_mutable_value(udpa_type_v1_TypedStruct *msg, upb_arena *arena) { + struct google_protobuf_Struct* sub = (struct google_protobuf_Struct*)udpa_type_v1_TypedStruct_value(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Struct*)_upb_msg_new(&google_protobuf_Struct_msginit, arena); + if (!sub) return NULL; + udpa_type_v1_TypedStruct_set_value(msg, sub); + } + return sub; +} + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#include "upb/port_undef.inc" + +#endif /* UDPA_TYPE_V1_TYPED_STRUCT_PROTO_UPB_H_ */ diff --git a/grpc/src/core/ext/upb-generated/udpa/core/v1/authority.upb.c b/grpc/src/core/ext/upb-generated/xds/core/v3/authority.upb.c index a8a38777..6c6da7d7 100644 --- a/grpc/src/core/ext/upb-generated/udpa/core/v1/authority.upb.c +++ b/grpc/src/core/ext/upb-generated/xds/core/v3/authority.upb.c @@ -1,26 +1,26 @@ /* This file was generated by upbc (the upb compiler) from the input * file: * - * udpa/core/v1/authority.proto + * xds/core/v3/authority.proto * * Do not edit -- your changes will be discarded when the file is * regenerated. */ #include <stddef.h> #include "upb/msg.h" -#include "udpa/core/v1/authority.upb.h" +#include "xds/core/v3/authority.upb.h" #include "udpa/annotations/status.upb.h" #include "validate/validate.upb.h" #include "upb/port_def.inc" -static const upb_msglayout_field udpa_core_v1_Authority__fields[1] = { +static const upb_msglayout_field xds_core_v3_Authority__fields[1] = { {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, }; -const upb_msglayout udpa_core_v1_Authority_msginit = { +const upb_msglayout xds_core_v3_Authority_msginit = { NULL, - &udpa_core_v1_Authority__fields[0], + &xds_core_v3_Authority__fields[0], UPB_SIZE(8, 16), 1, false, 255, }; diff --git a/grpc/src/core/ext/upb-generated/xds/core/v3/authority.upb.h b/grpc/src/core/ext/upb-generated/xds/core/v3/authority.upb.h new file mode 100644 index 00000000..2f1ff445 --- /dev/null +++ b/grpc/src/core/ext/upb-generated/xds/core/v3/authority.upb.h @@ -0,0 +1,60 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * xds/core/v3/authority.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#ifndef XDS_CORE_V3_AUTHORITY_PROTO_UPB_H_ +#define XDS_CORE_V3_AUTHORITY_PROTO_UPB_H_ + +#include "upb/msg.h" +#include "upb/decode.h" +#include "upb/decode_fast.h" +#include "upb/encode.h" + +#include "upb/port_def.inc" + +#ifdef __cplusplus +extern "C" { +#endif + +struct xds_core_v3_Authority; +typedef struct xds_core_v3_Authority xds_core_v3_Authority; +extern const upb_msglayout xds_core_v3_Authority_msginit; + + +/* xds.core.v3.Authority */ + +UPB_INLINE xds_core_v3_Authority *xds_core_v3_Authority_new(upb_arena *arena) { + return (xds_core_v3_Authority *)_upb_msg_new(&xds_core_v3_Authority_msginit, arena); +} +UPB_INLINE xds_core_v3_Authority *xds_core_v3_Authority_parse(const char *buf, size_t size, + upb_arena *arena) { + xds_core_v3_Authority *ret = xds_core_v3_Authority_new(arena); + return (ret && upb_decode(buf, size, ret, &xds_core_v3_Authority_msginit, arena)) ? ret : NULL; +} +UPB_INLINE xds_core_v3_Authority *xds_core_v3_Authority_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + xds_core_v3_Authority *ret = xds_core_v3_Authority_new(arena); + return (ret && _upb_decode(buf, size, ret, &xds_core_v3_Authority_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *xds_core_v3_Authority_serialize(const xds_core_v3_Authority *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &xds_core_v3_Authority_msginit, arena, len); +} + +UPB_INLINE upb_strview xds_core_v3_Authority_name(const xds_core_v3_Authority *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(0, 0), upb_strview); } + +UPB_INLINE void xds_core_v3_Authority_set_name(xds_core_v3_Authority *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(0, 0), upb_strview) = value; +} + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#include "upb/port_undef.inc" + +#endif /* XDS_CORE_V3_AUTHORITY_PROTO_UPB_H_ */ diff --git a/grpc/src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.c b/grpc/src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.c new file mode 100644 index 00000000..20cc2970 --- /dev/null +++ b/grpc/src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.c @@ -0,0 +1,52 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * xds/core/v3/collection_entry.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#include <stddef.h> +#include "upb/msg.h" +#include "xds/core/v3/collection_entry.upb.h" +#include "google/protobuf/any.upb.h" +#include "udpa/annotations/status.upb.h" +#include "xds/core/v3/resource_locator.upb.h" +#include "validate/validate.upb.h" + +#include "upb/port_def.inc" + +static const upb_msglayout *const xds_core_v3_CollectionEntry_submsgs[2] = { + &xds_core_v3_CollectionEntry_InlineEntry_msginit, + &xds_core_v3_ResourceLocator_msginit, +}; + +static const upb_msglayout_field xds_core_v3_CollectionEntry__fields[2] = { + {1, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 1, 11, 1}, + {2, UPB_SIZE(0, 0), UPB_SIZE(-5, -9), 0, 11, 1}, +}; + +const upb_msglayout xds_core_v3_CollectionEntry_msginit = { + &xds_core_v3_CollectionEntry_submsgs[0], + &xds_core_v3_CollectionEntry__fields[0], + UPB_SIZE(8, 16), 2, false, 255, +}; + +static const upb_msglayout *const xds_core_v3_CollectionEntry_InlineEntry_submsgs[1] = { + &google_protobuf_Any_msginit, +}; + +static const upb_msglayout_field xds_core_v3_CollectionEntry_InlineEntry__fields[3] = { + {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, + {2, UPB_SIZE(12, 24), 0, 0, 9, 1}, + {3, UPB_SIZE(20, 40), 1, 0, 11, 1}, +}; + +const upb_msglayout xds_core_v3_CollectionEntry_InlineEntry_msginit = { + &xds_core_v3_CollectionEntry_InlineEntry_submsgs[0], + &xds_core_v3_CollectionEntry_InlineEntry__fields[0], + UPB_SIZE(24, 48), 3, false, 255, +}; + +#include "upb/port_undef.inc" + diff --git a/grpc/src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.h b/grpc/src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.h new file mode 100644 index 00000000..983a3455 --- /dev/null +++ b/grpc/src/core/ext/upb-generated/xds/core/v3/collection_entry.upb.h @@ -0,0 +1,143 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * xds/core/v3/collection_entry.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#ifndef XDS_CORE_V3_COLLECTION_ENTRY_PROTO_UPB_H_ +#define XDS_CORE_V3_COLLECTION_ENTRY_PROTO_UPB_H_ + +#include "upb/msg.h" +#include "upb/decode.h" +#include "upb/decode_fast.h" +#include "upb/encode.h" + +#include "upb/port_def.inc" + +#ifdef __cplusplus +extern "C" { +#endif + +struct xds_core_v3_CollectionEntry; +struct xds_core_v3_CollectionEntry_InlineEntry; +typedef struct xds_core_v3_CollectionEntry xds_core_v3_CollectionEntry; +typedef struct xds_core_v3_CollectionEntry_InlineEntry xds_core_v3_CollectionEntry_InlineEntry; +extern const upb_msglayout xds_core_v3_CollectionEntry_msginit; +extern const upb_msglayout xds_core_v3_CollectionEntry_InlineEntry_msginit; +struct google_protobuf_Any; +struct xds_core_v3_ResourceLocator; +extern const upb_msglayout google_protobuf_Any_msginit; +extern const upb_msglayout xds_core_v3_ResourceLocator_msginit; + + +/* xds.core.v3.CollectionEntry */ + +UPB_INLINE xds_core_v3_CollectionEntry *xds_core_v3_CollectionEntry_new(upb_arena *arena) { + return (xds_core_v3_CollectionEntry *)_upb_msg_new(&xds_core_v3_CollectionEntry_msginit, arena); +} +UPB_INLINE xds_core_v3_CollectionEntry *xds_core_v3_CollectionEntry_parse(const char *buf, size_t size, + upb_arena *arena) { + xds_core_v3_CollectionEntry *ret = xds_core_v3_CollectionEntry_new(arena); + return (ret && upb_decode(buf, size, ret, &xds_core_v3_CollectionEntry_msginit, arena)) ? ret : NULL; +} +UPB_INLINE xds_core_v3_CollectionEntry *xds_core_v3_CollectionEntry_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + xds_core_v3_CollectionEntry *ret = xds_core_v3_CollectionEntry_new(arena); + return (ret && _upb_decode(buf, size, ret, &xds_core_v3_CollectionEntry_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *xds_core_v3_CollectionEntry_serialize(const xds_core_v3_CollectionEntry *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &xds_core_v3_CollectionEntry_msginit, arena, len); +} + +typedef enum { + xds_core_v3_CollectionEntry_resource_specifier_locator = 1, + xds_core_v3_CollectionEntry_resource_specifier_inline_entry = 2, + xds_core_v3_CollectionEntry_resource_specifier_NOT_SET = 0 +} xds_core_v3_CollectionEntry_resource_specifier_oneofcases; +UPB_INLINE xds_core_v3_CollectionEntry_resource_specifier_oneofcases xds_core_v3_CollectionEntry_resource_specifier_case(const xds_core_v3_CollectionEntry* msg) { return (xds_core_v3_CollectionEntry_resource_specifier_oneofcases)*UPB_PTR_AT(msg, UPB_SIZE(4, 8), int32_t); } + +UPB_INLINE bool xds_core_v3_CollectionEntry_has_locator(const xds_core_v3_CollectionEntry *msg) { return _upb_getoneofcase(msg, UPB_SIZE(4, 8)) == 1; } +UPB_INLINE const struct xds_core_v3_ResourceLocator* xds_core_v3_CollectionEntry_locator(const xds_core_v3_CollectionEntry *msg) { return UPB_READ_ONEOF(msg, const struct xds_core_v3_ResourceLocator*, UPB_SIZE(0, 0), UPB_SIZE(4, 8), 1, NULL); } +UPB_INLINE bool xds_core_v3_CollectionEntry_has_inline_entry(const xds_core_v3_CollectionEntry *msg) { return _upb_getoneofcase(msg, UPB_SIZE(4, 8)) == 2; } +UPB_INLINE const xds_core_v3_CollectionEntry_InlineEntry* xds_core_v3_CollectionEntry_inline_entry(const xds_core_v3_CollectionEntry *msg) { return UPB_READ_ONEOF(msg, const xds_core_v3_CollectionEntry_InlineEntry*, UPB_SIZE(0, 0), UPB_SIZE(4, 8), 2, NULL); } + +UPB_INLINE void xds_core_v3_CollectionEntry_set_locator(xds_core_v3_CollectionEntry *msg, struct xds_core_v3_ResourceLocator* value) { + UPB_WRITE_ONEOF(msg, struct xds_core_v3_ResourceLocator*, UPB_SIZE(0, 0), value, UPB_SIZE(4, 8), 1); +} +UPB_INLINE struct xds_core_v3_ResourceLocator* xds_core_v3_CollectionEntry_mutable_locator(xds_core_v3_CollectionEntry *msg, upb_arena *arena) { + struct xds_core_v3_ResourceLocator* sub = (struct xds_core_v3_ResourceLocator*)xds_core_v3_CollectionEntry_locator(msg); + if (sub == NULL) { + sub = (struct xds_core_v3_ResourceLocator*)_upb_msg_new(&xds_core_v3_ResourceLocator_msginit, arena); + if (!sub) return NULL; + xds_core_v3_CollectionEntry_set_locator(msg, sub); + } + return sub; +} +UPB_INLINE void xds_core_v3_CollectionEntry_set_inline_entry(xds_core_v3_CollectionEntry *msg, xds_core_v3_CollectionEntry_InlineEntry* value) { + UPB_WRITE_ONEOF(msg, xds_core_v3_CollectionEntry_InlineEntry*, UPB_SIZE(0, 0), value, UPB_SIZE(4, 8), 2); +} +UPB_INLINE struct xds_core_v3_CollectionEntry_InlineEntry* xds_core_v3_CollectionEntry_mutable_inline_entry(xds_core_v3_CollectionEntry *msg, upb_arena *arena) { + struct xds_core_v3_CollectionEntry_InlineEntry* sub = (struct xds_core_v3_CollectionEntry_InlineEntry*)xds_core_v3_CollectionEntry_inline_entry(msg); + if (sub == NULL) { + sub = (struct xds_core_v3_CollectionEntry_InlineEntry*)_upb_msg_new(&xds_core_v3_CollectionEntry_InlineEntry_msginit, arena); + if (!sub) return NULL; + xds_core_v3_CollectionEntry_set_inline_entry(msg, sub); + } + return sub; +} + +/* xds.core.v3.CollectionEntry.InlineEntry */ + +UPB_INLINE xds_core_v3_CollectionEntry_InlineEntry *xds_core_v3_CollectionEntry_InlineEntry_new(upb_arena *arena) { + return (xds_core_v3_CollectionEntry_InlineEntry *)_upb_msg_new(&xds_core_v3_CollectionEntry_InlineEntry_msginit, arena); +} +UPB_INLINE xds_core_v3_CollectionEntry_InlineEntry *xds_core_v3_CollectionEntry_InlineEntry_parse(const char *buf, size_t size, + upb_arena *arena) { + xds_core_v3_CollectionEntry_InlineEntry *ret = xds_core_v3_CollectionEntry_InlineEntry_new(arena); + return (ret && upb_decode(buf, size, ret, &xds_core_v3_CollectionEntry_InlineEntry_msginit, arena)) ? ret : NULL; +} +UPB_INLINE xds_core_v3_CollectionEntry_InlineEntry *xds_core_v3_CollectionEntry_InlineEntry_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + xds_core_v3_CollectionEntry_InlineEntry *ret = xds_core_v3_CollectionEntry_InlineEntry_new(arena); + return (ret && _upb_decode(buf, size, ret, &xds_core_v3_CollectionEntry_InlineEntry_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *xds_core_v3_CollectionEntry_InlineEntry_serialize(const xds_core_v3_CollectionEntry_InlineEntry *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &xds_core_v3_CollectionEntry_InlineEntry_msginit, arena, len); +} + +UPB_INLINE upb_strview xds_core_v3_CollectionEntry_InlineEntry_name(const xds_core_v3_CollectionEntry_InlineEntry *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview); } +UPB_INLINE upb_strview xds_core_v3_CollectionEntry_InlineEntry_version(const xds_core_v3_CollectionEntry_InlineEntry *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(12, 24), upb_strview); } +UPB_INLINE bool xds_core_v3_CollectionEntry_InlineEntry_has_resource(const xds_core_v3_CollectionEntry_InlineEntry *msg) { return _upb_hasbit(msg, 1); } +UPB_INLINE const struct google_protobuf_Any* xds_core_v3_CollectionEntry_InlineEntry_resource(const xds_core_v3_CollectionEntry_InlineEntry *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(20, 40), const struct google_protobuf_Any*); } + +UPB_INLINE void xds_core_v3_CollectionEntry_InlineEntry_set_name(xds_core_v3_CollectionEntry_InlineEntry *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview) = value; +} +UPB_INLINE void xds_core_v3_CollectionEntry_InlineEntry_set_version(xds_core_v3_CollectionEntry_InlineEntry *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(12, 24), upb_strview) = value; +} +UPB_INLINE void xds_core_v3_CollectionEntry_InlineEntry_set_resource(xds_core_v3_CollectionEntry_InlineEntry *msg, struct google_protobuf_Any* value) { + _upb_sethas(msg, 1); + *UPB_PTR_AT(msg, UPB_SIZE(20, 40), struct google_protobuf_Any*) = value; +} +UPB_INLINE struct google_protobuf_Any* xds_core_v3_CollectionEntry_InlineEntry_mutable_resource(xds_core_v3_CollectionEntry_InlineEntry *msg, upb_arena *arena) { + struct google_protobuf_Any* sub = (struct google_protobuf_Any*)xds_core_v3_CollectionEntry_InlineEntry_resource(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Any*)_upb_msg_new(&google_protobuf_Any_msginit, arena); + if (!sub) return NULL; + xds_core_v3_CollectionEntry_InlineEntry_set_resource(msg, sub); + } + return sub; +} + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#include "upb/port_undef.inc" + +#endif /* XDS_CORE_V3_COLLECTION_ENTRY_PROTO_UPB_H_ */ diff --git a/grpc/src/core/ext/upb-generated/xds/core/v3/context_params.upb.c b/grpc/src/core/ext/upb-generated/xds/core/v3/context_params.upb.c new file mode 100644 index 00000000..17c3c61c --- /dev/null +++ b/grpc/src/core/ext/upb-generated/xds/core/v3/context_params.upb.c @@ -0,0 +1,42 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * xds/core/v3/context_params.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#include <stddef.h> +#include "upb/msg.h" +#include "xds/core/v3/context_params.upb.h" +#include "udpa/annotations/status.upb.h" + +#include "upb/port_def.inc" + +static const upb_msglayout *const xds_core_v3_ContextParams_submsgs[1] = { + &xds_core_v3_ContextParams_ParamsEntry_msginit, +}; + +static const upb_msglayout_field xds_core_v3_ContextParams__fields[1] = { + {1, UPB_SIZE(0, 0), 0, 0, 11, _UPB_LABEL_MAP}, +}; + +const upb_msglayout xds_core_v3_ContextParams_msginit = { + &xds_core_v3_ContextParams_submsgs[0], + &xds_core_v3_ContextParams__fields[0], + UPB_SIZE(8, 8), 1, false, 255, +}; + +static const upb_msglayout_field xds_core_v3_ContextParams_ParamsEntry__fields[2] = { + {1, UPB_SIZE(0, 0), 0, 0, 9, 1}, + {2, UPB_SIZE(8, 16), 0, 0, 9, 1}, +}; + +const upb_msglayout xds_core_v3_ContextParams_ParamsEntry_msginit = { + NULL, + &xds_core_v3_ContextParams_ParamsEntry__fields[0], + UPB_SIZE(16, 32), 2, false, 255, +}; + +#include "upb/port_undef.inc" + diff --git a/grpc/src/core/ext/upb-generated/xds/core/v3/context_params.upb.h b/grpc/src/core/ext/upb-generated/xds/core/v3/context_params.upb.h new file mode 100644 index 00000000..0bcd2425 --- /dev/null +++ b/grpc/src/core/ext/upb-generated/xds/core/v3/context_params.upb.h @@ -0,0 +1,84 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * xds/core/v3/context_params.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#ifndef XDS_CORE_V3_CONTEXT_PARAMS_PROTO_UPB_H_ +#define XDS_CORE_V3_CONTEXT_PARAMS_PROTO_UPB_H_ + +#include "upb/msg.h" +#include "upb/decode.h" +#include "upb/decode_fast.h" +#include "upb/encode.h" + +#include "upb/port_def.inc" + +#ifdef __cplusplus +extern "C" { +#endif + +struct xds_core_v3_ContextParams; +struct xds_core_v3_ContextParams_ParamsEntry; +typedef struct xds_core_v3_ContextParams xds_core_v3_ContextParams; +typedef struct xds_core_v3_ContextParams_ParamsEntry xds_core_v3_ContextParams_ParamsEntry; +extern const upb_msglayout xds_core_v3_ContextParams_msginit; +extern const upb_msglayout xds_core_v3_ContextParams_ParamsEntry_msginit; + + +/* xds.core.v3.ContextParams */ + +UPB_INLINE xds_core_v3_ContextParams *xds_core_v3_ContextParams_new(upb_arena *arena) { + return (xds_core_v3_ContextParams *)_upb_msg_new(&xds_core_v3_ContextParams_msginit, arena); +} +UPB_INLINE xds_core_v3_ContextParams *xds_core_v3_ContextParams_parse(const char *buf, size_t size, + upb_arena *arena) { + xds_core_v3_ContextParams *ret = xds_core_v3_ContextParams_new(arena); + return (ret && upb_decode(buf, size, ret, &xds_core_v3_ContextParams_msginit, arena)) ? ret : NULL; +} +UPB_INLINE xds_core_v3_ContextParams *xds_core_v3_ContextParams_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + xds_core_v3_ContextParams *ret = xds_core_v3_ContextParams_new(arena); + return (ret && _upb_decode(buf, size, ret, &xds_core_v3_ContextParams_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *xds_core_v3_ContextParams_serialize(const xds_core_v3_ContextParams *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &xds_core_v3_ContextParams_msginit, arena, len); +} + +UPB_INLINE bool xds_core_v3_ContextParams_has_params(const xds_core_v3_ContextParams *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(0, 0)); } +UPB_INLINE size_t xds_core_v3_ContextParams_params_size(const xds_core_v3_ContextParams *msg) {return _upb_msg_map_size(msg, UPB_SIZE(0, 0)); } +UPB_INLINE bool xds_core_v3_ContextParams_params_get(const xds_core_v3_ContextParams *msg, upb_strview key, upb_strview *val) { return _upb_msg_map_get(msg, UPB_SIZE(0, 0), &key, 0, val, 0); } +UPB_INLINE const xds_core_v3_ContextParams_ParamsEntry* xds_core_v3_ContextParams_params_next(const xds_core_v3_ContextParams *msg, size_t* iter) { return (const xds_core_v3_ContextParams_ParamsEntry*)_upb_msg_map_next(msg, UPB_SIZE(0, 0), iter); } + +UPB_INLINE void xds_core_v3_ContextParams_params_clear(xds_core_v3_ContextParams *msg) { _upb_msg_map_clear(msg, UPB_SIZE(0, 0)); } +UPB_INLINE bool xds_core_v3_ContextParams_params_set(xds_core_v3_ContextParams *msg, upb_strview key, upb_strview val, upb_arena *a) { return _upb_msg_map_set(msg, UPB_SIZE(0, 0), &key, 0, &val, 0, a); } +UPB_INLINE bool xds_core_v3_ContextParams_params_delete(xds_core_v3_ContextParams *msg, upb_strview key) { return _upb_msg_map_delete(msg, UPB_SIZE(0, 0), &key, 0); } +UPB_INLINE xds_core_v3_ContextParams_ParamsEntry* xds_core_v3_ContextParams_params_nextmutable(xds_core_v3_ContextParams *msg, size_t* iter) { return (xds_core_v3_ContextParams_ParamsEntry*)_upb_msg_map_next(msg, UPB_SIZE(0, 0), iter); } + +/* xds.core.v3.ContextParams.ParamsEntry */ + +UPB_INLINE upb_strview xds_core_v3_ContextParams_ParamsEntry_key(const xds_core_v3_ContextParams_ParamsEntry *msg) { + upb_strview ret; + _upb_msg_map_key(msg, &ret, 0); + return ret; +} +UPB_INLINE upb_strview xds_core_v3_ContextParams_ParamsEntry_value(const xds_core_v3_ContextParams_ParamsEntry *msg) { + upb_strview ret; + _upb_msg_map_value(msg, &ret, 0); + return ret; +} + +UPB_INLINE void xds_core_v3_ContextParams_ParamsEntry_set_value(xds_core_v3_ContextParams_ParamsEntry *msg, upb_strview value) { + _upb_msg_map_set_value(msg, &value, 0); +} + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#include "upb/port_undef.inc" + +#endif /* XDS_CORE_V3_CONTEXT_PARAMS_PROTO_UPB_H_ */ diff --git a/grpc/src/core/ext/upb-generated/udpa/core/v1/resource.upb.c b/grpc/src/core/ext/upb-generated/xds/core/v3/resource.upb.c index 86d2cf43..fa2375e9 100644 --- a/grpc/src/core/ext/upb-generated/udpa/core/v1/resource.upb.c +++ b/grpc/src/core/ext/upb-generated/xds/core/v3/resource.upb.c @@ -1,34 +1,34 @@ /* This file was generated by upbc (the upb compiler) from the input * file: * - * udpa/core/v1/resource.proto + * xds/core/v3/resource.proto * * Do not edit -- your changes will be discarded when the file is * regenerated. */ #include <stddef.h> #include "upb/msg.h" -#include "udpa/core/v1/resource.upb.h" +#include "xds/core/v3/resource.upb.h" #include "google/protobuf/any.upb.h" #include "udpa/annotations/status.upb.h" -#include "udpa/core/v1/resource_name.upb.h" +#include "xds/core/v3/resource_name.upb.h" #include "upb/port_def.inc" -static const upb_msglayout *const udpa_core_v1_Resource_submsgs[2] = { +static const upb_msglayout *const xds_core_v3_Resource_submsgs[2] = { &google_protobuf_Any_msginit, - &udpa_core_v1_ResourceName_msginit, + &xds_core_v3_ResourceName_msginit, }; -static const upb_msglayout_field udpa_core_v1_Resource__fields[3] = { +static const upb_msglayout_field xds_core_v3_Resource__fields[3] = { {1, UPB_SIZE(12, 24), 1, 1, 11, 1}, {2, UPB_SIZE(4, 8), 0, 0, 9, 1}, {3, UPB_SIZE(16, 32), 2, 0, 11, 1}, }; -const upb_msglayout udpa_core_v1_Resource_msginit = { - &udpa_core_v1_Resource_submsgs[0], - &udpa_core_v1_Resource__fields[0], +const upb_msglayout xds_core_v3_Resource_msginit = { + &xds_core_v3_Resource_submsgs[0], + &xds_core_v3_Resource__fields[0], UPB_SIZE(24, 48), 3, false, 255, }; diff --git a/grpc/src/core/ext/upb-generated/xds/core/v3/resource.upb.h b/grpc/src/core/ext/upb-generated/xds/core/v3/resource.upb.h new file mode 100644 index 00000000..ab8e2df4 --- /dev/null +++ b/grpc/src/core/ext/upb-generated/xds/core/v3/resource.upb.h @@ -0,0 +1,94 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * xds/core/v3/resource.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#ifndef XDS_CORE_V3_RESOURCE_PROTO_UPB_H_ +#define XDS_CORE_V3_RESOURCE_PROTO_UPB_H_ + +#include "upb/msg.h" +#include "upb/decode.h" +#include "upb/decode_fast.h" +#include "upb/encode.h" + +#include "upb/port_def.inc" + +#ifdef __cplusplus +extern "C" { +#endif + +struct xds_core_v3_Resource; +typedef struct xds_core_v3_Resource xds_core_v3_Resource; +extern const upb_msglayout xds_core_v3_Resource_msginit; +struct google_protobuf_Any; +struct xds_core_v3_ResourceName; +extern const upb_msglayout google_protobuf_Any_msginit; +extern const upb_msglayout xds_core_v3_ResourceName_msginit; + + +/* xds.core.v3.Resource */ + +UPB_INLINE xds_core_v3_Resource *xds_core_v3_Resource_new(upb_arena *arena) { + return (xds_core_v3_Resource *)_upb_msg_new(&xds_core_v3_Resource_msginit, arena); +} +UPB_INLINE xds_core_v3_Resource *xds_core_v3_Resource_parse(const char *buf, size_t size, + upb_arena *arena) { + xds_core_v3_Resource *ret = xds_core_v3_Resource_new(arena); + return (ret && upb_decode(buf, size, ret, &xds_core_v3_Resource_msginit, arena)) ? ret : NULL; +} +UPB_INLINE xds_core_v3_Resource *xds_core_v3_Resource_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + xds_core_v3_Resource *ret = xds_core_v3_Resource_new(arena); + return (ret && _upb_decode(buf, size, ret, &xds_core_v3_Resource_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *xds_core_v3_Resource_serialize(const xds_core_v3_Resource *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &xds_core_v3_Resource_msginit, arena, len); +} + +UPB_INLINE bool xds_core_v3_Resource_has_name(const xds_core_v3_Resource *msg) { return _upb_hasbit(msg, 1); } +UPB_INLINE const struct xds_core_v3_ResourceName* xds_core_v3_Resource_name(const xds_core_v3_Resource *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(12, 24), const struct xds_core_v3_ResourceName*); } +UPB_INLINE upb_strview xds_core_v3_Resource_version(const xds_core_v3_Resource *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview); } +UPB_INLINE bool xds_core_v3_Resource_has_resource(const xds_core_v3_Resource *msg) { return _upb_hasbit(msg, 2); } +UPB_INLINE const struct google_protobuf_Any* xds_core_v3_Resource_resource(const xds_core_v3_Resource *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(16, 32), const struct google_protobuf_Any*); } + +UPB_INLINE void xds_core_v3_Resource_set_name(xds_core_v3_Resource *msg, struct xds_core_v3_ResourceName* value) { + _upb_sethas(msg, 1); + *UPB_PTR_AT(msg, UPB_SIZE(12, 24), struct xds_core_v3_ResourceName*) = value; +} +UPB_INLINE struct xds_core_v3_ResourceName* xds_core_v3_Resource_mutable_name(xds_core_v3_Resource *msg, upb_arena *arena) { + struct xds_core_v3_ResourceName* sub = (struct xds_core_v3_ResourceName*)xds_core_v3_Resource_name(msg); + if (sub == NULL) { + sub = (struct xds_core_v3_ResourceName*)_upb_msg_new(&xds_core_v3_ResourceName_msginit, arena); + if (!sub) return NULL; + xds_core_v3_Resource_set_name(msg, sub); + } + return sub; +} +UPB_INLINE void xds_core_v3_Resource_set_version(xds_core_v3_Resource *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview) = value; +} +UPB_INLINE void xds_core_v3_Resource_set_resource(xds_core_v3_Resource *msg, struct google_protobuf_Any* value) { + _upb_sethas(msg, 2); + *UPB_PTR_AT(msg, UPB_SIZE(16, 32), struct google_protobuf_Any*) = value; +} +UPB_INLINE struct google_protobuf_Any* xds_core_v3_Resource_mutable_resource(xds_core_v3_Resource *msg, upb_arena *arena) { + struct google_protobuf_Any* sub = (struct google_protobuf_Any*)xds_core_v3_Resource_resource(msg); + if (sub == NULL) { + sub = (struct google_protobuf_Any*)_upb_msg_new(&google_protobuf_Any_msginit, arena); + if (!sub) return NULL; + xds_core_v3_Resource_set_resource(msg, sub); + } + return sub; +} + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#include "upb/port_undef.inc" + +#endif /* XDS_CORE_V3_RESOURCE_PROTO_UPB_H_ */ diff --git a/grpc/src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.c b/grpc/src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.c new file mode 100644 index 00000000..2bd099a5 --- /dev/null +++ b/grpc/src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.c @@ -0,0 +1,54 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * xds/core/v3/resource_locator.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#include <stddef.h> +#include "upb/msg.h" +#include "xds/core/v3/resource_locator.upb.h" +#include "udpa/annotations/status.upb.h" +#include "xds/core/v3/context_params.upb.h" +#include "validate/validate.upb.h" + +#include "upb/port_def.inc" + +static const upb_msglayout *const xds_core_v3_ResourceLocator_submsgs[2] = { + &xds_core_v3_ContextParams_msginit, + &xds_core_v3_ResourceLocator_Directive_msginit, +}; + +static const upb_msglayout_field xds_core_v3_ResourceLocator__fields[6] = { + {1, UPB_SIZE(0, 0), 0, 0, 14, 1}, + {2, UPB_SIZE(4, 8), 0, 0, 9, 1}, + {3, UPB_SIZE(12, 24), 0, 0, 9, 1}, + {4, UPB_SIZE(20, 40), 0, 0, 9, 1}, + {5, UPB_SIZE(32, 64), UPB_SIZE(-37, -73), 0, 11, 1}, + {6, UPB_SIZE(28, 56), 0, 1, 11, 3}, +}; + +const upb_msglayout xds_core_v3_ResourceLocator_msginit = { + &xds_core_v3_ResourceLocator_submsgs[0], + &xds_core_v3_ResourceLocator__fields[0], + UPB_SIZE(40, 80), 6, false, 255, +}; + +static const upb_msglayout *const xds_core_v3_ResourceLocator_Directive_submsgs[1] = { + &xds_core_v3_ResourceLocator_msginit, +}; + +static const upb_msglayout_field xds_core_v3_ResourceLocator_Directive__fields[2] = { + {1, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 11, 1}, + {2, UPB_SIZE(0, 0), UPB_SIZE(-9, -17), 0, 9, 1}, +}; + +const upb_msglayout xds_core_v3_ResourceLocator_Directive_msginit = { + &xds_core_v3_ResourceLocator_Directive_submsgs[0], + &xds_core_v3_ResourceLocator_Directive__fields[0], + UPB_SIZE(16, 32), 2, false, 255, +}; + +#include "upb/port_undef.inc" + diff --git a/grpc/src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.h b/grpc/src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.h new file mode 100644 index 00000000..da7442bd --- /dev/null +++ b/grpc/src/core/ext/upb-generated/xds/core/v3/resource_locator.upb.h @@ -0,0 +1,166 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * xds/core/v3/resource_locator.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#ifndef XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPB_H_ +#define XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPB_H_ + +#include "upb/msg.h" +#include "upb/decode.h" +#include "upb/decode_fast.h" +#include "upb/encode.h" + +#include "upb/port_def.inc" + +#ifdef __cplusplus +extern "C" { +#endif + +struct xds_core_v3_ResourceLocator; +struct xds_core_v3_ResourceLocator_Directive; +typedef struct xds_core_v3_ResourceLocator xds_core_v3_ResourceLocator; +typedef struct xds_core_v3_ResourceLocator_Directive xds_core_v3_ResourceLocator_Directive; +extern const upb_msglayout xds_core_v3_ResourceLocator_msginit; +extern const upb_msglayout xds_core_v3_ResourceLocator_Directive_msginit; +struct xds_core_v3_ContextParams; +extern const upb_msglayout xds_core_v3_ContextParams_msginit; + +typedef enum { + xds_core_v3_ResourceLocator_XDSTP = 0, + xds_core_v3_ResourceLocator_HTTP = 1, + xds_core_v3_ResourceLocator_FILE = 2 +} xds_core_v3_ResourceLocator_Scheme; + + +/* xds.core.v3.ResourceLocator */ + +UPB_INLINE xds_core_v3_ResourceLocator *xds_core_v3_ResourceLocator_new(upb_arena *arena) { + return (xds_core_v3_ResourceLocator *)_upb_msg_new(&xds_core_v3_ResourceLocator_msginit, arena); +} +UPB_INLINE xds_core_v3_ResourceLocator *xds_core_v3_ResourceLocator_parse(const char *buf, size_t size, + upb_arena *arena) { + xds_core_v3_ResourceLocator *ret = xds_core_v3_ResourceLocator_new(arena); + return (ret && upb_decode(buf, size, ret, &xds_core_v3_ResourceLocator_msginit, arena)) ? ret : NULL; +} +UPB_INLINE xds_core_v3_ResourceLocator *xds_core_v3_ResourceLocator_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + xds_core_v3_ResourceLocator *ret = xds_core_v3_ResourceLocator_new(arena); + return (ret && _upb_decode(buf, size, ret, &xds_core_v3_ResourceLocator_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *xds_core_v3_ResourceLocator_serialize(const xds_core_v3_ResourceLocator *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &xds_core_v3_ResourceLocator_msginit, arena, len); +} + +typedef enum { + xds_core_v3_ResourceLocator_context_param_specifier_exact_context = 5, + xds_core_v3_ResourceLocator_context_param_specifier_NOT_SET = 0 +} xds_core_v3_ResourceLocator_context_param_specifier_oneofcases; +UPB_INLINE xds_core_v3_ResourceLocator_context_param_specifier_oneofcases xds_core_v3_ResourceLocator_context_param_specifier_case(const xds_core_v3_ResourceLocator* msg) { return (xds_core_v3_ResourceLocator_context_param_specifier_oneofcases)*UPB_PTR_AT(msg, UPB_SIZE(36, 72), int32_t); } + +UPB_INLINE int32_t xds_core_v3_ResourceLocator_scheme(const xds_core_v3_ResourceLocator *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(0, 0), int32_t); } +UPB_INLINE upb_strview xds_core_v3_ResourceLocator_id(const xds_core_v3_ResourceLocator *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview); } +UPB_INLINE upb_strview xds_core_v3_ResourceLocator_authority(const xds_core_v3_ResourceLocator *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(12, 24), upb_strview); } +UPB_INLINE upb_strview xds_core_v3_ResourceLocator_resource_type(const xds_core_v3_ResourceLocator *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(20, 40), upb_strview); } +UPB_INLINE bool xds_core_v3_ResourceLocator_has_exact_context(const xds_core_v3_ResourceLocator *msg) { return _upb_getoneofcase(msg, UPB_SIZE(36, 72)) == 5; } +UPB_INLINE const struct xds_core_v3_ContextParams* xds_core_v3_ResourceLocator_exact_context(const xds_core_v3_ResourceLocator *msg) { return UPB_READ_ONEOF(msg, const struct xds_core_v3_ContextParams*, UPB_SIZE(32, 64), UPB_SIZE(36, 72), 5, NULL); } +UPB_INLINE bool xds_core_v3_ResourceLocator_has_directives(const xds_core_v3_ResourceLocator *msg) { return _upb_has_submsg_nohasbit(msg, UPB_SIZE(28, 56)); } +UPB_INLINE const xds_core_v3_ResourceLocator_Directive* const* xds_core_v3_ResourceLocator_directives(const xds_core_v3_ResourceLocator *msg, size_t *len) { return (const xds_core_v3_ResourceLocator_Directive* const*)_upb_array_accessor(msg, UPB_SIZE(28, 56), len); } + +UPB_INLINE void xds_core_v3_ResourceLocator_set_scheme(xds_core_v3_ResourceLocator *msg, int32_t value) { + *UPB_PTR_AT(msg, UPB_SIZE(0, 0), int32_t) = value; +} +UPB_INLINE void xds_core_v3_ResourceLocator_set_id(xds_core_v3_ResourceLocator *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview) = value; +} +UPB_INLINE void xds_core_v3_ResourceLocator_set_authority(xds_core_v3_ResourceLocator *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(12, 24), upb_strview) = value; +} +UPB_INLINE void xds_core_v3_ResourceLocator_set_resource_type(xds_core_v3_ResourceLocator *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(20, 40), upb_strview) = value; +} +UPB_INLINE void xds_core_v3_ResourceLocator_set_exact_context(xds_core_v3_ResourceLocator *msg, struct xds_core_v3_ContextParams* value) { + UPB_WRITE_ONEOF(msg, struct xds_core_v3_ContextParams*, UPB_SIZE(32, 64), value, UPB_SIZE(36, 72), 5); +} +UPB_INLINE struct xds_core_v3_ContextParams* xds_core_v3_ResourceLocator_mutable_exact_context(xds_core_v3_ResourceLocator *msg, upb_arena *arena) { + struct xds_core_v3_ContextParams* sub = (struct xds_core_v3_ContextParams*)xds_core_v3_ResourceLocator_exact_context(msg); + if (sub == NULL) { + sub = (struct xds_core_v3_ContextParams*)_upb_msg_new(&xds_core_v3_ContextParams_msginit, arena); + if (!sub) return NULL; + xds_core_v3_ResourceLocator_set_exact_context(msg, sub); + } + return sub; +} +UPB_INLINE xds_core_v3_ResourceLocator_Directive** xds_core_v3_ResourceLocator_mutable_directives(xds_core_v3_ResourceLocator *msg, size_t *len) { + return (xds_core_v3_ResourceLocator_Directive**)_upb_array_mutable_accessor(msg, UPB_SIZE(28, 56), len); +} +UPB_INLINE xds_core_v3_ResourceLocator_Directive** xds_core_v3_ResourceLocator_resize_directives(xds_core_v3_ResourceLocator *msg, size_t len, upb_arena *arena) { + return (xds_core_v3_ResourceLocator_Directive**)_upb_array_resize_accessor2(msg, UPB_SIZE(28, 56), len, UPB_SIZE(2, 3), arena); +} +UPB_INLINE struct xds_core_v3_ResourceLocator_Directive* xds_core_v3_ResourceLocator_add_directives(xds_core_v3_ResourceLocator *msg, upb_arena *arena) { + struct xds_core_v3_ResourceLocator_Directive* sub = (struct xds_core_v3_ResourceLocator_Directive*)_upb_msg_new(&xds_core_v3_ResourceLocator_Directive_msginit, arena); + bool ok = _upb_array_append_accessor2( + msg, UPB_SIZE(28, 56), UPB_SIZE(2, 3), &sub, arena); + if (!ok) return NULL; + return sub; +} + +/* xds.core.v3.ResourceLocator.Directive */ + +UPB_INLINE xds_core_v3_ResourceLocator_Directive *xds_core_v3_ResourceLocator_Directive_new(upb_arena *arena) { + return (xds_core_v3_ResourceLocator_Directive *)_upb_msg_new(&xds_core_v3_ResourceLocator_Directive_msginit, arena); +} +UPB_INLINE xds_core_v3_ResourceLocator_Directive *xds_core_v3_ResourceLocator_Directive_parse(const char *buf, size_t size, + upb_arena *arena) { + xds_core_v3_ResourceLocator_Directive *ret = xds_core_v3_ResourceLocator_Directive_new(arena); + return (ret && upb_decode(buf, size, ret, &xds_core_v3_ResourceLocator_Directive_msginit, arena)) ? ret : NULL; +} +UPB_INLINE xds_core_v3_ResourceLocator_Directive *xds_core_v3_ResourceLocator_Directive_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + xds_core_v3_ResourceLocator_Directive *ret = xds_core_v3_ResourceLocator_Directive_new(arena); + return (ret && _upb_decode(buf, size, ret, &xds_core_v3_ResourceLocator_Directive_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *xds_core_v3_ResourceLocator_Directive_serialize(const xds_core_v3_ResourceLocator_Directive *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &xds_core_v3_ResourceLocator_Directive_msginit, arena, len); +} + +typedef enum { + xds_core_v3_ResourceLocator_Directive_directive_alt = 1, + xds_core_v3_ResourceLocator_Directive_directive_entry = 2, + xds_core_v3_ResourceLocator_Directive_directive_NOT_SET = 0 +} xds_core_v3_ResourceLocator_Directive_directive_oneofcases; +UPB_INLINE xds_core_v3_ResourceLocator_Directive_directive_oneofcases xds_core_v3_ResourceLocator_Directive_directive_case(const xds_core_v3_ResourceLocator_Directive* msg) { return (xds_core_v3_ResourceLocator_Directive_directive_oneofcases)*UPB_PTR_AT(msg, UPB_SIZE(8, 16), int32_t); } + +UPB_INLINE bool xds_core_v3_ResourceLocator_Directive_has_alt(const xds_core_v3_ResourceLocator_Directive *msg) { return _upb_getoneofcase(msg, UPB_SIZE(8, 16)) == 1; } +UPB_INLINE const xds_core_v3_ResourceLocator* xds_core_v3_ResourceLocator_Directive_alt(const xds_core_v3_ResourceLocator_Directive *msg) { return UPB_READ_ONEOF(msg, const xds_core_v3_ResourceLocator*, UPB_SIZE(0, 0), UPB_SIZE(8, 16), 1, NULL); } +UPB_INLINE bool xds_core_v3_ResourceLocator_Directive_has_entry(const xds_core_v3_ResourceLocator_Directive *msg) { return _upb_getoneofcase(msg, UPB_SIZE(8, 16)) == 2; } +UPB_INLINE upb_strview xds_core_v3_ResourceLocator_Directive_entry(const xds_core_v3_ResourceLocator_Directive *msg) { return UPB_READ_ONEOF(msg, upb_strview, UPB_SIZE(0, 0), UPB_SIZE(8, 16), 2, upb_strview_make("", strlen(""))); } + +UPB_INLINE void xds_core_v3_ResourceLocator_Directive_set_alt(xds_core_v3_ResourceLocator_Directive *msg, xds_core_v3_ResourceLocator* value) { + UPB_WRITE_ONEOF(msg, xds_core_v3_ResourceLocator*, UPB_SIZE(0, 0), value, UPB_SIZE(8, 16), 1); +} +UPB_INLINE struct xds_core_v3_ResourceLocator* xds_core_v3_ResourceLocator_Directive_mutable_alt(xds_core_v3_ResourceLocator_Directive *msg, upb_arena *arena) { + struct xds_core_v3_ResourceLocator* sub = (struct xds_core_v3_ResourceLocator*)xds_core_v3_ResourceLocator_Directive_alt(msg); + if (sub == NULL) { + sub = (struct xds_core_v3_ResourceLocator*)_upb_msg_new(&xds_core_v3_ResourceLocator_msginit, arena); + if (!sub) return NULL; + xds_core_v3_ResourceLocator_Directive_set_alt(msg, sub); + } + return sub; +} +UPB_INLINE void xds_core_v3_ResourceLocator_Directive_set_entry(xds_core_v3_ResourceLocator_Directive *msg, upb_strview value) { + UPB_WRITE_ONEOF(msg, upb_strview, UPB_SIZE(0, 0), value, UPB_SIZE(8, 16), 2); +} + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#include "upb/port_undef.inc" + +#endif /* XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPB_H_ */ diff --git a/grpc/src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c b/grpc/src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c new file mode 100644 index 00000000..ff645f68 --- /dev/null +++ b/grpc/src/core/ext/upb-generated/xds/core/v3/resource_name.upb.c @@ -0,0 +1,36 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * xds/core/v3/resource_name.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#include <stddef.h> +#include "upb/msg.h" +#include "xds/core/v3/resource_name.upb.h" +#include "udpa/annotations/status.upb.h" +#include "xds/core/v3/context_params.upb.h" +#include "validate/validate.upb.h" + +#include "upb/port_def.inc" + +static const upb_msglayout *const xds_core_v3_ResourceName_submsgs[1] = { + &xds_core_v3_ContextParams_msginit, +}; + +static const upb_msglayout_field xds_core_v3_ResourceName__fields[4] = { + {1, UPB_SIZE(4, 8), 0, 0, 9, 1}, + {2, UPB_SIZE(12, 24), 0, 0, 9, 1}, + {3, UPB_SIZE(20, 40), 0, 0, 9, 1}, + {4, UPB_SIZE(28, 56), 1, 0, 11, 1}, +}; + +const upb_msglayout xds_core_v3_ResourceName_msginit = { + &xds_core_v3_ResourceName_submsgs[0], + &xds_core_v3_ResourceName__fields[0], + UPB_SIZE(32, 64), 4, false, 255, +}; + +#include "upb/port_undef.inc" + diff --git a/grpc/src/core/ext/upb-generated/xds/core/v3/resource_name.upb.h b/grpc/src/core/ext/upb-generated/xds/core/v3/resource_name.upb.h new file mode 100644 index 00000000..3f38cc51 --- /dev/null +++ b/grpc/src/core/ext/upb-generated/xds/core/v3/resource_name.upb.h @@ -0,0 +1,85 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * xds/core/v3/resource_name.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#ifndef XDS_CORE_V3_RESOURCE_NAME_PROTO_UPB_H_ +#define XDS_CORE_V3_RESOURCE_NAME_PROTO_UPB_H_ + +#include "upb/msg.h" +#include "upb/decode.h" +#include "upb/decode_fast.h" +#include "upb/encode.h" + +#include "upb/port_def.inc" + +#ifdef __cplusplus +extern "C" { +#endif + +struct xds_core_v3_ResourceName; +typedef struct xds_core_v3_ResourceName xds_core_v3_ResourceName; +extern const upb_msglayout xds_core_v3_ResourceName_msginit; +struct xds_core_v3_ContextParams; +extern const upb_msglayout xds_core_v3_ContextParams_msginit; + + +/* xds.core.v3.ResourceName */ + +UPB_INLINE xds_core_v3_ResourceName *xds_core_v3_ResourceName_new(upb_arena *arena) { + return (xds_core_v3_ResourceName *)_upb_msg_new(&xds_core_v3_ResourceName_msginit, arena); +} +UPB_INLINE xds_core_v3_ResourceName *xds_core_v3_ResourceName_parse(const char *buf, size_t size, + upb_arena *arena) { + xds_core_v3_ResourceName *ret = xds_core_v3_ResourceName_new(arena); + return (ret && upb_decode(buf, size, ret, &xds_core_v3_ResourceName_msginit, arena)) ? ret : NULL; +} +UPB_INLINE xds_core_v3_ResourceName *xds_core_v3_ResourceName_parse_ex(const char *buf, size_t size, + upb_arena *arena, int options) { + xds_core_v3_ResourceName *ret = xds_core_v3_ResourceName_new(arena); + return (ret && _upb_decode(buf, size, ret, &xds_core_v3_ResourceName_msginit, arena, options)) + ? ret : NULL; +} +UPB_INLINE char *xds_core_v3_ResourceName_serialize(const xds_core_v3_ResourceName *msg, upb_arena *arena, size_t *len) { + return upb_encode(msg, &xds_core_v3_ResourceName_msginit, arena, len); +} + +UPB_INLINE upb_strview xds_core_v3_ResourceName_id(const xds_core_v3_ResourceName *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview); } +UPB_INLINE upb_strview xds_core_v3_ResourceName_authority(const xds_core_v3_ResourceName *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(12, 24), upb_strview); } +UPB_INLINE upb_strview xds_core_v3_ResourceName_resource_type(const xds_core_v3_ResourceName *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(20, 40), upb_strview); } +UPB_INLINE bool xds_core_v3_ResourceName_has_context(const xds_core_v3_ResourceName *msg) { return _upb_hasbit(msg, 1); } +UPB_INLINE const struct xds_core_v3_ContextParams* xds_core_v3_ResourceName_context(const xds_core_v3_ResourceName *msg) { return *UPB_PTR_AT(msg, UPB_SIZE(28, 56), const struct xds_core_v3_ContextParams*); } + +UPB_INLINE void xds_core_v3_ResourceName_set_id(xds_core_v3_ResourceName *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_strview) = value; +} +UPB_INLINE void xds_core_v3_ResourceName_set_authority(xds_core_v3_ResourceName *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(12, 24), upb_strview) = value; +} +UPB_INLINE void xds_core_v3_ResourceName_set_resource_type(xds_core_v3_ResourceName *msg, upb_strview value) { + *UPB_PTR_AT(msg, UPB_SIZE(20, 40), upb_strview) = value; +} +UPB_INLINE void xds_core_v3_ResourceName_set_context(xds_core_v3_ResourceName *msg, struct xds_core_v3_ContextParams* value) { + _upb_sethas(msg, 1); + *UPB_PTR_AT(msg, UPB_SIZE(28, 56), struct xds_core_v3_ContextParams*) = value; +} +UPB_INLINE struct xds_core_v3_ContextParams* xds_core_v3_ResourceName_mutable_context(xds_core_v3_ResourceName *msg, upb_arena *arena) { + struct xds_core_v3_ContextParams* sub = (struct xds_core_v3_ContextParams*)xds_core_v3_ResourceName_context(msg); + if (sub == NULL) { + sub = (struct xds_core_v3_ContextParams*)_upb_msg_new(&xds_core_v3_ContextParams_msginit, arena); + if (!sub) return NULL; + xds_core_v3_ResourceName_set_context(msg, sub); + } + return sub; +} + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#include "upb/port_undef.inc" + +#endif /* XDS_CORE_V3_RESOURCE_NAME_PROTO_UPB_H_ */ diff --git a/grpc/src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump.upbdefs.c b/grpc/src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump.upbdefs.c new file mode 100644 index 00000000..8418d1e9 --- /dev/null +++ b/grpc/src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump.upbdefs.c @@ -0,0 +1,354 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * envoy/admin/v3/config_dump.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#include "upb/def.h" +#include "envoy/admin/v3/config_dump.upbdefs.h" + +extern upb_def_init envoy_config_bootstrap_v3_bootstrap_proto_upbdefinit; +extern upb_def_init google_protobuf_any_proto_upbdefinit; +extern upb_def_init google_protobuf_timestamp_proto_upbdefinit; +extern upb_def_init udpa_annotations_status_proto_upbdefinit; +extern upb_def_init udpa_annotations_versioning_proto_upbdefinit; +extern const upb_msglayout envoy_admin_v3_ConfigDump_msginit; +extern const upb_msglayout envoy_admin_v3_UpdateFailureState_msginit; +extern const upb_msglayout envoy_admin_v3_BootstrapConfigDump_msginit; +extern const upb_msglayout envoy_admin_v3_ListenersConfigDump_msginit; +extern const upb_msglayout envoy_admin_v3_ListenersConfigDump_StaticListener_msginit; +extern const upb_msglayout envoy_admin_v3_ListenersConfigDump_DynamicListenerState_msginit; +extern const upb_msglayout envoy_admin_v3_ListenersConfigDump_DynamicListener_msginit; +extern const upb_msglayout envoy_admin_v3_ClustersConfigDump_msginit; +extern const upb_msglayout envoy_admin_v3_ClustersConfigDump_StaticCluster_msginit; +extern const upb_msglayout envoy_admin_v3_ClustersConfigDump_DynamicCluster_msginit; +extern const upb_msglayout envoy_admin_v3_RoutesConfigDump_msginit; +extern const upb_msglayout envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_msginit; +extern const upb_msglayout envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_msginit; +extern const upb_msglayout envoy_admin_v3_ScopedRoutesConfigDump_msginit; +extern const upb_msglayout envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_msginit; +extern const upb_msglayout envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_msginit; +extern const upb_msglayout envoy_admin_v3_SecretsConfigDump_msginit; +extern const upb_msglayout envoy_admin_v3_SecretsConfigDump_DynamicSecret_msginit; +extern const upb_msglayout envoy_admin_v3_SecretsConfigDump_StaticSecret_msginit; +extern const upb_msglayout envoy_admin_v3_EndpointsConfigDump_msginit; +extern const upb_msglayout envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_msginit; +extern const upb_msglayout envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_msginit; + +static const upb_msglayout *layouts[22] = { + &envoy_admin_v3_ConfigDump_msginit, + &envoy_admin_v3_UpdateFailureState_msginit, + &envoy_admin_v3_BootstrapConfigDump_msginit, + &envoy_admin_v3_ListenersConfigDump_msginit, + &envoy_admin_v3_ListenersConfigDump_StaticListener_msginit, + &envoy_admin_v3_ListenersConfigDump_DynamicListenerState_msginit, + &envoy_admin_v3_ListenersConfigDump_DynamicListener_msginit, + &envoy_admin_v3_ClustersConfigDump_msginit, + &envoy_admin_v3_ClustersConfigDump_StaticCluster_msginit, + &envoy_admin_v3_ClustersConfigDump_DynamicCluster_msginit, + &envoy_admin_v3_RoutesConfigDump_msginit, + &envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_msginit, + &envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_msginit, + &envoy_admin_v3_ScopedRoutesConfigDump_msginit, + &envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_msginit, + &envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_msginit, + &envoy_admin_v3_SecretsConfigDump_msginit, + &envoy_admin_v3_SecretsConfigDump_DynamicSecret_msginit, + &envoy_admin_v3_SecretsConfigDump_StaticSecret_msginit, + &envoy_admin_v3_EndpointsConfigDump_msginit, + &envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_msginit, + &envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_msginit, +}; + +static const char descriptor[6802] = {'\n', ' ', 'e', 'n', 'v', 'o', 'y', '/', 'a', 'd', 'm', 'i', 'n', '/', 'v', '3', '/', 'c', 'o', 'n', 'f', 'i', 'g', '_', 'd', +'u', 'm', 'p', '.', 'p', 'r', 'o', 't', 'o', '\022', '\016', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '3', +'\032', ')', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '/', +'v', '3', '/', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'p', 'r', 'o', 't', 'o', '\032', '\031', 'g', 'o', 'o', 'g', 'l', +'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'a', 'n', 'y', '.', 'p', 'r', 'o', 't', 'o', '\032', '\037', 'g', 'o', 'o', +'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 't', 'i', 'm', 'e', 's', 't', 'a', 'm', 'p', '.', 'p', 'r', +'o', 't', 'o', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', +'t', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', +'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\"', 'c', '\n', '\n', 'C', 'o', +'n', 'f', 'i', 'g', 'D', 'u', 'm', 'p', '\022', '.', '\n', '\007', 'c', 'o', 'n', 'f', 'i', 'g', 's', '\030', '\001', ' ', '\003', '(', '\013', +'2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'R', '\007', 'c', +'o', 'n', 'f', 'i', 'g', 's', ':', '%', '\232', '\305', '\210', '\036', ' ', '\n', '\036', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', +'n', '.', 'v', '2', 'a', 'l', 'p', 'h', 'a', '.', 'C', 'o', 'n', 'f', 'i', 'g', 'D', 'u', 'm', 'p', '\"', '\225', '\002', '\n', '\022', +'U', 'p', 'd', 'a', 't', 'e', 'F', 'a', 'i', 'l', 'u', 'r', 'e', 'S', 't', 'a', 't', 'e', '\022', 'G', '\n', '\024', 'f', 'a', 'i', +'l', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', 'u', 'r', 'a', 't', 'i', 'o', 'n', '\030', '\001', ' ', '\001', '(', '\013', '2', '\024', +'.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'R', '\023', 'f', 'a', 'i', +'l', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', 'u', 'r', 'a', 't', 'i', 'o', 'n', '\022', 'J', '\n', '\023', 'l', 'a', 's', 't', '_', +'u', 'p', 'd', 'a', 't', 'e', '_', 'a', 't', 't', 'e', 'm', 'p', 't', '\030', '\002', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', +'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'T', 'i', 'm', 'e', 's', 't', 'a', 'm', 'p', 'R', '\021', +'l', 'a', 's', 't', 'U', 'p', 'd', 'a', 't', 'e', 'A', 't', 't', 'e', 'm', 'p', 't', '\022', '\030', '\n', '\007', 'd', 'e', 't', 'a', +'i', 'l', 's', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\007', 'd', 'e', 't', 'a', 'i', 'l', 's', '\022', '!', '\n', '\014', 'v', 'e', 'r', +'s', 'i', 'o', 'n', '_', 'i', 'n', 'f', 'o', '\030', '\004', ' ', '\001', '(', '\t', 'R', '\013', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'I', +'n', 'f', 'o', ':', '-', '\232', '\305', '\210', '\036', '(', '\n', '&', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', +'2', 'a', 'l', 'p', 'h', 'a', '.', 'U', 'p', 'd', 'a', 't', 'e', 'F', 'a', 'i', 'l', 'u', 'r', 'e', 'S', 't', 'a', 't', 'e', +'\"', '\310', '\001', '\n', '\023', 'B', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', 'C', 'o', 'n', 'f', 'i', 'g', 'D', 'u', 'm', 'p', '\022', +'B', '\n', '\t', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '\030', '\001', ' ', '\001', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', +'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'v', '3', '.', 'B', 'o', 'o', +'t', 's', 't', 'r', 'a', 'p', 'R', '\t', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '\022', '=', '\n', '\014', 'l', 'a', 's', 't', +'_', 'u', 'p', 'd', 'a', 't', 'e', 'd', '\030', '\002', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', +'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'T', 'i', 'm', 'e', 's', 't', 'a', 'm', 'p', 'R', '\013', 'l', 'a', 's', 't', 'U', 'p', +'d', 'a', 't', 'e', 'd', ':', '.', '\232', '\305', '\210', '\036', ')', '\n', '\'', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', +'.', 'v', '2', 'a', 'l', 'p', 'h', 'a', '.', 'B', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', 'C', 'o', 'n', 'f', 'i', 'g', 'D', +'u', 'm', 'p', '\"', '\363', '\t', '\n', '\023', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 's', 'C', 'o', 'n', 'f', 'i', 'g', 'D', 'u', +'m', 'p', '\022', '!', '\n', '\014', 'v', 'e', 'r', 's', 'i', 'o', 'n', '_', 'i', 'n', 'f', 'o', '\030', '\001', ' ', '\001', '(', '\t', 'R', +'\013', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'I', 'n', 'f', 'o', '\022', ']', '\n', '\020', 's', 't', 'a', 't', 'i', 'c', '_', 'l', 'i', +'s', 't', 'e', 'n', 'e', 'r', 's', '\030', '\002', ' ', '\003', '(', '\013', '2', '2', '.', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', +'i', 'n', '.', 'v', '3', '.', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 's', 'C', 'o', 'n', 'f', 'i', 'g', 'D', 'u', 'm', 'p', +'.', 'S', 't', 'a', 't', 'i', 'c', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 'R', '\017', 's', 't', 'a', 't', 'i', 'c', 'L', 'i', +'s', 't', 'e', 'n', 'e', 'r', 's', '\022', '`', '\n', '\021', 'd', 'y', 'n', 'a', 'm', 'i', 'c', '_', 'l', 'i', 's', 't', 'e', 'n', +'e', 'r', 's', '\030', '\003', ' ', '\003', '(', '\013', '2', '3', '.', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', +'3', '.', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 's', 'C', 'o', 'n', 'f', 'i', 'g', 'D', 'u', 'm', 'p', '.', 'D', 'y', 'n', +'a', 'm', 'i', 'c', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 'R', '\020', 'd', 'y', 'n', 'a', 'm', 'i', 'c', 'L', 'i', 's', 't', +'e', 'n', 'e', 'r', 's', '\032', '\300', '\001', '\n', '\016', 'S', 't', 'a', 't', 'i', 'c', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', '\022', +'0', '\n', '\010', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '\030', '\001', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', +'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'R', '\010', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '\022', +'=', '\n', '\014', 'l', 'a', 's', 't', '_', 'u', 'p', 'd', 'a', 't', 'e', 'd', '\030', '\002', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', +'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'T', 'i', 'm', 'e', 's', 't', 'a', 'm', 'p', 'R', +'\013', 'l', 'a', 's', 't', 'U', 'p', 'd', 'a', 't', 'e', 'd', ':', '=', '\232', '\305', '\210', '\036', '8', '\n', '6', 'e', 'n', 'v', 'o', +'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '2', 'a', 'l', 'p', 'h', 'a', '.', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 's', +'C', 'o', 'n', 'f', 'i', 'g', 'D', 'u', 'm', 'p', '.', 'S', 't', 'a', 't', 'i', 'c', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', +'\032', '\357', '\001', '\n', '\024', 'D', 'y', 'n', 'a', 'm', 'i', 'c', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 'S', 't', 'a', 't', 'e', +'\022', '!', '\n', '\014', 'v', 'e', 'r', 's', 'i', 'o', 'n', '_', 'i', 'n', 'f', 'o', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\013', 'v', +'e', 'r', 's', 'i', 'o', 'n', 'I', 'n', 'f', 'o', '\022', '0', '\n', '\010', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '\030', '\002', ' ', +'\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', +'R', '\010', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '\022', '=', '\n', '\014', 'l', 'a', 's', 't', '_', 'u', 'p', 'd', 'a', 't', 'e', +'d', '\030', '\003', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', +'.', 'T', 'i', 'm', 'e', 's', 't', 'a', 'm', 'p', 'R', '\013', 'l', 'a', 's', 't', 'U', 'p', 'd', 'a', 't', 'e', 'd', ':', 'C', +'\232', '\305', '\210', '\036', '>', '\n', '<', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '2', 'a', 'l', 'p', 'h', +'a', '.', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 's', 'C', 'o', 'n', 'f', 'i', 'g', 'D', 'u', 'm', 'p', '.', 'D', 'y', 'n', +'a', 'm', 'i', 'c', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 'S', 't', 'a', 't', 'e', '\032', '\222', '\004', '\n', '\017', 'D', 'y', 'n', +'a', 'm', 'i', 'c', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', +'\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '[', '\n', '\014', 'a', 'c', 't', 'i', 'v', 'e', '_', 's', 't', 'a', 't', 'e', '\030', '\002', +' ', '\001', '(', '\013', '2', '8', '.', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '3', '.', 'L', 'i', 's', +'t', 'e', 'n', 'e', 'r', 's', 'C', 'o', 'n', 'f', 'i', 'g', 'D', 'u', 'm', 'p', '.', 'D', 'y', 'n', 'a', 'm', 'i', 'c', 'L', +'i', 's', 't', 'e', 'n', 'e', 'r', 'S', 't', 'a', 't', 'e', 'R', '\013', 'a', 'c', 't', 'i', 'v', 'e', 'S', 't', 'a', 't', 'e', +'\022', ']', '\n', '\r', 'w', 'a', 'r', 'm', 'i', 'n', 'g', '_', 's', 't', 'a', 't', 'e', '\030', '\003', ' ', '\001', '(', '\013', '2', '8', +'.', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '3', '.', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 's', +'C', 'o', 'n', 'f', 'i', 'g', 'D', 'u', 'm', 'p', '.', 'D', 'y', 'n', 'a', 'm', 'i', 'c', 'L', 'i', 's', 't', 'e', 'n', 'e', +'r', 'S', 't', 'a', 't', 'e', 'R', '\014', 'w', 'a', 'r', 'm', 'i', 'n', 'g', 'S', 't', 'a', 't', 'e', '\022', '_', '\n', '\016', 'd', +'r', 'a', 'i', 'n', 'i', 'n', 'g', '_', 's', 't', 'a', 't', 'e', '\030', '\004', ' ', '\001', '(', '\013', '2', '8', '.', 'e', 'n', 'v', +'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '3', '.', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 's', 'C', 'o', 'n', 'f', +'i', 'g', 'D', 'u', 'm', 'p', '.', 'D', 'y', 'n', 'a', 'm', 'i', 'c', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 'S', 't', 'a', +'t', 'e', 'R', '\r', 'd', 'r', 'a', 'i', 'n', 'i', 'n', 'g', 'S', 't', 'a', 't', 'e', '\022', 'C', '\n', '\013', 'e', 'r', 'r', 'o', +'r', '_', 's', 't', 'a', 't', 'e', '\030', '\005', ' ', '\001', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', +'i', 'n', '.', 'v', '3', '.', 'U', 'p', 'd', 'a', 't', 'e', 'F', 'a', 'i', 'l', 'u', 'r', 'e', 'S', 't', 'a', 't', 'e', 'R', +'\n', 'e', 'r', 'r', 'o', 'r', 'S', 't', 'a', 't', 'e', '\022', 'I', '\n', '\r', 'c', 'l', 'i', 'e', 'n', 't', '_', 's', 't', 'a', +'t', 'u', 's', '\030', '\006', ' ', '\001', '(', '\016', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', +'3', '.', 'C', 'l', 'i', 'e', 'n', 't', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', 'S', 't', 'a', 't', 'u', 's', 'R', '\014', 'c', +'l', 'i', 'e', 'n', 't', 'S', 't', 'a', 't', 'u', 's', ':', '>', '\232', '\305', '\210', '\036', '9', '\n', '7', 'e', 'n', 'v', 'o', 'y', +'.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '2', 'a', 'l', 'p', 'h', 'a', '.', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 's', 'C', +'o', 'n', 'f', 'i', 'g', 'D', 'u', 'm', 'p', '.', 'D', 'y', 'n', 'a', 'm', 'i', 'c', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', +':', '.', '\232', '\305', '\210', '\036', ')', '\n', '\'', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '2', 'a', 'l', +'p', 'h', 'a', '.', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 's', 'C', 'o', 'n', 'f', 'i', 'g', 'D', 'u', 'm', 'p', '\"', '\312', +'\007', '\n', '\022', 'C', 'l', 'u', 's', 't', 'e', 'r', 's', 'C', 'o', 'n', 'f', 'i', 'g', 'D', 'u', 'm', 'p', '\022', '!', '\n', '\014', +'v', 'e', 'r', 's', 'i', 'o', 'n', '_', 'i', 'n', 'f', 'o', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\013', 'v', 'e', 'r', 's', 'i', +'o', 'n', 'I', 'n', 'f', 'o', '\022', 'Y', '\n', '\017', 's', 't', 'a', 't', 'i', 'c', '_', 'c', 'l', 'u', 's', 't', 'e', 'r', 's', +'\030', '\002', ' ', '\003', '(', '\013', '2', '0', '.', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '3', '.', 'C', +'l', 'u', 's', 't', 'e', 'r', 's', 'C', 'o', 'n', 'f', 'i', 'g', 'D', 'u', 'm', 'p', '.', 'S', 't', 'a', 't', 'i', 'c', 'C', +'l', 'u', 's', 't', 'e', 'r', 'R', '\016', 's', 't', 'a', 't', 'i', 'c', 'C', 'l', 'u', 's', 't', 'e', 'r', 's', '\022', 'i', '\n', +'\027', 'd', 'y', 'n', 'a', 'm', 'i', 'c', '_', 'a', 'c', 't', 'i', 'v', 'e', '_', 'c', 'l', 'u', 's', 't', 'e', 'r', 's', '\030', +'\003', ' ', '\003', '(', '\013', '2', '1', '.', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '3', '.', 'C', 'l', +'u', 's', 't', 'e', 'r', 's', 'C', 'o', 'n', 'f', 'i', 'g', 'D', 'u', 'm', 'p', '.', 'D', 'y', 'n', 'a', 'm', 'i', 'c', 'C', +'l', 'u', 's', 't', 'e', 'r', 'R', '\025', 'd', 'y', 'n', 'a', 'm', 'i', 'c', 'A', 'c', 't', 'i', 'v', 'e', 'C', 'l', 'u', 's', +'t', 'e', 'r', 's', '\022', 'k', '\n', '\030', 'd', 'y', 'n', 'a', 'm', 'i', 'c', '_', 'w', 'a', 'r', 'm', 'i', 'n', 'g', '_', 'c', +'l', 'u', 's', 't', 'e', 'r', 's', '\030', '\004', ' ', '\003', '(', '\013', '2', '1', '.', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', +'i', 'n', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', 's', 'C', 'o', 'n', 'f', 'i', 'g', 'D', 'u', 'm', 'p', '.', +'D', 'y', 'n', 'a', 'm', 'i', 'c', 'C', 'l', 'u', 's', 't', 'e', 'r', 'R', '\026', 'd', 'y', 'n', 'a', 'm', 'i', 'c', 'W', 'a', +'r', 'm', 'i', 'n', 'g', 'C', 'l', 'u', 's', 't', 'e', 'r', 's', '\032', '\273', '\001', '\n', '\r', 'S', 't', 'a', 't', 'i', 'c', 'C', +'l', 'u', 's', 't', 'e', 'r', '\022', '.', '\n', '\007', 'c', 'l', 'u', 's', 't', 'e', 'r', '\030', '\001', ' ', '\001', '(', '\013', '2', '\024', +'.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'R', '\007', 'c', 'l', 'u', +'s', 't', 'e', 'r', '\022', '=', '\n', '\014', 'l', 'a', 's', 't', '_', 'u', 'p', 'd', 'a', 't', 'e', 'd', '\030', '\002', ' ', '\001', '(', +'\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'T', 'i', 'm', 'e', 's', +'t', 'a', 'm', 'p', 'R', '\013', 'l', 'a', 's', 't', 'U', 'p', 'd', 'a', 't', 'e', 'd', ':', ';', '\232', '\305', '\210', '\036', '6', '\n', +'4', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '2', 'a', 'l', 'p', 'h', 'a', '.', 'C', 'l', 'u', 's', +'t', 'e', 'r', 's', 'C', 'o', 'n', 'f', 'i', 'g', 'D', 'u', 'm', 'p', '.', 'S', 't', 'a', 't', 'i', 'c', 'C', 'l', 'u', 's', +'t', 'e', 'r', '\032', '\360', '\002', '\n', '\016', 'D', 'y', 'n', 'a', 'm', 'i', 'c', 'C', 'l', 'u', 's', 't', 'e', 'r', '\022', '!', '\n', +'\014', 'v', 'e', 'r', 's', 'i', 'o', 'n', '_', 'i', 'n', 'f', 'o', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\013', 'v', 'e', 'r', 's', +'i', 'o', 'n', 'I', 'n', 'f', 'o', '\022', '.', '\n', '\007', 'c', 'l', 'u', 's', 't', 'e', 'r', '\030', '\002', ' ', '\001', '(', '\013', '2', +'\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'R', '\007', 'c', 'l', +'u', 's', 't', 'e', 'r', '\022', '=', '\n', '\014', 'l', 'a', 's', 't', '_', 'u', 'p', 'd', 'a', 't', 'e', 'd', '\030', '\003', ' ', '\001', +'(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'T', 'i', 'm', 'e', +'s', 't', 'a', 'm', 'p', 'R', '\013', 'l', 'a', 's', 't', 'U', 'p', 'd', 'a', 't', 'e', 'd', '\022', 'C', '\n', '\013', 'e', 'r', 'r', +'o', 'r', '_', 's', 't', 'a', 't', 'e', '\030', '\004', ' ', '\001', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', +'m', 'i', 'n', '.', 'v', '3', '.', 'U', 'p', 'd', 'a', 't', 'e', 'F', 'a', 'i', 'l', 'u', 'r', 'e', 'S', 't', 'a', 't', 'e', +'R', '\n', 'e', 'r', 'r', 'o', 'r', 'S', 't', 'a', 't', 'e', '\022', 'I', '\n', '\r', 'c', 'l', 'i', 'e', 'n', 't', '_', 's', 't', +'a', 't', 'u', 's', '\030', '\005', ' ', '\001', '(', '\016', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', +'v', '3', '.', 'C', 'l', 'i', 'e', 'n', 't', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', 'S', 't', 'a', 't', 'u', 's', 'R', '\014', +'c', 'l', 'i', 'e', 'n', 't', 'S', 't', 'a', 't', 'u', 's', ':', '<', '\232', '\305', '\210', '\036', '7', '\n', '5', 'e', 'n', 'v', 'o', +'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '2', 'a', 'l', 'p', 'h', 'a', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', 's', 'C', +'o', 'n', 'f', 'i', 'g', 'D', 'u', 'm', 'p', '.', 'D', 'y', 'n', 'a', 'm', 'i', 'c', 'C', 'l', 'u', 's', 't', 'e', 'r', ':', +'-', '\232', '\305', '\210', '\036', '(', '\n', '&', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '2', 'a', 'l', 'p', +'h', 'a', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', 's', 'C', 'o', 'n', 'f', 'i', 'g', 'D', 'u', 'm', 'p', '\"', '\335', '\006', '\n', +'\020', 'R', 'o', 'u', 't', 'e', 's', 'C', 'o', 'n', 'f', 'i', 'g', 'D', 'u', 'm', 'p', '\022', 'd', '\n', '\024', 's', 't', 'a', 't', +'i', 'c', '_', 'r', 'o', 'u', 't', 'e', '_', 'c', 'o', 'n', 'f', 'i', 'g', 's', '\030', '\002', ' ', '\003', '(', '\013', '2', '2', '.', +'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '3', '.', 'R', 'o', 'u', 't', 'e', 's', 'C', 'o', 'n', 'f', +'i', 'g', 'D', 'u', 'm', 'p', '.', 'S', 't', 'a', 't', 'i', 'c', 'R', 'o', 'u', 't', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 'R', +'\022', 's', 't', 'a', 't', 'i', 'c', 'R', 'o', 'u', 't', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 's', '\022', 'g', '\n', '\025', 'd', 'y', +'n', 'a', 'm', 'i', 'c', '_', 'r', 'o', 'u', 't', 'e', '_', 'c', 'o', 'n', 'f', 'i', 'g', 's', '\030', '\003', ' ', '\003', '(', '\013', +'2', '3', '.', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '3', '.', 'R', 'o', 'u', 't', 'e', 's', 'C', +'o', 'n', 'f', 'i', 'g', 'D', 'u', 'm', 'p', '.', 'D', 'y', 'n', 'a', 'm', 'i', 'c', 'R', 'o', 'u', 't', 'e', 'C', 'o', 'n', +'f', 'i', 'g', 'R', '\023', 'd', 'y', 'n', 'a', 'm', 'i', 'c', 'R', 'o', 'u', 't', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 's', '\032', +'\312', '\001', '\n', '\021', 'S', 't', 'a', 't', 'i', 'c', 'R', 'o', 'u', 't', 'e', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '7', '\n', '\014', +'r', 'o', 'u', 't', 'e', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\001', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', +'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'R', '\013', 'r', 'o', 'u', 't', 'e', 'C', 'o', 'n', +'f', 'i', 'g', '\022', '=', '\n', '\014', 'l', 'a', 's', 't', '_', 'u', 'p', 'd', 'a', 't', 'e', 'd', '\030', '\002', ' ', '\001', '(', '\013', +'2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'T', 'i', 'm', 'e', 's', 't', +'a', 'm', 'p', 'R', '\013', 'l', 'a', 's', 't', 'U', 'p', 'd', 'a', 't', 'e', 'd', ':', '=', '\232', '\305', '\210', '\036', '8', '\n', '6', +'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '2', 'a', 'l', 'p', 'h', 'a', '.', 'R', 'o', 'u', 't', 'e', +'s', 'C', 'o', 'n', 'f', 'i', 'g', 'D', 'u', 'm', 'p', '.', 'S', 't', 'a', 't', 'i', 'c', 'R', 'o', 'u', 't', 'e', 'C', 'o', +'n', 'f', 'i', 'g', '\032', '\377', '\002', '\n', '\022', 'D', 'y', 'n', 'a', 'm', 'i', 'c', 'R', 'o', 'u', 't', 'e', 'C', 'o', 'n', 'f', +'i', 'g', '\022', '!', '\n', '\014', 'v', 'e', 'r', 's', 'i', 'o', 'n', '_', 'i', 'n', 'f', 'o', '\030', '\001', ' ', '\001', '(', '\t', 'R', +'\013', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'I', 'n', 'f', 'o', '\022', '7', '\n', '\014', 'r', 'o', 'u', 't', 'e', '_', 'c', 'o', 'n', +'f', 'i', 'g', '\030', '\002', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', +'u', 'f', '.', 'A', 'n', 'y', 'R', '\013', 'r', 'o', 'u', 't', 'e', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '=', '\n', '\014', 'l', 'a', +'s', 't', '_', 'u', 'p', 'd', 'a', 't', 'e', 'd', '\030', '\003', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', +'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'T', 'i', 'm', 'e', 's', 't', 'a', 'm', 'p', 'R', '\013', 'l', 'a', 's', 't', +'U', 'p', 'd', 'a', 't', 'e', 'd', '\022', 'C', '\n', '\013', 'e', 'r', 'r', 'o', 'r', '_', 's', 't', 'a', 't', 'e', '\030', '\004', ' ', +'\001', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '3', '.', 'U', 'p', 'd', 'a', +'t', 'e', 'F', 'a', 'i', 'l', 'u', 'r', 'e', 'S', 't', 'a', 't', 'e', 'R', '\n', 'e', 'r', 'r', 'o', 'r', 'S', 't', 'a', 't', +'e', '\022', 'I', '\n', '\r', 'c', 'l', 'i', 'e', 'n', 't', '_', 's', 't', 'a', 't', 'u', 's', '\030', '\005', ' ', '\001', '(', '\016', '2', +'$', '.', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '3', '.', 'C', 'l', 'i', 'e', 'n', 't', 'R', 'e', +'s', 'o', 'u', 'r', 'c', 'e', 'S', 't', 'a', 't', 'u', 's', 'R', '\014', 'c', 'l', 'i', 'e', 'n', 't', 'S', 't', 'a', 't', 'u', +'s', ':', '>', '\232', '\305', '\210', '\036', '9', '\n', '7', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '2', 'a', +'l', 'p', 'h', 'a', '.', 'R', 'o', 'u', 't', 'e', 's', 'C', 'o', 'n', 'f', 'i', 'g', 'D', 'u', 'm', 'p', '.', 'D', 'y', 'n', +'a', 'm', 'i', 'c', 'R', 'o', 'u', 't', 'e', 'C', 'o', 'n', 'f', 'i', 'g', ':', '+', '\232', '\305', '\210', '\036', '&', '\n', '$', 'e', +'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '2', 'a', 'l', 'p', 'h', 'a', '.', 'R', 'o', 'u', 't', 'e', 's', +'C', 'o', 'n', 'f', 'i', 'g', 'D', 'u', 'm', 'p', '\"', '\214', '\010', '\n', '\026', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', +'e', 's', 'C', 'o', 'n', 'f', 'i', 'g', 'D', 'u', 'm', 'p', '\022', '~', '\n', '\033', 'i', 'n', 'l', 'i', 'n', 'e', '_', 's', 'c', +'o', 'p', 'e', 'd', '_', 'r', 'o', 'u', 't', 'e', '_', 'c', 'o', 'n', 'f', 'i', 'g', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', +'?', '.', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '3', '.', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'o', +'u', 't', 'e', 's', 'C', 'o', 'n', 'f', 'i', 'g', 'D', 'u', 'm', 'p', '.', 'I', 'n', 'l', 'i', 'n', 'e', 'S', 'c', 'o', 'p', +'e', 'd', 'R', 'o', 'u', 't', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 's', 'R', '\030', 'i', 'n', 'l', 'i', 'n', 'e', 'S', 'c', 'o', +'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 's', '\022', '\201', '\001', '\n', '\034', 'd', 'y', 'n', 'a', 'm', +'i', 'c', '_', 's', 'c', 'o', 'p', 'e', 'd', '_', 'r', 'o', 'u', 't', 'e', '_', 'c', 'o', 'n', 'f', 'i', 'g', 's', '\030', '\002', +' ', '\003', '(', '\013', '2', '@', '.', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '3', '.', 'S', 'c', 'o', +'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 's', 'C', 'o', 'n', 'f', 'i', 'g', 'D', 'u', 'm', 'p', '.', 'D', 'y', 'n', 'a', 'm', +'i', 'c', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 's', 'R', '\031', 'd', 'y', 'n', +'a', 'm', 'i', 'c', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 's', '\032', '\201', '\002', +'\n', '\030', 'I', 'n', 'l', 'i', 'n', 'e', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 'C', 'o', 'n', 'f', 'i', 'g', +'s', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', 'F', '\n', '\024', +'s', 'c', 'o', 'p', 'e', 'd', '_', 'r', 'o', 'u', 't', 'e', '_', 'c', 'o', 'n', 'f', 'i', 'g', 's', '\030', '\002', ' ', '\003', '(', +'\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'R', '\022', +'s', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 's', '\022', '=', '\n', '\014', 'l', 'a', 's', +'t', '_', 'u', 'p', 'd', 'a', 't', 'e', 'd', '\030', '\003', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', +'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'T', 'i', 'm', 'e', 's', 't', 'a', 'm', 'p', 'R', '\013', 'l', 'a', 's', 't', 'U', +'p', 'd', 'a', 't', 'e', 'd', ':', 'J', '\232', '\305', '\210', '\036', 'E', '\n', 'C', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', +'n', '.', 'v', '2', 'a', 'l', 'p', 'h', 'a', '.', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 's', 'C', 'o', 'n', +'f', 'i', 'g', 'D', 'u', 'm', 'p', '.', 'I', 'n', 'l', 'i', 'n', 'e', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', +'C', 'o', 'n', 'f', 'i', 'g', 's', '\032', '\266', '\003', '\n', '\031', 'D', 'y', 'n', 'a', 'm', 'i', 'c', 'S', 'c', 'o', 'p', 'e', 'd', +'R', 'o', 'u', 't', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 's', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', +'\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '!', '\n', '\014', 'v', 'e', 'r', 's', 'i', 'o', 'n', '_', 'i', 'n', 'f', 'o', '\030', '\002', +' ', '\001', '(', '\t', 'R', '\013', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'I', 'n', 'f', 'o', '\022', 'F', '\n', '\024', 's', 'c', 'o', 'p', +'e', 'd', '_', 'r', 'o', 'u', 't', 'e', '_', 'c', 'o', 'n', 'f', 'i', 'g', 's', '\030', '\003', ' ', '\003', '(', '\013', '2', '\024', '.', +'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'R', '\022', 's', 'c', 'o', 'p', +'e', 'd', 'R', 'o', 'u', 't', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 's', '\022', '=', '\n', '\014', 'l', 'a', 's', 't', '_', 'u', 'p', +'d', 'a', 't', 'e', 'd', '\030', '\004', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', +'o', 'b', 'u', 'f', '.', 'T', 'i', 'm', 'e', 's', 't', 'a', 'm', 'p', 'R', '\013', 'l', 'a', 's', 't', 'U', 'p', 'd', 'a', 't', +'e', 'd', '\022', 'C', '\n', '\013', 'e', 'r', 'r', 'o', 'r', '_', 's', 't', 'a', 't', 'e', '\030', '\005', ' ', '\001', '(', '\013', '2', '\"', +'.', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '3', '.', 'U', 'p', 'd', 'a', 't', 'e', 'F', 'a', 'i', +'l', 'u', 'r', 'e', 'S', 't', 'a', 't', 'e', 'R', '\n', 'e', 'r', 'r', 'o', 'r', 'S', 't', 'a', 't', 'e', '\022', 'I', '\n', '\r', +'c', 'l', 'i', 'e', 'n', 't', '_', 's', 't', 'a', 't', 'u', 's', '\030', '\006', ' ', '\001', '(', '\016', '2', '$', '.', 'e', 'n', 'v', +'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '3', '.', 'C', 'l', 'i', 'e', 'n', 't', 'R', 'e', 's', 'o', 'u', 'r', 'c', +'e', 'S', 't', 'a', 't', 'u', 's', 'R', '\014', 'c', 'l', 'i', 'e', 'n', 't', 'S', 't', 'a', 't', 'u', 's', ':', 'K', '\232', '\305', +'\210', '\036', 'F', '\n', 'D', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '2', 'a', 'l', 'p', 'h', 'a', '.', +'S', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 's', 'C', 'o', 'n', 'f', 'i', 'g', 'D', 'u', 'm', 'p', '.', 'D', 'y', +'n', 'a', 'm', 'i', 'c', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 's', ':', '1', +'\232', '\305', '\210', '\036', ',', '\n', '*', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '2', 'a', 'l', 'p', 'h', +'a', '.', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 's', 'C', 'o', 'n', 'f', 'i', 'g', 'D', 'u', 'm', 'p', '\"', +'\267', '\007', '\n', '\021', 'S', 'e', 'c', 'r', 'e', 't', 's', 'C', 'o', 'n', 'f', 'i', 'g', 'D', 'u', 'm', 'p', '\022', 'U', '\n', '\016', +'s', 't', 'a', 't', 'i', 'c', '_', 's', 'e', 'c', 'r', 'e', 't', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '.', '.', 'e', 'n', +'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '3', '.', 'S', 'e', 'c', 'r', 'e', 't', 's', 'C', 'o', 'n', 'f', 'i', +'g', 'D', 'u', 'm', 'p', '.', 'S', 't', 'a', 't', 'i', 'c', 'S', 'e', 'c', 'r', 'e', 't', 'R', '\r', 's', 't', 'a', 't', 'i', +'c', 'S', 'e', 'c', 'r', 'e', 't', 's', '\022', 'e', '\n', '\026', 'd', 'y', 'n', 'a', 'm', 'i', 'c', '_', 'a', 'c', 't', 'i', 'v', +'e', '_', 's', 'e', 'c', 'r', 'e', 't', 's', '\030', '\002', ' ', '\003', '(', '\013', '2', '/', '.', 'e', 'n', 'v', 'o', 'y', '.', 'a', +'d', 'm', 'i', 'n', '.', 'v', '3', '.', 'S', 'e', 'c', 'r', 'e', 't', 's', 'C', 'o', 'n', 'f', 'i', 'g', 'D', 'u', 'm', 'p', +'.', 'D', 'y', 'n', 'a', 'm', 'i', 'c', 'S', 'e', 'c', 'r', 'e', 't', 'R', '\024', 'd', 'y', 'n', 'a', 'm', 'i', 'c', 'A', 'c', +'t', 'i', 'v', 'e', 'S', 'e', 'c', 'r', 'e', 't', 's', '\022', 'g', '\n', '\027', 'd', 'y', 'n', 'a', 'm', 'i', 'c', '_', 'w', 'a', +'r', 'm', 'i', 'n', 'g', '_', 's', 'e', 'c', 'r', 'e', 't', 's', '\030', '\003', ' ', '\003', '(', '\013', '2', '/', '.', 'e', 'n', 'v', +'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '3', '.', 'S', 'e', 'c', 'r', 'e', 't', 's', 'C', 'o', 'n', 'f', 'i', 'g', +'D', 'u', 'm', 'p', '.', 'D', 'y', 'n', 'a', 'm', 'i', 'c', 'S', 'e', 'c', 'r', 'e', 't', 'R', '\025', 'd', 'y', 'n', 'a', 'm', +'i', 'c', 'W', 'a', 'r', 'm', 'i', 'n', 'g', 'S', 'e', 'c', 'r', 'e', 't', 's', '\032', '\377', '\002', '\n', '\r', 'D', 'y', 'n', 'a', +'m', 'i', 'c', 'S', 'e', 'c', 'r', 'e', 't', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', +'n', 'a', 'm', 'e', '\022', '!', '\n', '\014', 'v', 'e', 'r', 's', 'i', 'o', 'n', '_', 'i', 'n', 'f', 'o', '\030', '\002', ' ', '\001', '(', +'\t', 'R', '\013', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'I', 'n', 'f', 'o', '\022', '=', '\n', '\014', 'l', 'a', 's', 't', '_', 'u', 'p', +'d', 'a', 't', 'e', 'd', '\030', '\003', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', +'o', 'b', 'u', 'f', '.', 'T', 'i', 'm', 'e', 's', 't', 'a', 'm', 'p', 'R', '\013', 'l', 'a', 's', 't', 'U', 'p', 'd', 'a', 't', +'e', 'd', '\022', ',', '\n', '\006', 's', 'e', 'c', 'r', 'e', 't', '\030', '\004', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', +'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'R', '\006', 's', 'e', 'c', 'r', 'e', 't', '\022', 'C', +'\n', '\013', 'e', 'r', 'r', 'o', 'r', '_', 's', 't', 'a', 't', 'e', '\030', '\005', ' ', '\001', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', +'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '3', '.', 'U', 'p', 'd', 'a', 't', 'e', 'F', 'a', 'i', 'l', 'u', 'r', 'e', +'S', 't', 'a', 't', 'e', 'R', '\n', 'e', 'r', 'r', 'o', 'r', 'S', 't', 'a', 't', 'e', '\022', 'I', '\n', '\r', 'c', 'l', 'i', 'e', +'n', 't', '_', 's', 't', 'a', 't', 'u', 's', '\030', '\006', ' ', '\001', '(', '\016', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 'a', +'d', 'm', 'i', 'n', '.', 'v', '3', '.', 'C', 'l', 'i', 'e', 'n', 't', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', 'S', 't', 'a', +'t', 'u', 's', 'R', '\014', 'c', 'l', 'i', 'e', 'n', 't', 'S', 't', 'a', 't', 'u', 's', ':', ':', '\232', '\305', '\210', '\036', '5', '\n', +'3', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '2', 'a', 'l', 'p', 'h', 'a', '.', 'S', 'e', 'c', 'r', +'e', 't', 's', 'C', 'o', 'n', 'f', 'i', 'g', 'D', 'u', 'm', 'p', '.', 'D', 'y', 'n', 'a', 'm', 'i', 'c', 'S', 'e', 'c', 'r', +'e', 't', '\032', '\312', '\001', '\n', '\014', 'S', 't', 'a', 't', 'i', 'c', 'S', 'e', 'c', 'r', 'e', 't', '\022', '\022', '\n', '\004', 'n', 'a', +'m', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '=', '\n', '\014', 'l', 'a', 's', 't', '_', 'u', 'p', +'d', 'a', 't', 'e', 'd', '\030', '\002', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', +'o', 'b', 'u', 'f', '.', 'T', 'i', 'm', 'e', 's', 't', 'a', 'm', 'p', 'R', '\013', 'l', 'a', 's', 't', 'U', 'p', 'd', 'a', 't', +'e', 'd', '\022', ',', '\n', '\006', 's', 'e', 'c', 'r', 'e', 't', '\030', '\003', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', +'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'R', '\006', 's', 'e', 'c', 'r', 'e', 't', ':', '9', +'\232', '\305', '\210', '\036', '4', '\n', '2', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '2', 'a', 'l', 'p', 'h', +'a', '.', 'S', 'e', 'c', 'r', 'e', 't', 's', 'C', 'o', 'n', 'f', 'i', 'g', 'D', 'u', 'm', 'p', '.', 'S', 't', 'a', 't', 'i', +'c', 'S', 'e', 'c', 'r', 'e', 't', ':', ',', '\232', '\305', '\210', '\036', '\'', '\n', '%', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', +'i', 'n', '.', 'v', '2', 'a', 'l', 'p', 'h', 'a', '.', 'S', 'e', 'c', 'r', 'e', 't', 's', 'C', 'o', 'n', 'f', 'i', 'g', 'D', +'u', 'm', 'p', '\"', '\336', '\005', '\n', '\023', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 's', 'C', 'o', 'n', 'f', 'i', 'g', 'D', 'u', +'m', 'p', '\022', 'p', '\n', '\027', 's', 't', 'a', 't', 'i', 'c', '_', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '_', 'c', 'o', 'n', +'f', 'i', 'g', 's', '\030', '\002', ' ', '\003', '(', '\013', '2', '8', '.', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', +'v', '3', '.', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 's', 'C', 'o', 'n', 'f', 'i', 'g', 'D', 'u', 'm', 'p', '.', 'S', 't', +'a', 't', 'i', 'c', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\025', 's', 't', 'a', 't', 'i', +'c', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 'C', 'o', 'n', 'f', 'i', 'g', 's', '\022', 's', '\n', '\030', 'd', 'y', 'n', 'a', 'm', +'i', 'c', '_', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '_', 'c', 'o', 'n', 'f', 'i', 'g', 's', '\030', '\003', ' ', '\003', '(', '\013', +'2', '9', '.', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '3', '.', 'E', 'n', 'd', 'p', 'o', 'i', 'n', +'t', 's', 'C', 'o', 'n', 'f', 'i', 'g', 'D', 'u', 'm', 'p', '.', 'D', 'y', 'n', 'a', 'm', 'i', 'c', 'E', 'n', 'd', 'p', 'o', +'i', 'n', 't', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\026', 'd', 'y', 'n', 'a', 'm', 'i', 'c', 'E', 'n', 'd', 'p', 'o', 'i', 'n', +'t', 'C', 'o', 'n', 'f', 'i', 'g', 's', '\032', '\224', '\001', '\n', '\024', 'S', 't', 'a', 't', 'i', 'c', 'E', 'n', 'd', 'p', 'o', 'i', +'n', 't', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '=', '\n', '\017', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '_', 'c', 'o', 'n', 'f', +'i', 'g', '\030', '\001', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', +'f', '.', 'A', 'n', 'y', 'R', '\016', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '=', '\n', '\014', +'l', 'a', 's', 't', '_', 'u', 'p', 'd', 'a', 't', 'e', 'd', '\030', '\002', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', +'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'T', 'i', 'm', 'e', 's', 't', 'a', 'm', 'p', 'R', '\013', 'l', 'a', +'s', 't', 'U', 'p', 'd', 'a', 't', 'e', 'd', '\032', '\310', '\002', '\n', '\025', 'D', 'y', 'n', 'a', 'm', 'i', 'c', 'E', 'n', 'd', 'p', +'o', 'i', 'n', 't', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '!', '\n', '\014', 'v', 'e', 'r', 's', 'i', 'o', 'n', '_', 'i', 'n', 'f', +'o', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\013', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'I', 'n', 'f', 'o', '\022', '=', '\n', '\017', 'e', +'n', 'd', 'p', 'o', 'i', 'n', 't', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\002', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', +'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'R', '\016', 'e', 'n', 'd', 'p', 'o', 'i', +'n', 't', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '=', '\n', '\014', 'l', 'a', 's', 't', '_', 'u', 'p', 'd', 'a', 't', 'e', 'd', '\030', +'\003', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'T', +'i', 'm', 'e', 's', 't', 'a', 'm', 'p', 'R', '\013', 'l', 'a', 's', 't', 'U', 'p', 'd', 'a', 't', 'e', 'd', '\022', 'C', '\n', '\013', +'e', 'r', 'r', 'o', 'r', '_', 's', 't', 'a', 't', 'e', '\030', '\004', ' ', '\001', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', +'.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '3', '.', 'U', 'p', 'd', 'a', 't', 'e', 'F', 'a', 'i', 'l', 'u', 'r', 'e', 'S', 't', +'a', 't', 'e', 'R', '\n', 'e', 'r', 'r', 'o', 'r', 'S', 't', 'a', 't', 'e', '\022', 'I', '\n', '\r', 'c', 'l', 'i', 'e', 'n', 't', +'_', 's', 't', 'a', 't', 'u', 's', '\030', '\005', ' ', '\001', '(', '\016', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', +'i', 'n', '.', 'v', '3', '.', 'C', 'l', 'i', 'e', 'n', 't', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', 'S', 't', 'a', 't', 'u', +'s', 'R', '\014', 'c', 'l', 'i', 'e', 'n', 't', 'S', 't', 'a', 't', 'u', 's', '*', ']', '\n', '\024', 'C', 'l', 'i', 'e', 'n', 't', +'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', 'S', 't', 'a', 't', 'u', 's', '\022', '\013', '\n', '\007', 'U', 'N', 'K', 'N', 'O', 'W', 'N', +'\020', '\000', '\022', '\r', '\n', '\t', 'R', 'E', 'Q', 'U', 'E', 'S', 'T', 'E', 'D', '\020', '\001', '\022', '\022', '\n', '\016', 'D', 'O', 'E', 'S', +'_', 'N', 'O', 'T', '_', 'E', 'X', 'I', 'S', 'T', '\020', '\002', '\022', '\t', '\n', '\005', 'A', 'C', 'K', 'E', 'D', '\020', '\003', '\022', '\n', +'\n', '\006', 'N', 'A', 'C', 'K', 'E', 'D', '\020', '\004', 'B', '9', '\n', '\034', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', +'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '3', 'B', '\017', 'C', 'o', 'n', 'f', 'i', 'g', +'D', 'u', 'm', 'p', 'P', 'r', 'o', 't', 'o', 'P', '\001', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', +'o', '3', +}; + +static upb_def_init *deps[6] = { + &envoy_config_bootstrap_v3_bootstrap_proto_upbdefinit, + &google_protobuf_any_proto_upbdefinit, + &google_protobuf_timestamp_proto_upbdefinit, + &udpa_annotations_status_proto_upbdefinit, + &udpa_annotations_versioning_proto_upbdefinit, + NULL +}; + +upb_def_init envoy_admin_v3_config_dump_proto_upbdefinit = { + deps, + layouts, + "envoy/admin/v3/config_dump.proto", + UPB_STRVIEW_INIT(descriptor, 6802) +}; diff --git a/grpc/src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump.upbdefs.h b/grpc/src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump.upbdefs.h new file mode 100644 index 00000000..8e62d4e4 --- /dev/null +++ b/grpc/src/core/ext/upbdefs-generated/envoy/admin/v3/config_dump.upbdefs.h @@ -0,0 +1,140 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * envoy/admin/v3/config_dump.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#ifndef ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPBDEFS_H_ +#define ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPBDEFS_H_ + +#include "upb/def.h" +#include "upb/port_def.inc" +#ifdef __cplusplus +extern "C" { +#endif + +#include "upb/def.h" + +#include "upb/port_def.inc" + +extern upb_def_init envoy_admin_v3_config_dump_proto_upbdefinit; + +UPB_INLINE const upb_msgdef *envoy_admin_v3_ConfigDump_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_admin_v3_config_dump_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.admin.v3.ConfigDump"); +} + +UPB_INLINE const upb_msgdef *envoy_admin_v3_UpdateFailureState_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_admin_v3_config_dump_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.admin.v3.UpdateFailureState"); +} + +UPB_INLINE const upb_msgdef *envoy_admin_v3_BootstrapConfigDump_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_admin_v3_config_dump_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.admin.v3.BootstrapConfigDump"); +} + +UPB_INLINE const upb_msgdef *envoy_admin_v3_ListenersConfigDump_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_admin_v3_config_dump_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.admin.v3.ListenersConfigDump"); +} + +UPB_INLINE const upb_msgdef *envoy_admin_v3_ListenersConfigDump_StaticListener_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_admin_v3_config_dump_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.admin.v3.ListenersConfigDump.StaticListener"); +} + +UPB_INLINE const upb_msgdef *envoy_admin_v3_ListenersConfigDump_DynamicListenerState_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_admin_v3_config_dump_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.admin.v3.ListenersConfigDump.DynamicListenerState"); +} + +UPB_INLINE const upb_msgdef *envoy_admin_v3_ListenersConfigDump_DynamicListener_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_admin_v3_config_dump_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.admin.v3.ListenersConfigDump.DynamicListener"); +} + +UPB_INLINE const upb_msgdef *envoy_admin_v3_ClustersConfigDump_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_admin_v3_config_dump_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.admin.v3.ClustersConfigDump"); +} + +UPB_INLINE const upb_msgdef *envoy_admin_v3_ClustersConfigDump_StaticCluster_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_admin_v3_config_dump_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.admin.v3.ClustersConfigDump.StaticCluster"); +} + +UPB_INLINE const upb_msgdef *envoy_admin_v3_ClustersConfigDump_DynamicCluster_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_admin_v3_config_dump_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.admin.v3.ClustersConfigDump.DynamicCluster"); +} + +UPB_INLINE const upb_msgdef *envoy_admin_v3_RoutesConfigDump_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_admin_v3_config_dump_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.admin.v3.RoutesConfigDump"); +} + +UPB_INLINE const upb_msgdef *envoy_admin_v3_RoutesConfigDump_StaticRouteConfig_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_admin_v3_config_dump_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.admin.v3.RoutesConfigDump.StaticRouteConfig"); +} + +UPB_INLINE const upb_msgdef *envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_admin_v3_config_dump_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.admin.v3.RoutesConfigDump.DynamicRouteConfig"); +} + +UPB_INLINE const upb_msgdef *envoy_admin_v3_ScopedRoutesConfigDump_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_admin_v3_config_dump_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.admin.v3.ScopedRoutesConfigDump"); +} + +UPB_INLINE const upb_msgdef *envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_admin_v3_config_dump_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.admin.v3.ScopedRoutesConfigDump.InlineScopedRouteConfigs"); +} + +UPB_INLINE const upb_msgdef *envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfigs_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_admin_v3_config_dump_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.admin.v3.ScopedRoutesConfigDump.DynamicScopedRouteConfigs"); +} + +UPB_INLINE const upb_msgdef *envoy_admin_v3_SecretsConfigDump_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_admin_v3_config_dump_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.admin.v3.SecretsConfigDump"); +} + +UPB_INLINE const upb_msgdef *envoy_admin_v3_SecretsConfigDump_DynamicSecret_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_admin_v3_config_dump_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.admin.v3.SecretsConfigDump.DynamicSecret"); +} + +UPB_INLINE const upb_msgdef *envoy_admin_v3_SecretsConfigDump_StaticSecret_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_admin_v3_config_dump_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.admin.v3.SecretsConfigDump.StaticSecret"); +} + +UPB_INLINE const upb_msgdef *envoy_admin_v3_EndpointsConfigDump_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_admin_v3_config_dump_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.admin.v3.EndpointsConfigDump"); +} + +UPB_INLINE const upb_msgdef *envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_admin_v3_config_dump_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.admin.v3.EndpointsConfigDump.StaticEndpointConfig"); +} + +UPB_INLINE const upb_msgdef *envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_admin_v3_config_dump_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.admin.v3.EndpointsConfigDump.DynamicEndpointConfig"); +} + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#include "upb/port_undef.inc" + +#endif /* ENVOY_ADMIN_V3_CONFIG_DUMP_PROTO_UPBDEFS_H_ */ diff --git a/grpc/src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.c b/grpc/src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.c index 09292b50..d9e63439 100644 --- a/grpc/src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.c +++ b/grpc/src/core/ext/upbdefs-generated/envoy/config/accesslog/v3/accesslog.upbdefs.c @@ -14,7 +14,6 @@ extern upb_def_init envoy_config_route_v3_route_components_proto_upbdefinit; extern upb_def_init envoy_type_matcher_v3_metadata_proto_upbdefinit; extern upb_def_init envoy_type_v3_percent_proto_upbdefinit; extern upb_def_init google_protobuf_any_proto_upbdefinit; -extern upb_def_init google_protobuf_struct_proto_upbdefinit; extern upb_def_init google_protobuf_wrappers_proto_upbdefinit; extern upb_def_init udpa_annotations_status_proto_upbdefinit; extern upb_def_init udpa_annotations_versioning_proto_upbdefinit; @@ -53,7 +52,7 @@ static const upb_msglayout *layouts[15] = { &envoy_config_accesslog_v3_ExtensionFilter_msginit, }; -static const char descriptor[4418] = {'\n', ')', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '/', +static const char descriptor[4388] = {'\n', ')', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '/', 'v', '3', '/', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'p', 'r', 'o', 't', 'o', '\022', '\031', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '\032', '\037', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'b', 'a', 's', 'e', '.', 'p', 'r', @@ -62,183 +61,181 @@ static const char descriptor[4418] = {'\n', ')', 'e', 'n', 'v', 'o', 'y', '/', ' '$', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '.', 'p', 'r', 'o', 't', 'o', '\032', '\033', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'v', '3', '/', 'p', 'e', 'r', 'c', 'e', 'n', 't', '.', 'p', 'r', 'o', 't', 'o', '\032', '\031', 'g', 'o', 'o', 'g', 'l', 'e', '/', -'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'a', 'n', 'y', '.', 'p', 'r', 'o', 't', 'o', '\032', '\034', 'g', 'o', 'o', 'g', 'l', -'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 's', 't', 'r', 'u', 'c', 't', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', -'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'w', 'r', 'a', 'p', 'p', 'e', 'r', 's', '.', -'p', 'r', 'o', 't', 'o', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', -'t', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', -'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', -'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '\356', '\001', '\n', -'\t', 'A', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', -'\004', 'n', 'a', 'm', 'e', '\022', 'B', '\n', '\006', 'f', 'i', 'l', 't', 'e', 'r', '\030', '\002', ' ', '\001', '(', '\013', '2', '*', '.', 'e', +'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'a', 'n', 'y', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', 'o', 'g', 'l', +'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'w', 'r', 'a', 'p', 'p', 'e', 'r', 's', '.', 'p', 'r', 'o', 't', 'o', +'\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', +'.', 'p', 'r', 'o', 't', 'o', '\032', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', +'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', +'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '\356', '\001', '\n', '\t', 'A', 'c', 'c', 'e', +'s', 's', 'L', 'o', 'g', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', +'\022', 'B', '\n', '\006', 'f', 'i', 'l', 't', 'e', 'r', '\030', '\002', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', +'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'A', 'c', 'c', 'e', 's', +'s', 'L', 'o', 'g', 'F', 'i', 'l', 't', 'e', 'r', 'R', '\006', 'f', 'i', 'l', 't', 'e', 'r', '\022', '9', '\n', '\014', 't', 'y', 'p', +'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\004', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', +'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'H', '\000', 'R', '\013', 't', 'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', +'i', 'g', ':', '1', '\232', '\305', '\210', '\036', ',', '\n', '*', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', +'i', 'l', 't', 'e', 'r', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'A', 'c', 'c', 'e', 's', 's', +'L', 'o', 'g', 'B', '\r', '\n', '\013', 'c', 'o', 'n', 'f', 'i', 'g', '_', 't', 'y', 'p', 'e', 'J', '\004', '\010', '\003', '\020', '\004', 'R', +'\006', 'c', 'o', 'n', 'f', 'i', 'g', '\"', '\366', '\010', '\n', '\017', 'A', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 'F', 'i', 'l', 't', +'e', 'r', '\022', '[', '\n', '\022', 's', 't', 'a', 't', 'u', 's', '_', 'c', 'o', 'd', 'e', '_', 'f', 'i', 'l', 't', 'e', 'r', '\030', +'\001', ' ', '\001', '(', '\013', '2', '+', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', +'s', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'S', 't', 'a', 't', 'u', 's', 'C', 'o', 'd', 'e', 'F', 'i', 'l', 't', 'e', 'r', +'H', '\000', 'R', '\020', 's', 't', 'a', 't', 'u', 's', 'C', 'o', 'd', 'e', 'F', 'i', 'l', 't', 'e', 'r', '\022', 'T', '\n', '\017', 'd', +'u', 'r', 'a', 't', 'i', 'o', 'n', '_', 'f', 'i', 'l', 't', 'e', 'r', '\030', '\002', ' ', '\001', '(', '\013', '2', ')', '.', 'e', 'n', +'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'D', +'u', 'r', 'a', 't', 'i', 'o', 'n', 'F', 'i', 'l', 't', 'e', 'r', 'H', '\000', 'R', '\016', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', +'F', 'i', 'l', 't', 'e', 'r', '\022', 'h', '\n', '\027', 'n', 'o', 't', '_', 'h', 'e', 'a', 'l', 't', 'h', '_', 'c', 'h', 'e', 'c', +'k', '_', 'f', 'i', 'l', 't', 'e', 'r', '\030', '\003', ' ', '\001', '(', '\013', '2', '/', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', +'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'N', 'o', 't', 'H', 'e', 'a', 'l', +'t', 'h', 'C', 'h', 'e', 'c', 'k', 'F', 'i', 'l', 't', 'e', 'r', 'H', '\000', 'R', '\024', 'n', 'o', 't', 'H', 'e', 'a', 'l', 't', +'h', 'C', 'h', 'e', 'c', 'k', 'F', 'i', 'l', 't', 'e', 'r', '\022', 'W', '\n', '\020', 't', 'r', 'a', 'c', 'e', 'a', 'b', 'l', 'e', +'_', 'f', 'i', 'l', 't', 'e', 'r', '\030', '\004', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', +'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'T', 'r', 'a', 'c', 'e', 'a', 'b', 'l', +'e', 'F', 'i', 'l', 't', 'e', 'r', 'H', '\000', 'R', '\017', 't', 'r', 'a', 'c', 'e', 'a', 'b', 'l', 'e', 'F', 'i', 'l', 't', 'e', +'r', '\022', 'Q', '\n', '\016', 'r', 'u', 'n', 't', 'i', 'm', 'e', '_', 'f', 'i', 'l', 't', 'e', 'r', '\030', '\005', ' ', '\001', '(', '\013', +'2', '(', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', +'.', 'v', '3', '.', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'F', 'i', 'l', 't', 'e', 'r', 'H', '\000', 'R', '\r', 'r', 'u', 'n', 't', +'i', 'm', 'e', 'F', 'i', 'l', 't', 'e', 'r', '\022', 'E', '\n', '\n', 'a', 'n', 'd', '_', 'f', 'i', 'l', 't', 'e', 'r', '\030', '\006', +' ', '\001', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', +'s', 'l', 'o', 'g', '.', 'v', '3', '.', 'A', 'n', 'd', 'F', 'i', 'l', 't', 'e', 'r', 'H', '\000', 'R', '\t', 'a', 'n', 'd', 'F', +'i', 'l', 't', 'e', 'r', '\022', 'B', '\n', '\t', 'o', 'r', '_', 'f', 'i', 'l', 't', 'e', 'r', '\030', '\007', ' ', '\001', '(', '\013', '2', +'#', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', +'v', '3', '.', 'O', 'r', 'F', 'i', 'l', 't', 'e', 'r', 'H', '\000', 'R', '\010', 'o', 'r', 'F', 'i', 'l', 't', 'e', 'r', '\022', 'N', +'\n', '\r', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'f', 'i', 'l', 't', 'e', 'r', '\030', '\010', ' ', '\001', '(', '\013', '2', '\'', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', -'A', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 'F', 'i', 'l', 't', 'e', 'r', 'R', '\006', 'f', 'i', 'l', 't', 'e', 'r', '\022', '9', -'\n', '\014', 't', 'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\004', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', -'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'H', '\000', 'R', '\013', 't', 'y', 'p', 'e', -'d', 'C', 'o', 'n', 'f', 'i', 'g', ':', '1', '\232', '\305', '\210', '\036', ',', '\n', '*', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', -'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'A', -'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 'B', '\r', '\n', '\013', 'c', 'o', 'n', 'f', 'i', 'g', '_', 't', 'y', 'p', 'e', 'J', '\004', -'\010', '\003', '\020', '\004', 'R', '\006', 'c', 'o', 'n', 'f', 'i', 'g', '\"', '\366', '\010', '\n', '\017', 'A', 'c', 'c', 'e', 's', 's', 'L', 'o', -'g', 'F', 'i', 'l', 't', 'e', 'r', '\022', '[', '\n', '\022', 's', 't', 'a', 't', 'u', 's', '_', 'c', 'o', 'd', 'e', '_', 'f', 'i', -'l', 't', 'e', 'r', '\030', '\001', ' ', '\001', '(', '\013', '2', '+', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', -'.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'S', 't', 'a', 't', 'u', 's', 'C', 'o', 'd', 'e', 'F', -'i', 'l', 't', 'e', 'r', 'H', '\000', 'R', '\020', 's', 't', 'a', 't', 'u', 's', 'C', 'o', 'd', 'e', 'F', 'i', 'l', 't', 'e', 'r', -'\022', 'T', '\n', '\017', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', '_', 'f', 'i', 'l', 't', 'e', 'r', '\030', '\002', ' ', '\001', '(', '\013', -'2', ')', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', -'.', 'v', '3', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'F', 'i', 'l', 't', 'e', 'r', 'H', '\000', 'R', '\016', 'd', 'u', 'r', -'a', 't', 'i', 'o', 'n', 'F', 'i', 'l', 't', 'e', 'r', '\022', 'h', '\n', '\027', 'n', 'o', 't', '_', 'h', 'e', 'a', 'l', 't', 'h', -'_', 'c', 'h', 'e', 'c', 'k', '_', 'f', 'i', 'l', 't', 'e', 'r', '\030', '\003', ' ', '\001', '(', '\013', '2', '/', '.', 'e', 'n', 'v', -'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'N', 'o', -'t', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', 'F', 'i', 'l', 't', 'e', 'r', 'H', '\000', 'R', '\024', 'n', 'o', 't', -'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', 'F', 'i', 'l', 't', 'e', 'r', '\022', 'W', '\n', '\020', 't', 'r', 'a', 'c', -'e', 'a', 'b', 'l', 'e', '_', 'f', 'i', 'l', 't', 'e', 'r', '\030', '\004', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', -'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'T', 'r', 'a', -'c', 'e', 'a', 'b', 'l', 'e', 'F', 'i', 'l', 't', 'e', 'r', 'H', '\000', 'R', '\017', 't', 'r', 'a', 'c', 'e', 'a', 'b', 'l', 'e', -'F', 'i', 'l', 't', 'e', 'r', '\022', 'Q', '\n', '\016', 'r', 'u', 'n', 't', 'i', 'm', 'e', '_', 'f', 'i', 'l', 't', 'e', 'r', '\030', -'\005', ' ', '\001', '(', '\013', '2', '(', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', -'s', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'F', 'i', 'l', 't', 'e', 'r', 'H', '\000', 'R', -'\r', 'r', 'u', 'n', 't', 'i', 'm', 'e', 'F', 'i', 'l', 't', 'e', 'r', '\022', 'E', '\n', '\n', 'a', 'n', 'd', '_', 'f', 'i', 'l', -'t', 'e', 'r', '\030', '\006', ' ', '\001', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', -'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'A', 'n', 'd', 'F', 'i', 'l', 't', 'e', 'r', 'H', '\000', 'R', -'\t', 'a', 'n', 'd', 'F', 'i', 'l', 't', 'e', 'r', '\022', 'B', '\n', '\t', 'o', 'r', '_', 'f', 'i', 'l', 't', 'e', 'r', '\030', '\007', -' ', '\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', -'s', 'l', 'o', 'g', '.', 'v', '3', '.', 'O', 'r', 'F', 'i', 'l', 't', 'e', 'r', 'H', '\000', 'R', '\010', 'o', 'r', 'F', 'i', 'l', -'t', 'e', 'r', '\022', 'N', '\n', '\r', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'f', 'i', 'l', 't', 'e', 'r', '\030', '\010', ' ', '\001', '(', -'\013', '2', '\'', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', -'g', '.', 'v', '3', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'F', 'i', 'l', 't', 'e', 'r', 'H', '\000', 'R', '\014', 'h', 'e', 'a', 'd', -'e', 'r', 'F', 'i', 'l', 't', 'e', 'r', '\022', 'a', '\n', '\024', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 'f', 'l', 'a', 'g', -'_', 'f', 'i', 'l', 't', 'e', 'r', '\030', '\t', ' ', '\001', '(', '\013', '2', '-', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', -'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', -'F', 'l', 'a', 'g', 'F', 'i', 'l', 't', 'e', 'r', 'H', '\000', 'R', '\022', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', 'F', 'l', 'a', -'g', 'F', 'i', 'l', 't', 'e', 'r', '\022', '[', '\n', '\022', 'g', 'r', 'p', 'c', '_', 's', 't', 'a', 't', 'u', 's', '_', 'f', 'i', -'l', 't', 'e', 'r', '\030', '\n', ' ', '\001', '(', '\013', '2', '+', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', -'.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'G', 'r', 'p', 'c', 'S', 't', 'a', 't', 'u', 's', 'F', -'i', 'l', 't', 'e', 'r', 'H', '\000', 'R', '\020', 'g', 'r', 'p', 'c', 'S', 't', 'a', 't', 'u', 's', 'F', 'i', 'l', 't', 'e', 'r', -'\022', 'W', '\n', '\020', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '_', 'f', 'i', 'l', 't', 'e', 'r', '\030', '\013', ' ', '\001', '(', -'\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', -'g', '.', 'v', '3', '.', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'F', 'i', 'l', 't', 'e', 'r', 'H', '\000', 'R', '\017', 'e', -'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'F', 'i', 'l', 't', 'e', 'r', '\022', 'T', '\n', '\017', 'm', 'e', 't', 'a', 'd', 'a', 't', -'a', '_', 'f', 'i', 'l', 't', 'e', 'r', '\030', '\014', ' ', '\001', '(', '\013', '2', ')', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', -'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', -'a', 'F', 'i', 'l', 't', 'e', 'r', 'H', '\000', 'R', '\016', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', 'F', 'i', 'l', 't', 'e', 'r', -':', '7', '\232', '\305', '\210', '\036', '2', '\n', '0', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', -'t', 'e', 'r', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'A', 'c', 'c', 'e', 's', 's', 'L', 'o', -'g', 'F', 'i', 'l', 't', 'e', 'r', 'B', '\027', '\n', '\020', 'f', 'i', 'l', 't', 'e', 'r', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', -'e', 'r', '\022', '\003', '\370', 'B', '\001', '\"', '\357', '\001', '\n', '\020', 'C', 'o', 'm', 'p', 'a', 'r', 'i', 's', 'o', 'n', 'F', 'i', 'l', -'t', 'e', 'r', '\022', 'H', '\n', '\002', 'o', 'p', '\030', '\001', ' ', '\001', '(', '\016', '2', '.', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', -'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'C', 'o', 'm', 'p', 'a', 'r', -'i', 's', 'o', 'n', 'F', 'i', 'l', 't', 'e', 'r', '.', 'O', 'p', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\002', -'o', 'p', '\022', '9', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', -'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'U', 'I', -'n', 't', '3', '2', 'R', '\005', 'v', 'a', 'l', 'u', 'e', '\"', '\034', '\n', '\002', 'O', 'p', '\022', '\006', '\n', '\002', 'E', 'Q', '\020', '\000', -'\022', '\006', '\n', '\002', 'G', 'E', '\020', '\001', '\022', '\006', '\n', '\002', 'L', 'E', '\020', '\002', ':', '8', '\232', '\305', '\210', '\036', '3', '\n', '1', -'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'a', 'c', 'c', 'e', 's', -'s', 'l', 'o', 'g', '.', 'v', '2', '.', 'C', 'o', 'm', 'p', 'a', 'r', 'i', 's', 'o', 'n', 'F', 'i', 'l', 't', 'e', 'r', '\"', -'\243', '\001', '\n', '\020', 'S', 't', 'a', 't', 'u', 's', 'C', 'o', 'd', 'e', 'F', 'i', 'l', 't', 'e', 'r', '\022', 'U', '\n', '\n', 'c', -'o', 'm', 'p', 'a', 'r', 'i', 's', 'o', 'n', '\030', '\001', ' ', '\001', '(', '\013', '2', '+', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', -'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'C', 'o', 'm', 'p', 'a', 'r', -'i', 's', 'o', 'n', 'F', 'i', 'l', 't', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\n', 'c', 'o', 'm', -'p', 'a', 'r', 'i', 's', 'o', 'n', ':', '8', '\232', '\305', '\210', '\036', '3', '\n', '1', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', -'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'S', -'t', 'a', 't', 'u', 's', 'C', 'o', 'd', 'e', 'F', 'i', 'l', 't', 'e', 'r', '\"', '\237', '\001', '\n', '\016', 'D', 'u', 'r', 'a', 't', -'i', 'o', 'n', 'F', 'i', 'l', 't', 'e', 'r', '\022', 'U', '\n', '\n', 'c', 'o', 'm', 'p', 'a', 'r', 'i', 's', 'o', 'n', '\030', '\001', -' ', '\001', '(', '\013', '2', '+', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', -'s', 'l', 'o', 'g', '.', 'v', '3', '.', 'C', 'o', 'm', 'p', 'a', 'r', 'i', 's', 'o', 'n', 'F', 'i', 'l', 't', 'e', 'r', 'B', -'\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\n', 'c', 'o', 'm', 'p', 'a', 'r', 'i', 's', 'o', 'n', ':', '6', '\232', '\305', -'\210', '\036', '1', '\n', '/', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', -'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'F', 'i', 'l', 't', -'e', 'r', '\"', 'T', '\n', '\024', 'N', 'o', 't', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', 'F', 'i', 'l', 't', 'e', -'r', ':', '<', '\232', '\305', '\210', '\036', '7', '\n', '5', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', -'l', 't', 'e', 'r', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'N', 'o', 't', 'H', 'e', 'a', 'l', -'t', 'h', 'C', 'h', 'e', 'c', 'k', 'F', 'i', 'l', 't', 'e', 'r', '\"', 'J', '\n', '\017', 'T', 'r', 'a', 'c', 'e', 'a', 'b', 'l', -'e', 'F', 'i', 'l', 't', 'e', 'r', ':', '7', '\232', '\305', '\210', '\036', '2', '\n', '0', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', -'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'T', -'r', 'a', 'c', 'e', 'a', 'b', 'l', 'e', 'F', 'i', 'l', 't', 'e', 'r', '\"', '\371', '\001', '\n', '\r', 'R', 'u', 'n', 't', 'i', 'm', -'e', 'F', 'i', 'l', 't', 'e', 'r', '\022', '(', '\n', '\013', 'r', 'u', 'n', 't', 'i', 'm', 'e', '_', 'k', 'e', 'y', '\030', '\001', ' ', -'\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\n', 'r', 'u', 'n', 't', 'i', 'm', 'e', 'K', 'e', 'y', '\022', -'I', '\n', '\017', 'p', 'e', 'r', 'c', 'e', 'n', 't', '_', 's', 'a', 'm', 'p', 'l', 'e', 'd', '\030', '\002', ' ', '\001', '(', '\013', '2', -' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'F', 'r', 'a', 'c', 't', 'i', 'o', 'n', 'a', -'l', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', '\016', 'p', 'e', 'r', 'c', 'e', 'n', 't', 'S', 'a', 'm', 'p', 'l', 'e', 'd', '\022', -'<', '\n', '\032', 'u', 's', 'e', '_', 'i', 'n', 'd', 'e', 'p', 'e', 'n', 'd', 'e', 'n', 't', '_', 'r', 'a', 'n', 'd', 'o', 'm', -'n', 'e', 's', 's', '\030', '\003', ' ', '\001', '(', '\010', 'R', '\030', 'u', 's', 'e', 'I', 'n', 'd', 'e', 'p', 'e', 'n', 'd', 'e', 'n', -'t', 'R', 'a', 'n', 'd', 'o', 'm', 'n', 'e', 's', 's', ':', '5', '\232', '\305', '\210', '\036', '0', '\n', '.', 'e', 'n', 'v', 'o', 'y', +'H', 'e', 'a', 'd', 'e', 'r', 'F', 'i', 'l', 't', 'e', 'r', 'H', '\000', 'R', '\014', 'h', 'e', 'a', 'd', 'e', 'r', 'F', 'i', 'l', +'t', 'e', 'r', '\022', 'a', '\n', '\024', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 'f', 'l', 'a', 'g', '_', 'f', 'i', 'l', 't', +'e', 'r', '\030', '\t', ' ', '\001', '(', '\013', '2', '-', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', +'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'F', 'l', 'a', 'g', 'F', +'i', 'l', 't', 'e', 'r', 'H', '\000', 'R', '\022', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', 'F', 'l', 'a', 'g', 'F', 'i', 'l', 't', +'e', 'r', '\022', '[', '\n', '\022', 'g', 'r', 'p', 'c', '_', 's', 't', 'a', 't', 'u', 's', '_', 'f', 'i', 'l', 't', 'e', 'r', '\030', +'\n', ' ', '\001', '(', '\013', '2', '+', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', +'s', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'G', 'r', 'p', 'c', 'S', 't', 'a', 't', 'u', 's', 'F', 'i', 'l', 't', 'e', 'r', +'H', '\000', 'R', '\020', 'g', 'r', 'p', 'c', 'S', 't', 'a', 't', 'u', 's', 'F', 'i', 'l', 't', 'e', 'r', '\022', 'W', '\n', '\020', 'e', +'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '_', 'f', 'i', 'l', 't', 'e', 'r', '\030', '\013', ' ', '\001', '(', '\013', '2', '*', '.', 'e', +'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', +'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'F', 'i', 'l', 't', 'e', 'r', 'H', '\000', 'R', '\017', 'e', 'x', 't', 'e', 'n', 's', +'i', 'o', 'n', 'F', 'i', 'l', 't', 'e', 'r', '\022', 'T', '\n', '\017', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '_', 'f', 'i', 'l', +'t', 'e', 'r', '\030', '\014', ' ', '\001', '(', '\013', '2', ')', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', +'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'F', 'i', 'l', 't', +'e', 'r', 'H', '\000', 'R', '\016', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', 'F', 'i', 'l', 't', 'e', 'r', ':', '7', '\232', '\305', '\210', +'\036', '2', '\n', '0', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'a', +'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'A', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 'F', 'i', 'l', 't', +'e', 'r', 'B', '\027', '\n', '\020', 'f', 'i', 'l', 't', 'e', 'r', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', +'B', '\001', '\"', '\357', '\001', '\n', '\020', 'C', 'o', 'm', 'p', 'a', 'r', 'i', 's', 'o', 'n', 'F', 'i', 'l', 't', 'e', 'r', '\022', 'H', +'\n', '\002', 'o', 'p', '\030', '\001', ' ', '\001', '(', '\016', '2', '.', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', +'.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'C', 'o', 'm', 'p', 'a', 'r', 'i', 's', 'o', 'n', 'F', +'i', 'l', 't', 'e', 'r', '.', 'O', 'p', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\002', 'o', 'p', '\022', '9', '\n', +'\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', +'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'U', 'I', 'n', 't', '3', '2', 'R', +'\005', 'v', 'a', 'l', 'u', 'e', '\"', '\034', '\n', '\002', 'O', 'p', '\022', '\006', '\n', '\002', 'E', 'Q', '\020', '\000', '\022', '\006', '\n', '\002', 'G', +'E', '\020', '\001', '\022', '\006', '\n', '\002', 'L', 'E', '\020', '\002', ':', '8', '\232', '\305', '\210', '\036', '3', '\n', '1', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', -'v', '2', '.', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'F', 'i', 'l', 't', 'e', 'r', '\"', '\216', '\001', '\n', '\t', 'A', 'n', 'd', 'F', -'i', 'l', 't', 'e', 'r', '\022', 'N', '\n', '\007', 'f', 'i', 'l', 't', 'e', 'r', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '*', '.', -'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', -'.', 'A', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 'F', 'i', 'l', 't', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', -'\002', 'R', '\007', 'f', 'i', 'l', 't', 'e', 'r', 's', ':', '1', '\232', '\305', '\210', '\036', ',', '\n', '*', 'e', 'n', 'v', 'o', 'y', '.', -'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', -'2', '.', 'A', 'n', 'd', 'F', 'i', 'l', 't', 'e', 'r', '\"', '\214', '\001', '\n', '\010', 'O', 'r', 'F', 'i', 'l', 't', 'e', 'r', '\022', -'N', '\n', '\007', 'f', 'i', 'l', 't', 'e', 'r', 's', '\030', '\002', ' ', '\003', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', -'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'A', 'c', 'c', 'e', 's', -'s', 'L', 'o', 'g', 'F', 'i', 'l', 't', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\002', 'R', '\007', 'f', 'i', 'l', -'t', 'e', 'r', 's', ':', '0', '\232', '\305', '\210', '\036', '+', '\n', ')', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', -'.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'O', 'r', 'F', 'i', -'l', 't', 'e', 'r', '\"', '\214', '\001', '\n', '\014', 'H', 'e', 'a', 'd', 'e', 'r', 'F', 'i', 'l', 't', 'e', 'r', '\022', 'F', '\n', '\006', -'h', 'e', 'a', 'd', 'e', 'r', '\030', '\001', ' ', '\001', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', -'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'M', 'a', 't', 'c', 'h', 'e', 'r', -'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\006', 'h', 'e', 'a', 'd', 'e', 'r', ':', '4', '\232', '\305', '\210', '\036', '/', -'\n', '-', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'a', 'c', 'c', -'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'F', 'i', 'l', 't', 'e', 'r', '\"', '\334', '\001', -'\n', '\022', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'F', 'l', 'a', 'g', 'F', 'i', 'l', 't', 'e', 'r', '\022', '\211', '\001', '\n', '\005', -'f', 'l', 'a', 'g', 's', '\030', '\001', ' ', '\003', '(', '\t', 'B', 's', '\372', 'B', 'p', '\222', '\001', 'm', '\"', 'k', 'r', 'i', 'R', '\002', -'L', 'H', 'R', '\002', 'U', 'H', 'R', '\002', 'U', 'T', 'R', '\002', 'L', 'R', 'R', '\002', 'U', 'R', 'R', '\002', 'U', 'F', 'R', '\002', 'U', -'C', 'R', '\002', 'U', 'O', 'R', '\002', 'N', 'R', 'R', '\002', 'D', 'I', 'R', '\002', 'F', 'I', 'R', '\002', 'R', 'L', 'R', '\004', 'U', 'A', -'E', 'X', 'R', '\004', 'R', 'L', 'S', 'E', 'R', '\002', 'D', 'C', 'R', '\003', 'U', 'R', 'X', 'R', '\002', 'S', 'I', 'R', '\002', 'I', 'H', -'R', '\003', 'D', 'P', 'E', 'R', '\005', 'U', 'M', 'S', 'D', 'R', 'R', '\004', 'R', 'F', 'C', 'F', 'R', '\004', 'N', 'F', 'C', 'F', 'R', -'\002', 'D', 'T', 'R', '\005', 'f', 'l', 'a', 'g', 's', ':', ':', '\232', '\305', '\210', '\036', '5', '\n', '3', 'e', 'n', 'v', 'o', 'y', '.', -'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', -'2', '.', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'F', 'l', 'a', 'g', 'F', 'i', 'l', 't', 'e', 'r', '\"', '\200', '\004', '\n', '\020', -'G', 'r', 'p', 'c', 'S', 't', 'a', 't', 'u', 's', 'F', 'i', 'l', 't', 'e', 'r', '\022', ']', '\n', '\010', 's', 't', 'a', 't', 'u', -'s', 'e', 's', '\030', '\001', ' ', '\003', '(', '\016', '2', '2', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', -'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'G', 'r', 'p', 'c', 'S', 't', 'a', 't', 'u', 's', 'F', 'i', -'l', 't', 'e', 'r', '.', 'S', 't', 'a', 't', 'u', 's', 'B', '\r', '\372', 'B', '\n', '\222', '\001', '\007', '\"', '\005', '\202', '\001', '\002', '\020', -'\001', 'R', '\010', 's', 't', 'a', 't', 'u', 's', 'e', 's', '\022', '\030', '\n', '\007', 'e', 'x', 'c', 'l', 'u', 'd', 'e', '\030', '\002', ' ', -'\001', '(', '\010', 'R', '\007', 'e', 'x', 'c', 'l', 'u', 'd', 'e', '\"', '\270', '\002', '\n', '\006', 'S', 't', 'a', 't', 'u', 's', '\022', '\006', -'\n', '\002', 'O', 'K', '\020', '\000', '\022', '\014', '\n', '\010', 'C', 'A', 'N', 'C', 'E', 'L', 'E', 'D', '\020', '\001', '\022', '\013', '\n', '\007', 'U', -'N', 'K', 'N', 'O', 'W', 'N', '\020', '\002', '\022', '\024', '\n', '\020', 'I', 'N', 'V', 'A', 'L', 'I', 'D', '_', 'A', 'R', 'G', 'U', 'M', -'E', 'N', 'T', '\020', '\003', '\022', '\025', '\n', '\021', 'D', 'E', 'A', 'D', 'L', 'I', 'N', 'E', '_', 'E', 'X', 'C', 'E', 'E', 'D', 'E', -'D', '\020', '\004', '\022', '\r', '\n', '\t', 'N', 'O', 'T', '_', 'F', 'O', 'U', 'N', 'D', '\020', '\005', '\022', '\022', '\n', '\016', 'A', 'L', 'R', -'E', 'A', 'D', 'Y', '_', 'E', 'X', 'I', 'S', 'T', 'S', '\020', '\006', '\022', '\025', '\n', '\021', 'P', 'E', 'R', 'M', 'I', 'S', 'S', 'I', -'O', 'N', '_', 'D', 'E', 'N', 'I', 'E', 'D', '\020', '\007', '\022', '\026', '\n', '\022', 'R', 'E', 'S', 'O', 'U', 'R', 'C', 'E', '_', 'E', -'X', 'H', 'A', 'U', 'S', 'T', 'E', 'D', '\020', '\010', '\022', '\027', '\n', '\023', 'F', 'A', 'I', 'L', 'E', 'D', '_', 'P', 'R', 'E', 'C', -'O', 'N', 'D', 'I', 'T', 'I', 'O', 'N', '\020', '\t', '\022', '\013', '\n', '\007', 'A', 'B', 'O', 'R', 'T', 'E', 'D', '\020', '\n', '\022', '\020', -'\n', '\014', 'O', 'U', 'T', '_', 'O', 'F', '_', 'R', 'A', 'N', 'G', 'E', '\020', '\013', '\022', '\021', '\n', '\r', 'U', 'N', 'I', 'M', 'P', -'L', 'E', 'M', 'E', 'N', 'T', 'E', 'D', '\020', '\014', '\022', '\014', '\n', '\010', 'I', 'N', 'T', 'E', 'R', 'N', 'A', 'L', '\020', '\r', '\022', -'\017', '\n', '\013', 'U', 'N', 'A', 'V', 'A', 'I', 'L', 'A', 'B', 'L', 'E', '\020', '\016', '\022', '\r', '\n', '\t', 'D', 'A', 'T', 'A', '_', -'L', 'O', 'S', 'S', '\020', '\017', '\022', '\023', '\n', '\017', 'U', 'N', 'A', 'U', 'T', 'H', 'E', 'N', 'T', 'I', 'C', 'A', 'T', 'E', 'D', -'\020', '\020', ':', '8', '\232', '\305', '\210', '\036', '3', '\n', '1', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', -'i', 'l', 't', 'e', 'r', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'G', 'r', 'p', 'c', 'S', 't', -'a', 't', 'u', 's', 'F', 'i', 'l', 't', 'e', 'r', '\"', '\332', '\001', '\n', '\016', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'F', 'i', -'l', 't', 'e', 'r', '\022', '@', '\n', '\007', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\030', '\001', ' ', '\001', '(', '\013', '2', '&', '.', 'e', -'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'e', 't', 'a', -'d', 'a', 't', 'a', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'R', '\007', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\022', 'N', '\n', '\026', 'm', -'a', 't', 'c', 'h', '_', 'i', 'f', '_', 'k', 'e', 'y', '_', 'n', 'o', 't', '_', 'f', 'o', 'u', 'n', 'd', '\030', '\002', ' ', '\001', -'(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', -'V', 'a', 'l', 'u', 'e', 'R', '\022', 'm', 'a', 't', 'c', 'h', 'I', 'f', 'K', 'e', 'y', 'N', 'o', 't', 'F', 'o', 'u', 'n', 'd', -':', '6', '\232', '\305', '\210', '\036', '1', '\n', '/', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', -'t', 'e', 'r', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', -'F', 'i', 'l', 't', 'e', 'r', '\"', '\266', '\001', '\n', '\017', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'F', 'i', 'l', 't', 'e', -'r', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '9', '\n', '\014', -'t', 'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\003', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', -'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'H', '\000', 'R', '\013', 't', 'y', 'p', 'e', 'd', 'C', -'o', 'n', 'f', 'i', 'g', ':', '7', '\232', '\305', '\210', '\036', '2', '\n', '0', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', -'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'E', 'x', 't', -'e', 'n', 's', 'i', 'o', 'n', 'F', 'i', 'l', 't', 'e', 'r', 'B', '\r', '\n', '\013', 'c', 'o', 'n', 'f', 'i', 'g', '_', 't', 'y', -'p', 'e', 'J', '\004', '\010', '\002', '\020', '\003', 'R', '\006', 'c', 'o', 'n', 'f', 'i', 'g', 'B', 'C', '\n', '\'', 'i', 'o', '.', 'e', 'n', -'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', -'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', 'B', '\016', 'A', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', 'P', 'r', 'o', 't', 'o', -'P', '\001', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +'v', '2', '.', 'C', 'o', 'm', 'p', 'a', 'r', 'i', 's', 'o', 'n', 'F', 'i', 'l', 't', 'e', 'r', '\"', '\243', '\001', '\n', '\020', 'S', +'t', 'a', 't', 'u', 's', 'C', 'o', 'd', 'e', 'F', 'i', 'l', 't', 'e', 'r', '\022', 'U', '\n', '\n', 'c', 'o', 'm', 'p', 'a', 'r', +'i', 's', 'o', 'n', '\030', '\001', ' ', '\001', '(', '\013', '2', '+', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', +'.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'C', 'o', 'm', 'p', 'a', 'r', 'i', 's', 'o', 'n', 'F', +'i', 'l', 't', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\n', 'c', 'o', 'm', 'p', 'a', 'r', 'i', 's', +'o', 'n', ':', '8', '\232', '\305', '\210', '\036', '3', '\n', '1', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', +'i', 'l', 't', 'e', 'r', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'S', 't', 'a', 't', 'u', 's', +'C', 'o', 'd', 'e', 'F', 'i', 'l', 't', 'e', 'r', '\"', '\237', '\001', '\n', '\016', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'F', 'i', +'l', 't', 'e', 'r', '\022', 'U', '\n', '\n', 'c', 'o', 'm', 'p', 'a', 'r', 'i', 's', 'o', 'n', '\030', '\001', ' ', '\001', '(', '\013', '2', +'+', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', +'v', '3', '.', 'C', 'o', 'm', 'p', 'a', 'r', 'i', 's', 'o', 'n', 'F', 'i', 'l', 't', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\212', +'\001', '\002', '\020', '\001', 'R', '\n', 'c', 'o', 'm', 'p', 'a', 'r', 'i', 's', 'o', 'n', ':', '6', '\232', '\305', '\210', '\036', '1', '\n', '/', +'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'a', 'c', 'c', 'e', 's', +'s', 'l', 'o', 'g', '.', 'v', '2', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'F', 'i', 'l', 't', 'e', 'r', '\"', 'T', '\n', +'\024', 'N', 'o', 't', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', 'F', 'i', 'l', 't', 'e', 'r', ':', '<', '\232', '\305', +'\210', '\036', '7', '\n', '5', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', +'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'N', 'o', 't', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', +'c', 'k', 'F', 'i', 'l', 't', 'e', 'r', '\"', 'J', '\n', '\017', 'T', 'r', 'a', 'c', 'e', 'a', 'b', 'l', 'e', 'F', 'i', 'l', 't', +'e', 'r', ':', '7', '\232', '\305', '\210', '\036', '2', '\n', '0', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', +'i', 'l', 't', 'e', 'r', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'T', 'r', 'a', 'c', 'e', 'a', +'b', 'l', 'e', 'F', 'i', 'l', 't', 'e', 'r', '\"', '\371', '\001', '\n', '\r', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'F', 'i', 'l', 't', +'e', 'r', '\022', '(', '\n', '\013', 'r', 'u', 'n', 't', 'i', 'm', 'e', '_', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', +'\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\n', 'r', 'u', 'n', 't', 'i', 'm', 'e', 'K', 'e', 'y', '\022', 'I', '\n', '\017', 'p', 'e', +'r', 'c', 'e', 'n', 't', '_', 's', 'a', 'm', 'p', 'l', 'e', 'd', '\030', '\002', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', +'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'F', 'r', 'a', 'c', 't', 'i', 'o', 'n', 'a', 'l', 'P', 'e', 'r', 'c', +'e', 'n', 't', 'R', '\016', 'p', 'e', 'r', 'c', 'e', 'n', 't', 'S', 'a', 'm', 'p', 'l', 'e', 'd', '\022', '<', '\n', '\032', 'u', 's', +'e', '_', 'i', 'n', 'd', 'e', 'p', 'e', 'n', 'd', 'e', 'n', 't', '_', 'r', 'a', 'n', 'd', 'o', 'm', 'n', 'e', 's', 's', '\030', +'\003', ' ', '\001', '(', '\010', 'R', '\030', 'u', 's', 'e', 'I', 'n', 'd', 'e', 'p', 'e', 'n', 'd', 'e', 'n', 't', 'R', 'a', 'n', 'd', +'o', 'm', 'n', 'e', 's', 's', ':', '5', '\232', '\305', '\210', '\036', '0', '\n', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', +'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'R', 'u', +'n', 't', 'i', 'm', 'e', 'F', 'i', 'l', 't', 'e', 'r', '\"', '\216', '\001', '\n', '\t', 'A', 'n', 'd', 'F', 'i', 'l', 't', 'e', 'r', +'\022', 'N', '\n', '\007', 'f', 'i', 'l', 't', 'e', 'r', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', +'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'A', 'c', 'c', 'e', +'s', 's', 'L', 'o', 'g', 'F', 'i', 'l', 't', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\002', 'R', '\007', 'f', 'i', +'l', 't', 'e', 'r', 's', ':', '1', '\232', '\305', '\210', '\036', ',', '\n', '*', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', +'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'A', 'n', 'd', +'F', 'i', 'l', 't', 'e', 'r', '\"', '\214', '\001', '\n', '\010', 'O', 'r', 'F', 'i', 'l', 't', 'e', 'r', '\022', 'N', '\n', '\007', 'f', 'i', +'l', 't', 'e', 'r', 's', '\030', '\002', ' ', '\003', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', +'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'A', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 'F', +'i', 'l', 't', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\002', 'R', '\007', 'f', 'i', 'l', 't', 'e', 'r', 's', ':', +'0', '\232', '\305', '\210', '\036', '+', '\n', ')', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', +'e', 'r', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'O', 'r', 'F', 'i', 'l', 't', 'e', 'r', '\"', +'\214', '\001', '\n', '\014', 'H', 'e', 'a', 'd', 'e', 'r', 'F', 'i', 'l', 't', 'e', 'r', '\022', 'F', '\n', '\006', 'h', 'e', 'a', 'd', 'e', +'r', '\030', '\001', ' ', '\001', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', +'u', 't', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '\010', '\372', 'B', '\005', +'\212', '\001', '\002', '\020', '\001', 'R', '\006', 'h', 'e', 'a', 'd', 'e', 'r', ':', '4', '\232', '\305', '\210', '\036', '/', '\n', '-', 'e', 'n', 'v', +'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', +'g', '.', 'v', '2', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'F', 'i', 'l', 't', 'e', 'r', '\"', '\334', '\001', '\n', '\022', 'R', 'e', 's', +'p', 'o', 'n', 's', 'e', 'F', 'l', 'a', 'g', 'F', 'i', 'l', 't', 'e', 'r', '\022', '\211', '\001', '\n', '\005', 'f', 'l', 'a', 'g', 's', +'\030', '\001', ' ', '\003', '(', '\t', 'B', 's', '\372', 'B', 'p', '\222', '\001', 'm', '\"', 'k', 'r', 'i', 'R', '\002', 'L', 'H', 'R', '\002', 'U', +'H', 'R', '\002', 'U', 'T', 'R', '\002', 'L', 'R', 'R', '\002', 'U', 'R', 'R', '\002', 'U', 'F', 'R', '\002', 'U', 'C', 'R', '\002', 'U', 'O', +'R', '\002', 'N', 'R', 'R', '\002', 'D', 'I', 'R', '\002', 'F', 'I', 'R', '\002', 'R', 'L', 'R', '\004', 'U', 'A', 'E', 'X', 'R', '\004', 'R', +'L', 'S', 'E', 'R', '\002', 'D', 'C', 'R', '\003', 'U', 'R', 'X', 'R', '\002', 'S', 'I', 'R', '\002', 'I', 'H', 'R', '\003', 'D', 'P', 'E', +'R', '\005', 'U', 'M', 'S', 'D', 'R', 'R', '\004', 'R', 'F', 'C', 'F', 'R', '\004', 'N', 'F', 'C', 'F', 'R', '\002', 'D', 'T', 'R', '\005', +'f', 'l', 'a', 'g', 's', ':', ':', '\232', '\305', '\210', '\036', '5', '\n', '3', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', +'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'R', 'e', 's', +'p', 'o', 'n', 's', 'e', 'F', 'l', 'a', 'g', 'F', 'i', 'l', 't', 'e', 'r', '\"', '\200', '\004', '\n', '\020', 'G', 'r', 'p', 'c', 'S', +'t', 'a', 't', 'u', 's', 'F', 'i', 'l', 't', 'e', 'r', '\022', ']', '\n', '\010', 's', 't', 'a', 't', 'u', 's', 'e', 's', '\030', '\001', +' ', '\003', '(', '\016', '2', '2', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', +'s', 'l', 'o', 'g', '.', 'v', '3', '.', 'G', 'r', 'p', 'c', 'S', 't', 'a', 't', 'u', 's', 'F', 'i', 'l', 't', 'e', 'r', '.', +'S', 't', 'a', 't', 'u', 's', 'B', '\r', '\372', 'B', '\n', '\222', '\001', '\007', '\"', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\010', 's', 't', +'a', 't', 'u', 's', 'e', 's', '\022', '\030', '\n', '\007', 'e', 'x', 'c', 'l', 'u', 'd', 'e', '\030', '\002', ' ', '\001', '(', '\010', 'R', '\007', +'e', 'x', 'c', 'l', 'u', 'd', 'e', '\"', '\270', '\002', '\n', '\006', 'S', 't', 'a', 't', 'u', 's', '\022', '\006', '\n', '\002', 'O', 'K', '\020', +'\000', '\022', '\014', '\n', '\010', 'C', 'A', 'N', 'C', 'E', 'L', 'E', 'D', '\020', '\001', '\022', '\013', '\n', '\007', 'U', 'N', 'K', 'N', 'O', 'W', +'N', '\020', '\002', '\022', '\024', '\n', '\020', 'I', 'N', 'V', 'A', 'L', 'I', 'D', '_', 'A', 'R', 'G', 'U', 'M', 'E', 'N', 'T', '\020', '\003', +'\022', '\025', '\n', '\021', 'D', 'E', 'A', 'D', 'L', 'I', 'N', 'E', '_', 'E', 'X', 'C', 'E', 'E', 'D', 'E', 'D', '\020', '\004', '\022', '\r', +'\n', '\t', 'N', 'O', 'T', '_', 'F', 'O', 'U', 'N', 'D', '\020', '\005', '\022', '\022', '\n', '\016', 'A', 'L', 'R', 'E', 'A', 'D', 'Y', '_', +'E', 'X', 'I', 'S', 'T', 'S', '\020', '\006', '\022', '\025', '\n', '\021', 'P', 'E', 'R', 'M', 'I', 'S', 'S', 'I', 'O', 'N', '_', 'D', 'E', +'N', 'I', 'E', 'D', '\020', '\007', '\022', '\026', '\n', '\022', 'R', 'E', 'S', 'O', 'U', 'R', 'C', 'E', '_', 'E', 'X', 'H', 'A', 'U', 'S', +'T', 'E', 'D', '\020', '\010', '\022', '\027', '\n', '\023', 'F', 'A', 'I', 'L', 'E', 'D', '_', 'P', 'R', 'E', 'C', 'O', 'N', 'D', 'I', 'T', +'I', 'O', 'N', '\020', '\t', '\022', '\013', '\n', '\007', 'A', 'B', 'O', 'R', 'T', 'E', 'D', '\020', '\n', '\022', '\020', '\n', '\014', 'O', 'U', 'T', +'_', 'O', 'F', '_', 'R', 'A', 'N', 'G', 'E', '\020', '\013', '\022', '\021', '\n', '\r', 'U', 'N', 'I', 'M', 'P', 'L', 'E', 'M', 'E', 'N', +'T', 'E', 'D', '\020', '\014', '\022', '\014', '\n', '\010', 'I', 'N', 'T', 'E', 'R', 'N', 'A', 'L', '\020', '\r', '\022', '\017', '\n', '\013', 'U', 'N', +'A', 'V', 'A', 'I', 'L', 'A', 'B', 'L', 'E', '\020', '\016', '\022', '\r', '\n', '\t', 'D', 'A', 'T', 'A', '_', 'L', 'O', 'S', 'S', '\020', +'\017', '\022', '\023', '\n', '\017', 'U', 'N', 'A', 'U', 'T', 'H', 'E', 'N', 'T', 'I', 'C', 'A', 'T', 'E', 'D', '\020', '\020', ':', '8', '\232', +'\305', '\210', '\036', '3', '\n', '1', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', +'.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'G', 'r', 'p', 'c', 'S', 't', 'a', 't', 'u', 's', 'F', +'i', 'l', 't', 'e', 'r', '\"', '\332', '\001', '\n', '\016', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'F', 'i', 'l', 't', 'e', 'r', '\022', +'@', '\n', '\007', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\030', '\001', ' ', '\001', '(', '\013', '2', '&', '.', 'e', 'n', 'v', 'o', 'y', '.', +'t', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'M', +'a', 't', 'c', 'h', 'e', 'r', 'R', '\007', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\022', 'N', '\n', '\026', 'm', 'a', 't', 'c', 'h', '_', +'i', 'f', '_', 'k', 'e', 'y', '_', 'n', 'o', 't', '_', 'f', 'o', 'u', 'n', 'd', '\030', '\002', ' ', '\001', '(', '\013', '2', '\032', '.', +'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', +'R', '\022', 'm', 'a', 't', 'c', 'h', 'I', 'f', 'K', 'e', 'y', 'N', 'o', 't', 'F', 'o', 'u', 'n', 'd', ':', '6', '\232', '\305', '\210', +'\036', '1', '\n', '/', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'a', +'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'F', 'i', 'l', 't', 'e', +'r', '\"', '\266', '\001', '\n', '\017', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'F', 'i', 'l', 't', 'e', 'r', '\022', '\022', '\n', '\004', +'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '9', '\n', '\014', 't', 'y', 'p', 'e', 'd', +'_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\003', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', +'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'H', '\000', 'R', '\013', 't', 'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', +':', '7', '\232', '\305', '\210', '\036', '2', '\n', '0', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', +'t', 'e', 'r', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '2', '.', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', +'n', 'F', 'i', 'l', 't', 'e', 'r', 'B', '\r', '\n', '\013', 'c', 'o', 'n', 'f', 'i', 'g', '_', 't', 'y', 'p', 'e', 'J', '\004', '\010', +'\002', '\020', '\003', 'R', '\006', 'c', 'o', 'n', 'f', 'i', 'g', 'B', 'C', '\n', '\'', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', +'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', +'g', '.', 'v', '3', 'B', '\016', 'A', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', 'P', 'r', 'o', 't', 'o', 'P', '\001', '\272', '\200', '\310', +'\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; -static upb_def_init *deps[11] = { +static upb_def_init *deps[10] = { &envoy_config_core_v3_base_proto_upbdefinit, &envoy_config_route_v3_route_components_proto_upbdefinit, &envoy_type_matcher_v3_metadata_proto_upbdefinit, &envoy_type_v3_percent_proto_upbdefinit, &google_protobuf_any_proto_upbdefinit, - &google_protobuf_struct_proto_upbdefinit, &google_protobuf_wrappers_proto_upbdefinit, &udpa_annotations_status_proto_upbdefinit, &udpa_annotations_versioning_proto_upbdefinit, @@ -250,5 +247,5 @@ upb_def_init envoy_config_accesslog_v3_accesslog_proto_upbdefinit = { deps, layouts, "envoy/config/accesslog/v3/accesslog.proto", - UPB_STRVIEW_INIT(descriptor, 4418) + UPB_STRVIEW_INIT(descriptor, 4388) }; diff --git a/grpc/src/core/ext/upbdefs-generated/envoy/config/bootstrap/v3/bootstrap.upbdefs.c b/grpc/src/core/ext/upbdefs-generated/envoy/config/bootstrap/v3/bootstrap.upbdefs.c new file mode 100644 index 00000000..f86bfe76 --- /dev/null +++ b/grpc/src/core/ext/upbdefs-generated/envoy/config/bootstrap/v3/bootstrap.upbdefs.c @@ -0,0 +1,383 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * envoy/config/bootstrap/v3/bootstrap.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#include "upb/def.h" +#include "envoy/config/bootstrap/v3/bootstrap.upbdefs.h" + +extern upb_def_init envoy_config_cluster_v3_cluster_proto_upbdefinit; +extern upb_def_init envoy_config_core_v3_address_proto_upbdefinit; +extern upb_def_init envoy_config_core_v3_base_proto_upbdefinit; +extern upb_def_init envoy_config_core_v3_config_source_proto_upbdefinit; +extern upb_def_init envoy_config_core_v3_event_service_config_proto_upbdefinit; +extern upb_def_init envoy_config_core_v3_extension_proto_upbdefinit; +extern upb_def_init envoy_config_core_v3_socket_option_proto_upbdefinit; +extern upb_def_init envoy_config_listener_v3_listener_proto_upbdefinit; +extern upb_def_init envoy_config_metrics_v3_stats_proto_upbdefinit; +extern upb_def_init envoy_config_overload_v3_overload_proto_upbdefinit; +extern upb_def_init envoy_config_trace_v3_http_tracer_proto_upbdefinit; +extern upb_def_init envoy_extensions_transport_sockets_tls_v3_secret_proto_upbdefinit; +extern upb_def_init envoy_type_v3_percent_proto_upbdefinit; +extern upb_def_init google_protobuf_duration_proto_upbdefinit; +extern upb_def_init google_protobuf_struct_proto_upbdefinit; +extern upb_def_init google_protobuf_wrappers_proto_upbdefinit; +extern upb_def_init udpa_annotations_migrate_proto_upbdefinit; +extern upb_def_init udpa_annotations_security_proto_upbdefinit; +extern upb_def_init udpa_annotations_status_proto_upbdefinit; +extern upb_def_init udpa_annotations_versioning_proto_upbdefinit; +extern upb_def_init validate_validate_proto_upbdefinit; +extern const upb_msglayout envoy_config_bootstrap_v3_Bootstrap_msginit; +extern const upb_msglayout envoy_config_bootstrap_v3_Bootstrap_StaticResources_msginit; +extern const upb_msglayout envoy_config_bootstrap_v3_Bootstrap_DynamicResources_msginit; +extern const upb_msglayout envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry_msginit; +extern const upb_msglayout envoy_config_bootstrap_v3_Admin_msginit; +extern const upb_msglayout envoy_config_bootstrap_v3_ClusterManager_msginit; +extern const upb_msglayout envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_msginit; +extern const upb_msglayout envoy_config_bootstrap_v3_Watchdogs_msginit; +extern const upb_msglayout envoy_config_bootstrap_v3_Watchdog_msginit; +extern const upb_msglayout envoy_config_bootstrap_v3_Watchdog_WatchdogAction_msginit; +extern const upb_msglayout envoy_config_bootstrap_v3_FatalAction_msginit; +extern const upb_msglayout envoy_config_bootstrap_v3_Runtime_msginit; +extern const upb_msglayout envoy_config_bootstrap_v3_RuntimeLayer_msginit; +extern const upb_msglayout envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_msginit; +extern const upb_msglayout envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer_msginit; +extern const upb_msglayout envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_msginit; +extern const upb_msglayout envoy_config_bootstrap_v3_LayeredRuntime_msginit; + +static const upb_msglayout *layouts[17] = { + &envoy_config_bootstrap_v3_Bootstrap_msginit, + &envoy_config_bootstrap_v3_Bootstrap_StaticResources_msginit, + &envoy_config_bootstrap_v3_Bootstrap_DynamicResources_msginit, + &envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry_msginit, + &envoy_config_bootstrap_v3_Admin_msginit, + &envoy_config_bootstrap_v3_ClusterManager_msginit, + &envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_msginit, + &envoy_config_bootstrap_v3_Watchdogs_msginit, + &envoy_config_bootstrap_v3_Watchdog_msginit, + &envoy_config_bootstrap_v3_Watchdog_WatchdogAction_msginit, + &envoy_config_bootstrap_v3_FatalAction_msginit, + &envoy_config_bootstrap_v3_Runtime_msginit, + &envoy_config_bootstrap_v3_RuntimeLayer_msginit, + &envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_msginit, + &envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer_msginit, + &envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_msginit, + &envoy_config_bootstrap_v3_LayeredRuntime_msginit, +}; + +static const char descriptor[6993] = {'\n', ')', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '/', +'v', '3', '/', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'p', 'r', 'o', 't', 'o', '\022', '\031', 'e', 'n', 'v', 'o', 'y', +'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'v', '3', '\032', '%', 'e', 'n', 'v', +'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'l', 'u', 's', 't', 'e', 'r', '/', 'v', '3', '/', 'c', 'l', 'u', 's', +'t', 'e', 'r', '.', 'p', 'r', 'o', 't', 'o', '\032', '\"', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', +'o', 'r', 'e', '/', 'v', '3', '/', 'a', 'd', 'd', 'r', 'e', 's', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '\037', 'e', 'n', 'v', +'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'b', 'a', 's', 'e', '.', 'p', 'r', +'o', 't', 'o', '\032', '(', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', +'/', 'c', 'o', 'n', 'f', 'i', 'g', '_', 's', 'o', 'u', 'r', 'c', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', '/', 'e', 'n', 'v', +'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'e', 'v', 'e', 'n', 't', '_', 's', +'e', 'r', 'v', 'i', 'c', 'e', '_', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '$', 'e', 'n', 'v', 'o', +'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', +'n', '.', 'p', 'r', 'o', 't', 'o', '\032', '(', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', +'e', '/', 'v', '3', '/', 's', 'o', 'c', 'k', 'e', 't', '_', 'o', 'p', 't', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\032', +'\'', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '/', 'v', '3', +'/', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'p', 'r', 'o', 't', 'o', '\032', '#', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', +'n', 'f', 'i', 'g', '/', 'm', 'e', 't', 'r', 'i', 'c', 's', '/', 'v', '3', '/', 's', 't', 'a', 't', 's', '.', 'p', 'r', 'o', +'t', 'o', '\032', '\'', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'o', 'v', 'e', 'r', 'l', 'o', 'a', 'd', +'/', 'v', '3', '/', 'o', 'v', 'e', 'r', 'l', 'o', 'a', 'd', '.', 'p', 'r', 'o', 't', 'o', '\032', '\'', 'e', 'n', 'v', 'o', 'y', +'/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 't', 'r', 'a', 'c', 'e', '/', 'v', '3', '/', 'h', 't', 't', 'p', '_', 't', 'r', 'a', +'c', 'e', 'r', '.', 'p', 'r', 'o', 't', 'o', '\032', '6', 'e', 'n', 'v', 'o', 'y', '/', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', +'n', 's', '/', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '/', 't', 'l', 's', '/', +'v', '3', '/', 's', 'e', 'c', 'r', 'e', 't', '.', 'p', 'r', 'o', 't', 'o', '\032', '\033', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', +'p', 'e', '/', 'v', '3', '/', 'p', 'e', 'r', 'c', 'e', 'n', 't', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', 'o', 'g', +'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', +'o', '\032', '\034', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 's', 't', 'r', 'u', 'c', 't', +'.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'w', +'r', 'a', 'p', 'p', 'e', 'r', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', +'a', 't', 'i', 'o', 'n', 's', '/', 'm', 'i', 'g', 'r', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', '\037', 'u', 'd', 'p', +'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 'e', 'c', 'u', 'r', 'i', 't', 'y', '.', 'p', 'r', +'o', 't', 'o', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', +'t', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', +'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', 'l', 'i', +'d', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '\341', '\026', '\n', '\t', 'B', +'o', 'o', 't', 's', 't', 'r', 'a', 'p', '\022', '.', '\n', '\004', 'n', 'o', 'd', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '\032', '.', +'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'N', 'o', 'd', 'e', +'R', '\004', 'n', 'o', 'd', 'e', '\022', '.', '\n', '\023', 'n', 'o', 'd', 'e', '_', 'c', 'o', 'n', 't', 'e', 'x', 't', '_', 'p', 'a', +'r', 'a', 'm', 's', '\030', '\032', ' ', '\003', '(', '\t', 'R', '\021', 'n', 'o', 'd', 'e', 'C', 'o', 'n', 't', 'e', 'x', 't', 'P', 'a', +'r', 'a', 'm', 's', '\022', '_', '\n', '\020', 's', 't', 'a', 't', 'i', 'c', '_', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', 's', '\030', +'\002', ' ', '\001', '(', '\013', '2', '4', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', +'s', 't', 'r', 'a', 'p', '.', 'v', '3', '.', 'B', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'S', 't', 'a', 't', 'i', 'c', +'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', 's', 'R', '\017', 's', 't', 'a', 't', 'i', 'c', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', +'s', '\022', 'b', '\n', '\021', 'd', 'y', 'n', 'a', 'm', 'i', 'c', '_', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', 's', '\030', '\003', ' ', +'\001', '(', '\013', '2', '5', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', +'r', 'a', 'p', '.', 'v', '3', '.', 'B', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'D', 'y', 'n', 'a', 'm', 'i', 'c', 'R', +'e', 's', 'o', 'u', 'r', 'c', 'e', 's', 'R', '\020', 'd', 'y', 'n', 'a', 'm', 'i', 'c', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', +'s', '\022', 'R', '\n', '\017', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '\030', '\004', ' ', '\001', '(', +'\013', '2', ')', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', +'p', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', 'M', 'a', 'n', 'a', 'g', 'e', 'r', 'R', '\016', 'c', 'l', 'u', 's', +'t', 'e', 'r', 'M', 'a', 'n', 'a', 'g', 'e', 'r', '\022', 'D', '\n', '\n', 'h', 'd', 's', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', +'\016', ' ', '\001', '(', '\013', '2', '%', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', +'.', 'v', '3', '.', 'A', 'p', 'i', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', 'R', '\t', 'h', 'd', 's', 'C', +'o', 'n', 'f', 'i', 'g', '\022', '\035', '\n', '\n', 'f', 'l', 'a', 'g', 's', '_', 'p', 'a', 't', 'h', '\030', '\005', ' ', '\001', '(', '\t', +'R', '\t', 'f', 'l', 'a', 'g', 's', 'P', 'a', 't', 'h', '\022', 'C', '\n', '\013', 's', 't', 'a', 't', 's', '_', 's', 'i', 'n', 'k', +'s', '\030', '\006', ' ', '\003', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'm', 'e', +'t', 'r', 'i', 'c', 's', '.', 'v', '3', '.', 'S', 't', 'a', 't', 's', 'S', 'i', 'n', 'k', 'R', '\n', 's', 't', 'a', 't', 's', +'S', 'i', 'n', 'k', 's', '\022', 'G', '\n', '\014', 's', 't', 'a', 't', 's', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\r', ' ', '\001', +'(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'm', 'e', 't', 'r', 'i', 'c', 's', +'.', 'v', '3', '.', 'S', 't', 'a', 't', 's', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\013', 's', 't', 'a', 't', 's', 'C', 'o', 'n', +'f', 'i', 'g', '\022', 'q', '\n', '\024', 's', 't', 'a', 't', 's', '_', 'f', 'l', 'u', 's', 'h', '_', 'i', 'n', 't', 'e', 'r', 'v', +'a', 'l', '\030', '\007', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', +'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '$', '\372', 'B', '\016', '\252', '\001', '\013', '\032', '\003', '\010', '\254', '\002', '2', '\004', +'\020', '\300', '\204', '=', '\362', '\230', '\376', '\217', '\005', '\r', '\022', '\013', 's', 't', 'a', 't', 's', '_', 'f', 'l', 'u', 's', 'h', 'R', '\022', +'s', 't', 'a', 't', 's', 'F', 'l', 'u', 's', 'h', 'I', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\022', ':', '\n', '\024', 's', 't', 'a', +'t', 's', '_', 'f', 'l', 'u', 's', 'h', '_', 'o', 'n', '_', 'a', 'd', 'm', 'i', 'n', '\030', '\035', ' ', '\001', '(', '\010', 'B', '\007', +'\372', 'B', '\004', 'j', '\002', '\010', '\001', 'H', '\000', 'R', '\021', 's', 't', 'a', 't', 's', 'F', 'l', 'u', 's', 'h', 'O', 'n', 'A', 'd', +'m', 'i', 'n', '\022', 'C', '\n', '\010', 'w', 'a', 't', 'c', 'h', 'd', 'o', 'g', '\030', '\010', ' ', '\001', '(', '\013', '2', '#', '.', 'e', +'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'v', '3', '.', +'W', 'a', 't', 'c', 'h', 'd', 'o', 'g', 'B', '\002', '\030', '\001', 'R', '\010', 'w', 'a', 't', 'c', 'h', 'd', 'o', 'g', '\022', 'B', '\n', +'\t', 'w', 'a', 't', 'c', 'h', 'd', 'o', 'g', 's', '\030', '\033', ' ', '\001', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', +'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'v', '3', '.', 'W', 'a', 't', 'c', 'h', +'d', 'o', 'g', 's', 'R', '\t', 'w', 'a', 't', 'c', 'h', 'd', 'o', 'g', 's', '\022', '<', '\n', '\007', 't', 'r', 'a', 'c', 'i', 'n', +'g', '\030', '\t', ' ', '\001', '(', '\013', '2', '\036', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'r', +'a', 'c', 'e', '.', 'v', '3', '.', 'T', 'r', 'a', 'c', 'i', 'n', 'g', 'B', '\002', '\030', '\001', 'R', '\007', 't', 'r', 'a', 'c', 'i', +'n', 'g', '\022', 'R', '\n', '\017', 'l', 'a', 'y', 'e', 'r', 'e', 'd', '_', 'r', 'u', 'n', 't', 'i', 'm', 'e', '\030', '\021', ' ', '\001', +'(', '\013', '2', ')', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', 'r', +'a', 'p', '.', 'v', '3', '.', 'L', 'a', 'y', 'e', 'r', 'e', 'd', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'R', '\016', 'l', 'a', 'y', +'e', 'r', 'e', 'd', 'R', 'u', 'n', 't', 'i', 'm', 'e', '\022', '6', '\n', '\005', 'a', 'd', 'm', 'i', 'n', '\030', '\014', ' ', '\001', '(', +'\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', +'p', '.', 'v', '3', '.', 'A', 'd', 'm', 'i', 'n', 'R', '\005', 'a', 'd', 'm', 'i', 'n', '\022', 'd', '\n', '\020', 'o', 'v', 'e', 'r', +'l', 'o', 'a', 'd', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '\030', '\017', ' ', '\001', '(', '\013', '2', ')', '.', 'e', 'n', 'v', 'o', +'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'o', 'v', 'e', 'r', 'l', 'o', 'a', 'd', '.', 'v', '3', '.', 'O', 'v', 'e', 'r', +'l', 'o', 'a', 'd', 'M', 'a', 'n', 'a', 'g', 'e', 'r', 'B', '\016', '\212', '\223', '\267', '*', '\002', '\010', '\001', '\212', '\223', '\267', '*', '\002', +'\020', '\001', 'R', '\017', 'o', 'v', 'e', 'r', 'l', 'o', 'a', 'd', 'M', 'a', 'n', 'a', 'g', 'e', 'r', '\022', '6', '\n', '\027', 'e', 'n', +'a', 'b', 'l', 'e', '_', 'd', 'i', 's', 'p', 'a', 't', 'c', 'h', 'e', 'r', '_', 's', 't', 'a', 't', 's', '\030', '\020', ' ', '\001', +'(', '\010', 'R', '\025', 'e', 'n', 'a', 'b', 'l', 'e', 'D', 'i', 's', 'p', 'a', 't', 'c', 'h', 'e', 'r', 'S', 't', 'a', 't', 's', +'\022', '#', '\n', '\r', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'p', 'r', 'e', 'f', 'i', 'x', '\030', '\022', ' ', '\001', '(', '\t', 'R', '\014', +'h', 'e', 'a', 'd', 'e', 'r', 'P', 'r', 'e', 'f', 'i', 'x', '\022', '_', '\n', '\035', 's', 't', 'a', 't', 's', '_', 's', 'e', 'r', +'v', 'e', 'r', '_', 'v', 'e', 'r', 's', 'i', 'o', 'n', '_', 'o', 'v', 'e', 'r', 'r', 'i', 'd', 'e', '\030', '\023', ' ', '\001', '(', +'\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '6', +'4', 'V', 'a', 'l', 'u', 'e', 'R', '\032', 's', 't', 'a', 't', 's', 'S', 'e', 'r', 'v', 'e', 'r', 'V', 'e', 'r', 's', 'i', 'o', +'n', 'O', 'v', 'e', 'r', 'r', 'i', 'd', 'e', '\022', '4', '\n', '\027', 'u', 's', 'e', '_', 't', 'c', 'p', '_', 'f', 'o', 'r', '_', +'d', 'n', 's', '_', 'l', 'o', 'o', 'k', 'u', 'p', 's', '\030', '\024', ' ', '\001', '(', '\010', 'R', '\023', 'u', 's', 'e', 'T', 'c', 'p', +'F', 'o', 'r', 'D', 'n', 's', 'L', 'o', 'o', 'k', 'u', 'p', 's', '\022', ']', '\n', '\024', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', +'p', '_', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '\030', '\025', ' ', '\003', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', +'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', +'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\023', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', 'E', 'x', +'t', 'e', 'n', 's', 'i', 'o', 'n', 's', '\022', 'K', '\n', '\r', 'f', 'a', 't', 'a', 'l', '_', 'a', 'c', 't', 'i', 'o', 'n', 's', +'\030', '\034', ' ', '\003', '(', '\013', '2', '&', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', +'t', 's', 't', 'r', 'a', 'p', '.', 'v', '3', '.', 'F', 'a', 't', 'a', 'l', 'A', 'c', 't', 'i', 'o', 'n', 'R', '\014', 'f', 'a', +'t', 'a', 'l', 'A', 'c', 't', 'i', 'o', 'n', 's', '\022', 'I', '\n', '\016', 'c', 'o', 'n', 'f', 'i', 'g', '_', 's', 'o', 'u', 'r', +'c', 'e', 's', '\030', '\026', ' ', '\003', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', +'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', 'R', '\r', 'c', 'o', 'n', +'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', 's', '\022', 'V', '\n', '\025', 'd', 'e', 'f', 'a', 'u', 'l', 't', '_', 'c', 'o', 'n', +'f', 'i', 'g', '_', 's', 'o', 'u', 'r', 'c', 'e', '\030', '\027', ' ', '\001', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', +'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', +'c', 'e', 'R', '\023', 'd', 'e', 'f', 'a', 'u', 'l', 't', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', '\022', '8', +'\n', '\030', 'd', 'e', 'f', 'a', 'u', 'l', 't', '_', 's', 'o', 'c', 'k', 'e', 't', '_', 'i', 'n', 't', 'e', 'r', 'f', 'a', 'c', +'e', '\030', '\030', ' ', '\001', '(', '\t', 'R', '\026', 'd', 'e', 'f', 'a', 'u', 'l', 't', 'S', 'o', 'c', 'k', 'e', 't', 'I', 'n', 't', +'e', 'r', 'f', 'a', 'c', 'e', '\022', '\214', '\001', '\n', '\036', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '_', 'p', 'r', +'o', 'v', 'i', 'd', 'e', 'r', '_', 'i', 'n', 's', 't', 'a', 'n', 'c', 'e', 's', '\030', '\031', ' ', '\003', '(', '\013', '2', 'F', '.', +'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'v', '3', +'.', 'B', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', +'v', 'i', 'd', 'e', 'r', 'I', 'n', 's', 't', 'a', 'n', 'c', 'e', 's', 'E', 'n', 't', 'r', 'y', 'R', '\034', 'c', 'e', 'r', 't', +'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'v', 'i', 'd', 'e', 'r', 'I', 'n', 's', 't', 'a', 'n', 'c', 'e', 's', '\032', +'\232', '\002', '\n', '\017', 'S', 't', 'a', 't', 'i', 'c', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', 's', '\022', '@', '\n', '\t', 'l', 'i', +'s', 't', 'e', 'n', 'e', 'r', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', +'f', 'i', 'g', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'v', '3', '.', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 'R', +'\t', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', 's', '\022', '<', '\n', '\010', 'c', 'l', 'u', 's', 't', 'e', 'r', 's', '\030', '\002', ' ', +'\003', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', +'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', 'R', '\010', 'c', 'l', 'u', 's', 't', 'e', 'r', 's', '\022', 'K', '\n', +'\007', 's', 'e', 'c', 'r', 'e', 't', 's', '\030', '\003', ' ', '\003', '(', '\013', '2', '1', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', +'t', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', +'s', '.', 't', 'l', 's', '.', 'v', '3', '.', 'S', 'e', 'c', 'r', 'e', 't', 'R', '\007', 's', 'e', 'c', 'r', 'e', 't', 's', ':', +':', '\232', '\305', '\210', '\036', '5', '\n', '3', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', +'s', 't', 'r', 'a', 'p', '.', 'v', '2', '.', 'B', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'S', 't', 'a', 't', 'i', 'c', +'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', 's', '\032', '\211', '\003', '\n', '\020', 'D', 'y', 'n', 'a', 'm', 'i', 'c', 'R', 'e', 's', 'o', +'u', 'r', 'c', 'e', 's', '\022', 'A', '\n', '\n', 'l', 'd', 's', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\001', ' ', '\001', '(', '\013', +'2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'C', +'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', 'R', '\t', 'l', 'd', 's', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '2', '\n', +'\025', 'l', 'd', 's', '_', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', 's', '_', 'l', 'o', 'c', 'a', 't', 'o', 'r', '\030', '\005', ' ', +'\001', '(', '\t', 'R', '\023', 'l', 'd', 's', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', 's', 'L', 'o', 'c', 'a', 't', 'o', 'r', '\022', +'A', '\n', '\n', 'c', 'd', 's', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\002', ' ', '\001', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', +'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'C', 'o', 'n', 'f', 'i', 'g', 'S', +'o', 'u', 'r', 'c', 'e', 'R', '\t', 'c', 'd', 's', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '2', '\n', '\025', 'c', 'd', 's', '_', 'r', +'e', 's', 'o', 'u', 'r', 'c', 'e', 's', '_', 'l', 'o', 'c', 'a', 't', 'o', 'r', '\030', '\006', ' ', '\001', '(', '\t', 'R', '\023', 'c', +'d', 's', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', 's', 'L', 'o', 'c', 'a', 't', 'o', 'r', '\022', 'D', '\n', '\n', 'a', 'd', 's', +'_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\003', ' ', '\001', '(', '\013', '2', '%', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', +'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'A', 'p', 'i', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', +'c', 'e', 'R', '\t', 'a', 'd', 's', 'C', 'o', 'n', 'f', 'i', 'g', ':', ';', '\232', '\305', '\210', '\036', '6', '\n', '4', 'e', 'n', 'v', +'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'v', '2', '.', 'B', 'o', +'o', 't', 's', 't', 'r', 'a', 'p', '.', 'D', 'y', 'n', 'a', 'm', 'i', 'c', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', 's', 'J', +'\004', '\010', '\004', '\020', '\005', '\032', '{', '\n', '!', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'v', 'i', +'d', 'e', 'r', 'I', 'n', 's', 't', 'a', 'n', 'c', 'e', 's', 'E', 'n', 't', 'r', 'y', '\022', '\020', '\n', '\003', 'k', 'e', 'y', '\030', +'\001', ' ', '\001', '(', '\t', 'R', '\003', 'k', 'e', 'y', '\022', '@', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\013', +'2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', +'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\005', 'v', 'a', 'l', 'u', +'e', ':', '\002', '8', '\001', ':', '*', '\232', '\305', '\210', '\036', '%', '\n', '#', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', +'g', '.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'v', '2', '.', 'B', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', 'B', +'\r', '\n', '\013', 's', 't', 'a', 't', 's', '_', 'f', 'l', 'u', 's', 'h', 'J', '\004', '\010', '\n', '\020', '\013', 'J', '\004', '\010', '\013', '\020', +'\014', 'R', '\007', 'r', 'u', 'n', 't', 'i', 'm', 'e', '\"', '\376', '\001', '\n', '\005', 'A', 'd', 'm', 'i', 'n', '\022', '&', '\n', '\017', 'a', +'c', 'c', 'e', 's', 's', '_', 'l', 'o', 'g', '_', 'p', 'a', 't', 'h', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\r', 'a', 'c', 'c', +'e', 's', 's', 'L', 'o', 'g', 'P', 'a', 't', 'h', '\022', '!', '\n', '\014', 'p', 'r', 'o', 'f', 'i', 'l', 'e', '_', 'p', 'a', 't', +'h', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\013', 'p', 'r', 'o', 'f', 'i', 'l', 'e', 'P', 'a', 't', 'h', '\022', '7', '\n', '\007', 'a', +'d', 'd', 'r', 'e', 's', 's', '\030', '\003', ' ', '\001', '(', '\013', '2', '\035', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', +'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'A', 'd', 'd', 'r', 'e', 's', 's', 'R', '\007', 'a', 'd', 'd', 'r', 'e', +'s', 's', '\022', 'I', '\n', '\016', 's', 'o', 'c', 'k', 'e', 't', '_', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\004', ' ', '\003', '(', +'\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', +'S', 'o', 'c', 'k', 'e', 't', 'O', 'p', 't', 'i', 'o', 'n', 'R', '\r', 's', 'o', 'c', 'k', 'e', 't', 'O', 'p', 't', 'i', 'o', +'n', 's', ':', '&', '\232', '\305', '\210', '\036', '!', '\n', '\037', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', +'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'v', '2', '.', 'A', 'd', 'm', 'i', 'n', '\"', '\313', '\004', '\n', '\016', 'C', 'l', 'u', +'s', 't', 'e', 'r', 'M', 'a', 'n', 'a', 'g', 'e', 'r', '\022', ',', '\n', '\022', 'l', 'o', 'c', 'a', 'l', '_', 'c', 'l', 'u', 's', +'t', 'e', 'r', '_', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\020', 'l', 'o', 'c', 'a', 'l', 'C', 'l', 'u', 's', +'t', 'e', 'r', 'N', 'a', 'm', 'e', '\022', 'g', '\n', '\021', 'o', 'u', 't', 'l', 'i', 'e', 'r', '_', 'd', 'e', 't', 'e', 'c', 't', +'i', 'o', 'n', '\030', '\002', ' ', '\001', '(', '\013', '2', ':', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', +'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', 'M', 'a', 'n', 'a', 'g', +'e', 'r', '.', 'O', 'u', 't', 'l', 'i', 'e', 'r', 'D', 'e', 't', 'e', 'c', 't', 'i', 'o', 'n', 'R', '\020', 'o', 'u', 't', 'l', +'i', 'e', 'r', 'D', 'e', 't', 'e', 'c', 't', 'i', 'o', 'n', '\022', 'R', '\n', '\024', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', +'b', 'i', 'n', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\003', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', +'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'B', 'i', 'n', 'd', 'C', 'o', 'n', 'f', 'i', +'g', 'R', '\022', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', 'B', 'i', 'n', 'd', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'Q', '\n', '\021', +'l', 'o', 'a', 'd', '_', 's', 't', 'a', 't', 's', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\004', ' ', '\001', '(', '\013', '2', '%', +'.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'A', 'p', 'i', +'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', 'R', '\017', 'l', 'o', 'a', 'd', 'S', 't', 'a', 't', 's', 'C', 'o', +'n', 'f', 'i', 'g', '\032', '\311', '\001', '\n', '\020', 'O', 'u', 't', 'l', 'i', 'e', 'r', 'D', 'e', 't', 'e', 'c', 't', 'i', 'o', 'n', +'\022', '$', '\n', '\016', 'e', 'v', 'e', 'n', 't', '_', 'l', 'o', 'g', '_', 'p', 'a', 't', 'h', '\030', '\001', ' ', '\001', '(', '\t', 'R', +'\014', 'e', 'v', 'e', 'n', 't', 'L', 'o', 'g', 'P', 'a', 't', 'h', '\022', 'M', '\n', '\r', 'e', 'v', 'e', 'n', 't', '_', 's', 'e', +'r', 'v', 'i', 'c', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '(', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', +'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'E', 'v', 'e', 'n', 't', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'C', 'o', 'n', +'f', 'i', 'g', 'R', '\014', 'e', 'v', 'e', 'n', 't', 'S', 'e', 'r', 'v', 'i', 'c', 'e', ':', '@', '\232', '\305', '\210', '\036', ';', '\n', +'9', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'v', +'2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', 'M', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'O', 'u', 't', 'l', 'i', 'e', 'r', 'D', +'e', 't', 'e', 'c', 't', 'i', 'o', 'n', ':', '/', '\232', '\305', '\210', '\036', '*', '\n', '(', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', +'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', +'M', 'a', 'n', 'a', 'g', 'e', 'r', '\"', '\260', '\001', '\n', '\t', 'W', 'a', 't', 'c', 'h', 'd', 'o', 'g', 's', '\022', 'U', '\n', '\024', +'m', 'a', 'i', 'n', '_', 't', 'h', 'r', 'e', 'a', 'd', '_', 'w', 'a', 't', 'c', 'h', 'd', 'o', 'g', '\030', '\001', ' ', '\001', '(', +'\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', +'p', '.', 'v', '3', '.', 'W', 'a', 't', 'c', 'h', 'd', 'o', 'g', 'R', '\022', 'm', 'a', 'i', 'n', 'T', 'h', 'r', 'e', 'a', 'd', +'W', 'a', 't', 'c', 'h', 'd', 'o', 'g', '\022', 'L', '\n', '\017', 'w', 'o', 'r', 'k', 'e', 'r', '_', 'w', 'a', 't', 'c', 'h', 'd', +'o', 'g', '\030', '\002', ' ', '\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', +'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'v', '3', '.', 'W', 'a', 't', 'c', 'h', 'd', 'o', 'g', 'R', '\016', 'w', 'o', 'r', +'k', 'e', 'r', 'W', 'a', 't', 'c', 'h', 'd', 'o', 'g', '\"', '\272', '\006', '\n', '\010', 'W', 'a', 't', 'c', 'h', 'd', 'o', 'g', '\022', +'L', '\n', '\007', 'a', 'c', 't', 'i', 'o', 'n', 's', '\030', '\007', ' ', '\003', '(', '\013', '2', '2', '.', 'e', 'n', 'v', 'o', 'y', '.', +'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'v', '3', '.', 'W', 'a', 't', 'c', 'h', +'d', 'o', 'g', '.', 'W', 'a', 't', 'c', 'h', 'd', 'o', 'g', 'A', 'c', 't', 'i', 'o', 'n', 'R', '\007', 'a', 'c', 't', 'i', 'o', +'n', 's', '\022', '<', '\n', '\014', 'm', 'i', 's', 's', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\001', ' ', '\001', '(', '\013', '2', +'\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', +'n', 'R', '\013', 'm', 'i', 's', 's', 'T', 'i', 'm', 'e', 'o', 'u', 't', '\022', 'D', '\n', '\020', 'm', 'e', 'g', 'a', 'm', 'i', 's', +'s', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\002', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', +'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\017', 'm', 'e', 'g', 'a', 'm', 'i', +'s', 's', 'T', 'i', 'm', 'e', 'o', 'u', 't', '\022', '<', '\n', '\014', 'k', 'i', 'l', 'l', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', +'\030', '\003', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', +'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\013', 'k', 'i', 'l', 'l', 'T', 'i', 'm', 'e', 'o', 'u', 't', '\022', 'Z', '\n', '\027', +'m', 'a', 'x', '_', 'k', 'i', 'l', 'l', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '_', 'j', 'i', 't', 't', 'e', 'r', '\030', '\006', +' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', +'r', 'a', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\252', '\001', '\002', '2', '\000', 'R', '\024', 'm', 'a', 'x', 'K', 'i', 'l', 'l', +'T', 'i', 'm', 'e', 'o', 'u', 't', 'J', 'i', 't', 't', 'e', 'r', '\022', 'F', '\n', '\021', 'm', 'u', 'l', 't', 'i', 'k', 'i', 'l', +'l', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\004', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', +'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\020', 'm', 'u', 'l', 't', 'i', 'k', +'i', 'l', 'l', 'T', 'i', 'm', 'e', 'o', 'u', 't', '\022', 'G', '\n', '\023', 'm', 'u', 'l', 't', 'i', 'k', 'i', 'l', 'l', '_', 't', +'h', 'r', 'e', 's', 'h', 'o', 'l', 'd', '\030', '\005', ' ', '\001', '(', '\013', '2', '\026', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', +'p', 'e', '.', 'v', '3', '.', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', '\022', 'm', 'u', 'l', 't', 'i', 'k', 'i', 'l', 'l', 'T', +'h', 'r', 'e', 's', 'h', 'o', 'l', 'd', '\032', '\205', '\002', '\n', '\016', 'W', 'a', 't', 'c', 'h', 'd', 'o', 'g', 'A', 'c', 't', 'i', +'o', 'n', '\022', 'B', '\n', '\006', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\001', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', +'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', +'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\006', 'c', 'o', 'n', 'f', 'i', 'g', '\022', '`', '\n', '\005', 'e', +'v', 'e', 'n', 't', '\030', '\002', ' ', '\001', '(', '\016', '2', '@', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', +'.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'v', '3', '.', 'W', 'a', 't', 'c', 'h', 'd', 'o', 'g', '.', 'W', 'a', +'t', 'c', 'h', 'd', 'o', 'g', 'A', 'c', 't', 'i', 'o', 'n', '.', 'W', 'a', 't', 'c', 'h', 'd', 'o', 'g', 'E', 'v', 'e', 'n', +'t', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\005', 'e', 'v', 'e', 'n', 't', '\"', 'M', '\n', '\r', 'W', 'a', 't', +'c', 'h', 'd', 'o', 'g', 'E', 'v', 'e', 'n', 't', '\022', '\013', '\n', '\007', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\010', +'\n', '\004', 'K', 'I', 'L', 'L', '\020', '\001', '\022', '\r', '\n', '\t', 'M', 'U', 'L', 'T', 'I', 'K', 'I', 'L', 'L', '\020', '\002', '\022', '\014', +'\n', '\010', 'M', 'E', 'G', 'A', 'M', 'I', 'S', 'S', '\020', '\003', '\022', '\010', '\n', '\004', 'M', 'I', 'S', 'S', '\020', '\004', ':', ')', '\232', +'\305', '\210', '\036', '$', '\n', '\"', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', +'r', 'a', 'p', '.', 'v', '2', '.', 'W', 'a', 't', 'c', 'h', 'd', 'o', 'g', '\"', 'Q', '\n', '\013', 'F', 'a', 't', 'a', 'l', 'A', +'c', 't', 'i', 'o', 'n', '\022', 'B', '\n', '\006', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\001', ' ', '\001', '(', '\013', '2', '*', '.', 'e', +'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', +'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\006', 'c', 'o', 'n', 'f', 'i', 'g', '\"', '\334', +'\001', '\n', '\007', 'R', 'u', 'n', 't', 'i', 'm', 'e', '\022', '!', '\n', '\014', 's', 'y', 'm', 'l', 'i', 'n', 'k', '_', 'r', 'o', 'o', +'t', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\013', 's', 'y', 'm', 'l', 'i', 'n', 'k', 'R', 'o', 'o', 't', '\022', '\"', '\n', '\014', 's', +'u', 'b', 'd', 'i', 'r', 'e', 'c', 't', 'o', 'r', 'y', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\014', 's', 'u', 'b', 'd', 'i', 'r', +'e', 'c', 't', 'o', 'r', 'y', '\022', '3', '\n', '\025', 'o', 'v', 'e', 'r', 'r', 'i', 'd', 'e', '_', 's', 'u', 'b', 'd', 'i', 'r', +'e', 'c', 't', 'o', 'r', 'y', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\024', 'o', 'v', 'e', 'r', 'r', 'i', 'd', 'e', 'S', 'u', 'b', +'d', 'i', 'r', 'e', 'c', 't', 'o', 'r', 'y', '\022', '+', '\n', '\004', 'b', 'a', 's', 'e', '\030', '\004', ' ', '\001', '(', '\013', '2', '\027', +'.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 't', 'r', 'u', 'c', 't', 'R', '\004', +'b', 'a', 's', 'e', ':', '(', '\232', '\305', '\210', '\036', '#', '\n', '!', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', +'.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'v', '2', '.', 'R', 'u', 'n', 't', 'i', 'm', 'e', '\"', '\333', '\006', '\n', +'\014', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'L', 'a', 'y', 'e', 'r', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', +'(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '<', '\n', '\014', 's', 't', 'a', 't', +'i', 'c', '_', 'l', 'a', 'y', 'e', 'r', '\030', '\002', ' ', '\001', '(', '\013', '2', '\027', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', +'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 't', 'r', 'u', 'c', 't', 'H', '\000', 'R', '\013', 's', 't', 'a', 't', 'i', 'c', 'L', +'a', 'y', 'e', 'r', '\022', 'R', '\n', '\n', 'd', 'i', 's', 'k', '_', 'l', 'a', 'y', 'e', 'r', '\030', '\003', ' ', '\001', '(', '\013', '2', +'1', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', +'v', '3', '.', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'L', 'a', 'y', 'e', 'r', '.', 'D', 'i', 's', 'k', 'L', 'a', 'y', 'e', 'r', +'H', '\000', 'R', '\t', 'd', 'i', 's', 'k', 'L', 'a', 'y', 'e', 'r', '\022', 'U', '\n', '\013', 'a', 'd', 'm', 'i', 'n', '_', 'l', 'a', +'y', 'e', 'r', '\030', '\004', ' ', '\001', '(', '\013', '2', '2', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', +'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'v', '3', '.', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'L', 'a', 'y', 'e', 'r', +'.', 'A', 'd', 'm', 'i', 'n', 'L', 'a', 'y', 'e', 'r', 'H', '\000', 'R', '\n', 'a', 'd', 'm', 'i', 'n', 'L', 'a', 'y', 'e', 'r', +'\022', 'R', '\n', '\n', 'r', 't', 'd', 's', '_', 'l', 'a', 'y', 'e', 'r', '\030', '\005', ' ', '\001', '(', '\013', '2', '1', '.', 'e', 'n', +'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'v', '3', '.', 'R', +'u', 'n', 't', 'i', 'm', 'e', 'L', 'a', 'y', 'e', 'r', '.', 'R', 't', 'd', 's', 'L', 'a', 'y', 'e', 'r', 'H', '\000', 'R', '\t', +'r', 't', 'd', 's', 'L', 'a', 'y', 'e', 'r', '\032', '\301', '\001', '\n', '\t', 'D', 'i', 's', 'k', 'L', 'a', 'y', 'e', 'r', '\022', '!', +'\n', '\014', 's', 'y', 'm', 'l', 'i', 'n', 'k', '_', 'r', 'o', 'o', 't', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\013', 's', 'y', 'm', +'l', 'i', 'n', 'k', 'R', 'o', 'o', 't', '\022', '\"', '\n', '\014', 's', 'u', 'b', 'd', 'i', 'r', 'e', 'c', 't', 'o', 'r', 'y', '\030', +'\003', ' ', '\001', '(', '\t', 'R', '\014', 's', 'u', 'b', 'd', 'i', 'r', 'e', 'c', 't', 'o', 'r', 'y', '\022', '4', '\n', '\026', 'a', 'p', +'p', 'e', 'n', 'd', '_', 's', 'e', 'r', 'v', 'i', 'c', 'e', '_', 'c', 'l', 'u', 's', 't', 'e', 'r', '\030', '\002', ' ', '\001', '(', +'\010', 'R', '\024', 'a', 'p', 'p', 'e', 'n', 'd', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'C', 'l', 'u', 's', 't', 'e', 'r', ':', '7', +'\232', '\305', '\210', '\036', '2', '\n', '0', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', +'t', 'r', 'a', 'p', '.', 'v', '2', '.', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'L', 'a', 'y', 'e', 'r', '.', 'D', 'i', 's', 'k', +'L', 'a', 'y', 'e', 'r', '\032', 'F', '\n', '\n', 'A', 'd', 'm', 'i', 'n', 'L', 'a', 'y', 'e', 'r', ':', '8', '\232', '\305', '\210', '\036', +'3', '\n', '1', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', +'.', 'v', '2', '.', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'L', 'a', 'y', 'e', 'r', '.', 'A', 'd', 'm', 'i', 'n', 'L', 'a', 'y', +'e', 'r', '\032', '\235', '\001', '\n', '\t', 'R', 't', 'd', 's', 'L', 'a', 'y', 'e', 'r', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', +'\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', 'C', '\n', '\013', 'r', 't', 'd', 's', '_', 'c', 'o', 'n', 'f', 'i', +'g', '\030', '\002', ' ', '\001', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', +'r', 'e', '.', 'v', '3', '.', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', 'R', '\n', 'r', 't', 'd', 's', 'C', +'o', 'n', 'f', 'i', 'g', ':', '7', '\232', '\305', '\210', '\036', '2', '\n', '0', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', +'g', '.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'v', '2', '.', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'L', 'a', 'y', +'e', 'r', '.', 'R', 't', 'd', 's', 'L', 'a', 'y', 'e', 'r', ':', '-', '\232', '\305', '\210', '\036', '(', '\n', '&', 'e', 'n', 'v', 'o', +'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'v', '2', '.', 'R', 'u', 'n', +'t', 'i', 'm', 'e', 'L', 'a', 'y', 'e', 'r', 'B', '\026', '\n', '\017', 'l', 'a', 'y', 'e', 'r', '_', 's', 'p', 'e', 'c', 'i', 'f', +'i', 'e', 'r', '\022', '\003', '\370', 'B', '\001', '\"', '\202', '\001', '\n', '\016', 'L', 'a', 'y', 'e', 'r', 'e', 'd', 'R', 'u', 'n', 't', 'i', +'m', 'e', '\022', '?', '\n', '\006', 'l', 'a', 'y', 'e', 'r', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '\'', '.', 'e', 'n', 'v', 'o', +'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'v', '3', '.', 'R', 'u', 'n', +'t', 'i', 'm', 'e', 'L', 'a', 'y', 'e', 'r', 'R', '\006', 'l', 'a', 'y', 'e', 'r', 's', ':', '/', '\232', '\305', '\210', '\036', '*', '\n', +'(', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', '.', 'v', +'2', '.', 'L', 'a', 'y', 'e', 'r', 'e', 'd', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'B', 'C', '\n', '\'', 'i', 'o', '.', 'e', 'n', +'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'b', 'o', 'o', +'t', 's', 't', 'r', 'a', 'p', '.', 'v', '3', 'B', '\016', 'B', 'o', 'o', 't', 's', 't', 'r', 'a', 'p', 'P', 'r', 'o', 't', 'o', +'P', '\001', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +}; + +static upb_def_init *deps[22] = { + &envoy_config_cluster_v3_cluster_proto_upbdefinit, + &envoy_config_core_v3_address_proto_upbdefinit, + &envoy_config_core_v3_base_proto_upbdefinit, + &envoy_config_core_v3_config_source_proto_upbdefinit, + &envoy_config_core_v3_event_service_config_proto_upbdefinit, + &envoy_config_core_v3_extension_proto_upbdefinit, + &envoy_config_core_v3_socket_option_proto_upbdefinit, + &envoy_config_listener_v3_listener_proto_upbdefinit, + &envoy_config_metrics_v3_stats_proto_upbdefinit, + &envoy_config_overload_v3_overload_proto_upbdefinit, + &envoy_config_trace_v3_http_tracer_proto_upbdefinit, + &envoy_extensions_transport_sockets_tls_v3_secret_proto_upbdefinit, + &envoy_type_v3_percent_proto_upbdefinit, + &google_protobuf_duration_proto_upbdefinit, + &google_protobuf_struct_proto_upbdefinit, + &google_protobuf_wrappers_proto_upbdefinit, + &udpa_annotations_migrate_proto_upbdefinit, + &udpa_annotations_security_proto_upbdefinit, + &udpa_annotations_status_proto_upbdefinit, + &udpa_annotations_versioning_proto_upbdefinit, + &validate_validate_proto_upbdefinit, + NULL +}; + +upb_def_init envoy_config_bootstrap_v3_bootstrap_proto_upbdefinit = { + deps, + layouts, + "envoy/config/bootstrap/v3/bootstrap.proto", + UPB_STRVIEW_INIT(descriptor, 6993) +}; diff --git a/grpc/src/core/ext/upbdefs-generated/envoy/config/bootstrap/v3/bootstrap.upbdefs.h b/grpc/src/core/ext/upbdefs-generated/envoy/config/bootstrap/v3/bootstrap.upbdefs.h new file mode 100644 index 00000000..666cbed1 --- /dev/null +++ b/grpc/src/core/ext/upbdefs-generated/envoy/config/bootstrap/v3/bootstrap.upbdefs.h @@ -0,0 +1,115 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * envoy/config/bootstrap/v3/bootstrap.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#ifndef ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPBDEFS_H_ +#define ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPBDEFS_H_ + +#include "upb/def.h" +#include "upb/port_def.inc" +#ifdef __cplusplus +extern "C" { +#endif + +#include "upb/def.h" + +#include "upb/port_def.inc" + +extern upb_def_init envoy_config_bootstrap_v3_bootstrap_proto_upbdefinit; + +UPB_INLINE const upb_msgdef *envoy_config_bootstrap_v3_Bootstrap_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_config_bootstrap_v3_bootstrap_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.config.bootstrap.v3.Bootstrap"); +} + +UPB_INLINE const upb_msgdef *envoy_config_bootstrap_v3_Bootstrap_StaticResources_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_config_bootstrap_v3_bootstrap_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.config.bootstrap.v3.Bootstrap.StaticResources"); +} + +UPB_INLINE const upb_msgdef *envoy_config_bootstrap_v3_Bootstrap_DynamicResources_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_config_bootstrap_v3_bootstrap_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.config.bootstrap.v3.Bootstrap.DynamicResources"); +} + +UPB_INLINE const upb_msgdef *envoy_config_bootstrap_v3_Bootstrap_CertificateProviderInstancesEntry_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_config_bootstrap_v3_bootstrap_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.config.bootstrap.v3.Bootstrap.CertificateProviderInstancesEntry"); +} + +UPB_INLINE const upb_msgdef *envoy_config_bootstrap_v3_Admin_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_config_bootstrap_v3_bootstrap_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.config.bootstrap.v3.Admin"); +} + +UPB_INLINE const upb_msgdef *envoy_config_bootstrap_v3_ClusterManager_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_config_bootstrap_v3_bootstrap_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.config.bootstrap.v3.ClusterManager"); +} + +UPB_INLINE const upb_msgdef *envoy_config_bootstrap_v3_ClusterManager_OutlierDetection_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_config_bootstrap_v3_bootstrap_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.config.bootstrap.v3.ClusterManager.OutlierDetection"); +} + +UPB_INLINE const upb_msgdef *envoy_config_bootstrap_v3_Watchdogs_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_config_bootstrap_v3_bootstrap_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.config.bootstrap.v3.Watchdogs"); +} + +UPB_INLINE const upb_msgdef *envoy_config_bootstrap_v3_Watchdog_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_config_bootstrap_v3_bootstrap_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.config.bootstrap.v3.Watchdog"); +} + +UPB_INLINE const upb_msgdef *envoy_config_bootstrap_v3_Watchdog_WatchdogAction_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_config_bootstrap_v3_bootstrap_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.config.bootstrap.v3.Watchdog.WatchdogAction"); +} + +UPB_INLINE const upb_msgdef *envoy_config_bootstrap_v3_FatalAction_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_config_bootstrap_v3_bootstrap_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.config.bootstrap.v3.FatalAction"); +} + +UPB_INLINE const upb_msgdef *envoy_config_bootstrap_v3_Runtime_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_config_bootstrap_v3_bootstrap_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.config.bootstrap.v3.Runtime"); +} + +UPB_INLINE const upb_msgdef *envoy_config_bootstrap_v3_RuntimeLayer_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_config_bootstrap_v3_bootstrap_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.config.bootstrap.v3.RuntimeLayer"); +} + +UPB_INLINE const upb_msgdef *envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_config_bootstrap_v3_bootstrap_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.config.bootstrap.v3.RuntimeLayer.DiskLayer"); +} + +UPB_INLINE const upb_msgdef *envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_config_bootstrap_v3_bootstrap_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.config.bootstrap.v3.RuntimeLayer.AdminLayer"); +} + +UPB_INLINE const upb_msgdef *envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_config_bootstrap_v3_bootstrap_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.config.bootstrap.v3.RuntimeLayer.RtdsLayer"); +} + +UPB_INLINE const upb_msgdef *envoy_config_bootstrap_v3_LayeredRuntime_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_config_bootstrap_v3_bootstrap_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.config.bootstrap.v3.LayeredRuntime"); +} + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#include "upb/port_undef.inc" + +#endif /* ENVOY_CONFIG_BOOTSTRAP_V3_BOOTSTRAP_PROTO_UPBDEFS_H_ */ diff --git a/grpc/src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.c b/grpc/src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.c index 926192e0..18db991b 100644 --- a/grpc/src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.c +++ b/grpc/src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.c @@ -24,10 +24,7 @@ extern upb_def_init google_protobuf_any_proto_upbdefinit; extern upb_def_init google_protobuf_duration_proto_upbdefinit; extern upb_def_init google_protobuf_struct_proto_upbdefinit; extern upb_def_init google_protobuf_wrappers_proto_upbdefinit; -extern upb_def_init udpa_core_v1_collection_entry_proto_upbdefinit; -extern upb_def_init udpa_core_v1_resource_locator_proto_upbdefinit; -extern upb_def_init envoy_annotations_deprecation_proto_upbdefinit; -extern upb_def_init udpa_annotations_migrate_proto_upbdefinit; +extern upb_def_init xds_core_v3_collection_entry_proto_upbdefinit; extern upb_def_init udpa_annotations_security_proto_upbdefinit; extern upb_def_init udpa_annotations_status_proto_upbdefinit; extern upb_def_init udpa_annotations_versioning_proto_upbdefinit; @@ -48,7 +45,7 @@ extern const upb_msglayout envoy_config_cluster_v3_Cluster_CommonLbConfig_ZoneAw extern const upb_msglayout envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig_msginit; extern const upb_msglayout envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_msginit; extern const upb_msglayout envoy_config_cluster_v3_Cluster_RefreshRate_msginit; -extern const upb_msglayout envoy_config_cluster_v3_Cluster_PrefetchPolicy_msginit; +extern const upb_msglayout envoy_config_cluster_v3_Cluster_PreconnectPolicy_msginit; extern const upb_msglayout envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry_msginit; extern const upb_msglayout envoy_config_cluster_v3_LoadBalancingPolicy_msginit; extern const upb_msglayout envoy_config_cluster_v3_LoadBalancingPolicy_Policy_msginit; @@ -73,7 +70,7 @@ static const upb_msglayout *layouts[23] = { &envoy_config_cluster_v3_Cluster_CommonLbConfig_LocalityWeightedLbConfig_msginit, &envoy_config_cluster_v3_Cluster_CommonLbConfig_ConsistentHashingLbConfig_msginit, &envoy_config_cluster_v3_Cluster_RefreshRate_msginit, - &envoy_config_cluster_v3_Cluster_PrefetchPolicy_msginit, + &envoy_config_cluster_v3_Cluster_PreconnectPolicy_msginit, &envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry_msginit, &envoy_config_cluster_v3_LoadBalancingPolicy_msginit, &envoy_config_cluster_v3_LoadBalancingPolicy_Policy_msginit, @@ -82,7 +79,7 @@ static const upb_msglayout *layouts[23] = { &envoy_config_cluster_v3_TrackClusterStats_msginit, }; -static const char descriptor[10953] = {'\n', '%', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'l', 'u', 's', 't', 'e', 'r', '/', 'v', '3', +static const char descriptor[10750] = {'\n', '%', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'l', 'u', 's', 't', 'e', 'r', '/', 'v', '3', '/', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'p', 'r', 'o', 't', 'o', '\022', '\027', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '\032', '-', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'l', 'u', 's', 't', 'e', 'r', '/', 'v', '3', '/', 'c', 'i', 'r', 'c', 'u', 'i', 't', '_', 'b', 'r', @@ -106,424 +103,415 @@ static const char descriptor[10953] = {'\n', '%', 'e', 'n', 'v', 'o', 'y', '/', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\032', '\034', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 's', 't', 'r', 'u', 'c', 't', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', -'f', '/', 'w', 'r', 'a', 'p', 'p', 'e', 'r', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '#', 'u', 'd', 'p', 'a', '/', 'c', 'o', -'r', 'e', '/', 'v', '1', '/', 'c', 'o', 'l', 'l', 'e', 'c', 't', 'i', 'o', 'n', '_', 'e', 'n', 't', 'r', 'y', '.', 'p', 'r', -'o', 't', 'o', '\032', '#', 'u', 'd', 'p', 'a', '/', 'c', 'o', 'r', 'e', '/', 'v', '1', '/', 'r', 'e', 's', 'o', 'u', 'r', 'c', -'e', '_', 'l', 'o', 'c', 'a', 't', 'o', 'r', '.', 'p', 'r', 'o', 't', 'o', '\032', '#', 'e', 'n', 'v', 'o', 'y', '/', 'a', 'n', -'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'i', 'o', 'n', '.', 'p', 'r', 'o', -'t', 'o', '\032', '\036', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'm', 'i', 'g', 'r', -'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', '\037', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', -'n', 's', '/', 's', 'e', 'c', 'u', 'r', 'i', 't', 'y', '.', 'p', 'r', 'o', 't', 'o', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', -'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '!', -'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', -'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', -'t', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', 'L', '\n', '\021', 'C', 'l', 'u', 's', 't', 'e', 'r', 'C', 'o', 'l', 'l', 'e', 'c', -'t', 'i', 'o', 'n', '\022', '7', '\n', '\007', 'e', 'n', 't', 'r', 'i', 'e', 's', '\030', '\001', ' ', '\001', '(', '\013', '2', '\035', '.', 'u', -'d', 'p', 'a', '.', 'c', 'o', 'r', 'e', '.', 'v', '1', '.', 'C', 'o', 'l', 'l', 'e', 'c', 't', 'i', 'o', 'n', 'E', 'n', 't', -'r', 'y', 'R', '\007', 'e', 'n', 't', 'r', 'i', 'e', 's', '\"', '\205', 'H', '\n', '\007', 'C', 'l', 'u', 's', 't', 'e', 'r', '\022', 'o', -'\n', '\030', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', '_', 'm', 'a', 't', 'c', 'h', 'e', -'s', '\030', '+', ' ', '\003', '(', '\013', '2', '5', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', -'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'T', 'r', 'a', 'n', 's', 'p', 'o', 'r', -'t', 'S', 'o', 'c', 'k', 'e', 't', 'M', 'a', 't', 'c', 'h', 'R', '\026', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', 'S', 'o', -'c', 'k', 'e', 't', 'M', 'a', 't', 'c', 'h', 'e', 's', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', -'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '\"', '\n', '\r', 'a', 'l', 't', '_', 's', 't', -'a', 't', '_', 'n', 'a', 'm', 'e', '\030', '\034', ' ', '\001', '(', '\t', 'R', '\013', 'a', 'l', 't', 'S', 't', 'a', 't', 'N', 'a', 'm', -'e', '\022', 'N', '\n', '\004', 't', 'y', 'p', 'e', '\030', '\002', ' ', '\001', '(', '\016', '2', '.', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', +'f', '/', 'w', 'r', 'a', 'p', 'p', 'e', 'r', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '\"', 'x', 'd', 's', '/', 'c', 'o', 'r', +'e', '/', 'v', '3', '/', 'c', 'o', 'l', 'l', 'e', 'c', 't', 'i', 'o', 'n', '_', 'e', 'n', 't', 'r', 'y', '.', 'p', 'r', 'o', +'t', 'o', '\032', '\037', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 'e', 'c', 'u', +'r', 'i', 't', 'y', '.', 'p', 'r', 'o', 't', 'o', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', +'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', +'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', +'o', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', +'o', '\"', 'K', '\n', '\021', 'C', 'l', 'u', 's', 't', 'e', 'r', 'C', 'o', 'l', 'l', 'e', 'c', 't', 'i', 'o', 'n', '\022', '6', '\n', +'\007', 'e', 'n', 't', 'r', 'i', 'e', 's', '\030', '\001', ' ', '\001', '(', '\013', '2', '\034', '.', 'x', 'd', 's', '.', 'c', 'o', 'r', 'e', +'.', 'v', '3', '.', 'C', 'o', 'l', 'l', 'e', 'c', 't', 'i', 'o', 'n', 'E', 'n', 't', 'r', 'y', 'R', '\007', 'e', 'n', 't', 'r', +'i', 'e', 's', '\"', '\246', 'G', '\n', '\007', 'C', 'l', 'u', 's', 't', 'e', 'r', '\022', 'o', '\n', '\030', 't', 'r', 'a', 'n', 's', 'p', +'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', '_', 'm', 'a', 't', 'c', 'h', 'e', 's', '\030', '+', ' ', '\003', '(', '\013', '2', +'5', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', +'.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'T', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', 'S', 'o', 'c', 'k', 'e', 't', 'M', +'a', 't', 'c', 'h', 'R', '\026', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', 'S', 'o', 'c', 'k', 'e', 't', 'M', 'a', 't', 'c', +'h', 'e', 's', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', +'\001', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '\"', '\n', '\r', 'a', 'l', 't', '_', 's', 't', 'a', 't', '_', 'n', 'a', 'm', 'e', '\030', +'\034', ' ', '\001', '(', '\t', 'R', '\013', 'a', 'l', 't', 'S', 't', 'a', 't', 'N', 'a', 'm', 'e', '\022', 'N', '\n', '\004', 't', 'y', 'p', +'e', '\030', '\002', ' ', '\001', '(', '\016', '2', '.', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', +'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', +'y', 'T', 'y', 'p', 'e', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'H', '\000', 'R', '\004', 't', 'y', 'p', 'e', '\022', 'W', +'\n', '\014', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 't', 'y', 'p', 'e', '\030', '&', ' ', '\001', '(', '\013', '2', '2', '.', 'e', 'n', +'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', +'s', 't', 'e', 'r', '.', 'C', 'u', 's', 't', 'o', 'm', 'C', 'l', 'u', 's', 't', 'e', 'r', 'T', 'y', 'p', 'e', 'H', '\000', 'R', +'\013', 'c', 'l', 'u', 's', 't', 'e', 'r', 'T', 'y', 'p', 'e', '\022', '_', '\n', '\022', 'e', 'd', 's', '_', 'c', 'l', 'u', 's', 't', +'e', 'r', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\003', ' ', '\001', '(', '\013', '2', '1', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', -'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', 'T', 'y', 'p', 'e', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'H', '\000', -'R', '\004', 't', 'y', 'p', 'e', '\022', 'W', '\n', '\014', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 't', 'y', 'p', 'e', '\030', '&', ' ', -'\001', '(', '\013', '2', '2', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', -'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'C', 'u', 's', 't', 'o', 'm', 'C', 'l', 'u', 's', 't', 'e', -'r', 'T', 'y', 'p', 'e', 'H', '\000', 'R', '\013', 'c', 'l', 'u', 's', 't', 'e', 'r', 'T', 'y', 'p', 'e', '\022', '_', '\n', '\022', 'e', -'d', 's', '_', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\003', ' ', '\001', '(', '\013', '2', '1', -'.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', -'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'E', 'd', 's', 'C', 'l', 'u', 's', 't', 'e', 'r', 'C', 'o', 'n', 'f', 'i', 'g', 'R', -'\020', 'e', 'd', 's', 'C', 'l', 'u', 's', 't', 'e', 'r', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'L', '\n', '\017', 'c', 'o', 'n', 'n', -'e', 'c', 't', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\004', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', -'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\252', -'\001', '\002', '*', '\000', 'R', '\016', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'T', 'i', 'm', 'e', 'o', 'u', 't', '\022', 'o', '\n', '!', 'p', -'e', 'r', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'b', 'u', 'f', 'f', 'e', 'r', '_', 'l', 'i', 'm', 'i', -'t', '_', 'b', 'y', 't', 'e', 's', '\030', '\005', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', -'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\007', '\212', '\223', '\267', '*', '\002', -'\020', '\001', 'R', '\035', 'p', 'e', 'r', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'B', 'u', 'f', 'f', 'e', 'r', 'L', 'i', -'m', 'i', 't', 'B', 'y', 't', 'e', 's', '\022', 'R', '\n', '\t', 'l', 'b', '_', 'p', 'o', 'l', 'i', 'c', 'y', '\030', '\006', ' ', '\001', -'(', '\016', '2', ')', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', -'.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'L', 'b', 'P', 'o', 'l', 'i', 'c', 'y', 'B', '\n', '\372', 'B', '\007', -'\202', '\001', '\004', '\020', '\001', ' ', '\007', 'R', '\010', 'l', 'b', 'P', 'o', 'l', 'i', 'c', 'y', '\022', 'X', '\n', '\017', 'l', 'o', 'a', 'd', -'_', 'a', 's', 's', 'i', 'g', 'n', 'm', 'e', 'n', 't', '\030', '!', ' ', '\001', '(', '\013', '2', '/', '.', 'e', 'n', 'v', 'o', 'y', -'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', -'e', 'r', 'L', 'o', 'a', 'd', 'A', 's', 's', 'i', 'g', 'n', 'm', 'e', 'n', 't', 'R', '\016', 'l', 'o', 'a', 'd', 'A', 's', 's', -'i', 'g', 'n', 'm', 'e', 'n', 't', '\022', 'F', '\n', '\r', 'h', 'e', 'a', 'l', 't', 'h', '_', 'c', 'h', 'e', 'c', 'k', 's', '\030', -'\010', ' ', '\003', '(', '\013', '2', '!', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', -'.', 'v', '3', '.', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', 'R', '\014', 'h', 'e', 'a', 'l', 't', 'h', 'C', 'h', -'e', 'c', 'k', 's', '\022', '[', '\n', '\033', 'm', 'a', 'x', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', 's', '_', 'p', 'e', 'r', '_', -'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '\030', '\t', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', -'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\030', 'm', 'a', -'x', 'R', 'e', 'q', 'u', 'e', 's', 't', 's', 'P', 'e', 'r', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '\022', 'S', '\n', -'\020', 'c', 'i', 'r', 'c', 'u', 'i', 't', '_', 'b', 'r', 'e', 'a', 'k', 'e', 'r', 's', '\030', '\n', ' ', '\001', '(', '\013', '2', '(', -'.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', -'C', 'i', 'r', 'c', 'u', 'i', 't', 'B', 'r', 'e', 'a', 'k', 'e', 'r', 's', 'R', '\017', 'c', 'i', 'r', 'c', 'u', 'i', 't', 'B', -'r', 'e', 'a', 'k', 'e', 'r', 's', '\022', 'v', '\n', '\036', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'h', 't', 't', 'p', '_', -'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '_', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '.', ' ', '\001', '(', '\013', '2', '1', '.', -'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'U', 'p', 's', 't', -'r', 'e', 'a', 'm', 'H', 't', 't', 'p', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\033', -'u', 'p', 's', 't', 'r', 'e', 'a', 'm', 'H', 't', 't', 'p', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', -'n', 's', '\022', 'j', '\n', '\034', 'c', 'o', 'm', 'm', 'o', 'n', '_', 'h', 't', 't', 'p', '_', 'p', 'r', 'o', 't', 'o', 'c', 'o', -'l', '_', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\035', ' ', '\001', '(', '\013', '2', ')', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', -'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 't', 't', 'p', 'P', 'r', 'o', 't', 'o', 'c', 'o', -'l', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\031', 'c', 'o', 'm', 'm', 'o', 'n', 'H', 't', 't', 'p', 'P', 'r', 'o', 't', 'o', -'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '^', '\n', '\025', 'h', 't', 't', 'p', '_', 'p', 'r', 'o', 't', 'o', 'c', +'E', 'd', 's', 'C', 'l', 'u', 's', 't', 'e', 'r', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\020', 'e', 'd', 's', 'C', 'l', 'u', 's', +'t', 'e', 'r', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'L', '\n', '\017', 'c', 'o', 'n', 'n', 'e', 'c', 't', '_', 't', 'i', 'm', 'e', +'o', 'u', 't', '\030', '\004', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', +'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\252', '\001', '\002', '*', '\000', 'R', '\016', 'c', 'o', +'n', 'n', 'e', 'c', 't', 'T', 'i', 'm', 'e', 'o', 'u', 't', '\022', 'o', '\n', '!', 'p', 'e', 'r', '_', 'c', 'o', 'n', 'n', 'e', +'c', 't', 'i', 'o', 'n', '_', 'b', 'u', 'f', 'f', 'e', 'r', '_', 'l', 'i', 'm', 'i', 't', '_', 'b', 'y', 't', 'e', 's', '\030', +'\005', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', +'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\007', '\212', '\223', '\267', '*', '\002', '\020', '\001', 'R', '\035', 'p', 'e', 'r', 'C', +'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'B', 'u', 'f', 'f', 'e', 'r', 'L', 'i', 'm', 'i', 't', 'B', 'y', 't', 'e', 's', +'\022', 'R', '\n', '\t', 'l', 'b', '_', 'p', 'o', 'l', 'i', 'c', 'y', '\030', '\006', ' ', '\001', '(', '\016', '2', ')', '.', 'e', 'n', 'v', +'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', +'t', 'e', 'r', '.', 'L', 'b', 'P', 'o', 'l', 'i', 'c', 'y', 'B', '\n', '\372', 'B', '\007', '\202', '\001', '\004', '\020', '\001', ' ', '\007', 'R', +'\010', 'l', 'b', 'P', 'o', 'l', 'i', 'c', 'y', '\022', 'X', '\n', '\017', 'l', 'o', 'a', 'd', '_', 'a', 's', 's', 'i', 'g', 'n', 'm', +'e', 'n', 't', '\030', '!', ' ', '\001', '(', '\013', '2', '/', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', +'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', 'L', 'o', 'a', 'd', 'A', 's', +'s', 'i', 'g', 'n', 'm', 'e', 'n', 't', 'R', '\016', 'l', 'o', 'a', 'd', 'A', 's', 's', 'i', 'g', 'n', 'm', 'e', 'n', 't', '\022', +'F', '\n', '\r', 'h', 'e', 'a', 'l', 't', 'h', '_', 'c', 'h', 'e', 'c', 'k', 's', '\030', '\010', ' ', '\003', '(', '\013', '2', '!', '.', +'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'l', +'t', 'h', 'C', 'h', 'e', 'c', 'k', 'R', '\014', 'h', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', 's', '\022', '[', '\n', '\033', +'m', 'a', 'x', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', 's', '_', 'p', 'e', 'r', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', +'o', 'n', '\030', '\t', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', +'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\030', 'm', 'a', 'x', 'R', 'e', 'q', 'u', 'e', 's', 't', +'s', 'P', 'e', 'r', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '\022', 'S', '\n', '\020', 'c', 'i', 'r', 'c', 'u', 'i', 't', +'_', 'b', 'r', 'e', 'a', 'k', 'e', 'r', 's', '\030', '\n', ' ', '\001', '(', '\013', '2', '(', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', +'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'i', 'r', 'c', 'u', 'i', 't', 'B', +'r', 'e', 'a', 'k', 'e', 'r', 's', 'R', '\017', 'c', 'i', 'r', 'c', 'u', 'i', 't', 'B', 'r', 'e', 'a', 'k', 'e', 'r', 's', '\022', +'z', '\n', '\036', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'h', 't', 't', 'p', '_', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', +'_', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '.', ' ', '\001', '(', '\013', '2', '1', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', +'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'H', 't', 't', 'p', +'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', 'B', '\002', '\030', '\001', 'R', '\033', 'u', 'p', 's', 't', +'r', 'e', 'a', 'm', 'H', 't', 't', 'p', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', 'n', +'\n', '\034', 'c', 'o', 'm', 'm', 'o', 'n', '_', 'h', 't', 't', 'p', '_', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '_', 'o', 'p', +'t', 'i', 'o', 'n', 's', '\030', '\035', ' ', '\001', '(', '\013', '2', ')', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', +'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 't', 't', 'p', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', +'i', 'o', 'n', 's', 'B', '\002', '\030', '\001', 'R', '\031', 'c', 'o', 'm', 'm', 'o', 'n', 'H', 't', 't', 'p', 'P', 'r', 'o', 't', 'o', +'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', 'b', '\n', '\025', 'h', 't', 't', 'p', '_', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '_', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\r', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 't', 't', 'p', '1', 'P', 'r', 'o', 't', 'o', -'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\023', 'h', 't', 't', 'p', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', -'p', 't', 'i', 'o', 'n', 's', '\022', 'i', '\n', '\026', 'h', 't', 't', 'p', '2', '_', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '_', -'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\016', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', -'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 't', 't', 'p', '2', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', -'O', 'p', 't', 'i', 'o', 'n', 's', 'B', '\007', '\212', '\223', '\267', '*', '\002', '\020', '\001', 'R', '\024', 'h', 't', 't', 'p', '2', 'P', 'r', -'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '\214', '\001', '\n', ' ', 't', 'y', 'p', 'e', 'd', '_', 'e', -'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '_', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '_', 'o', 'p', 't', 'i', 'o', 'n', 's', -'\030', '$', ' ', '\003', '(', '\013', '2', 'C', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', -'s', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', -'n', 's', 'i', 'o', 'n', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', 'E', 'n', 't', 'r', 'y', -'R', '\035', 't', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', -'p', 't', 'i', 'o', 'n', 's', '\022', 'Q', '\n', '\020', 'd', 'n', 's', '_', 'r', 'e', 'f', 'r', 'e', 's', 'h', '_', 'r', 'a', 't', -'e', '\030', '\020', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', -'.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\014', '\372', 'B', '\t', '\252', '\001', '\006', '*', '\004', '\020', '\300', '\204', '=', 'R', '\016', -'d', 'n', 's', 'R', 'e', 'f', 'r', 'e', 's', 'h', 'R', 'a', 't', 'e', '\022', 'e', '\n', '\030', 'd', 'n', 's', '_', 'f', 'a', 'i', -'l', 'u', 'r', 'e', '_', 'r', 'e', 'f', 'r', 'e', 's', 'h', '_', 'r', 'a', 't', 'e', '\030', ',', ' ', '\001', '(', '\013', '2', ',', +'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', 'B', '\002', '\030', '\001', 'R', '\023', 'h', 't', 't', 'p', 'P', 'r', 'o', 't', 'o', +'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', 'k', '\n', '\026', 'h', 't', 't', 'p', '2', '_', 'p', 'r', 'o', 't', 'o', +'c', 'o', 'l', '_', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\016', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', +'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 't', 't', 'p', '2', 'P', 'r', 'o', 't', +'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', 'B', '\t', '\030', '\001', '\212', '\223', '\267', '*', '\002', '\020', '\001', 'R', '\024', 'h', +'t', 't', 'p', '2', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '\214', '\001', '\n', ' ', 't', +'y', 'p', 'e', 'd', '_', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '_', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '_', 'o', +'p', 't', 'i', 'o', 'n', 's', '\030', '$', ' ', '\003', '(', '\013', '2', 'C', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', +'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'T', 'y', 'p', +'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', +'s', 'E', 'n', 't', 'r', 'y', 'R', '\035', 't', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'P', 'r', 'o', +'t', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', 'Q', '\n', '\020', 'd', 'n', 's', '_', 'r', 'e', 'f', 'r', 'e', +'s', 'h', '_', 'r', 'a', 't', 'e', '\030', '\020', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', +'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\014', '\372', 'B', '\t', '\252', '\001', '\006', '*', '\004', +'\020', '\300', '\204', '=', 'R', '\016', 'd', 'n', 's', 'R', 'e', 'f', 'r', 'e', 's', 'h', 'R', 'a', 't', 'e', '\022', 'e', '\n', '\030', 'd', +'n', 's', '_', 'f', 'a', 'i', 'l', 'u', 'r', 'e', '_', 'r', 'e', 'f', 'r', 'e', 's', 'h', '_', 'r', 'a', 't', 'e', '\030', ',', +' ', '\001', '(', '\013', '2', ',', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', +'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'R', 'e', 'f', 'r', 'e', 's', 'h', 'R', 'a', 't', 'e', +'R', '\025', 'd', 'n', 's', 'F', 'a', 'i', 'l', 'u', 'r', 'e', 'R', 'e', 'f', 'r', 'e', 's', 'h', 'R', 'a', 't', 'e', '\022', '&', +'\n', '\017', 'r', 'e', 's', 'p', 'e', 'c', 't', '_', 'd', 'n', 's', '_', 't', 't', 'l', '\030', '\'', ' ', '\001', '(', '\010', 'R', '\r', +'r', 'e', 's', 'p', 'e', 'c', 't', 'D', 'n', 's', 'T', 't', 'l', '\022', 'f', '\n', '\021', 'd', 'n', 's', '_', 'l', 'o', 'o', 'k', +'u', 'p', '_', 'f', 'a', 'm', 'i', 'l', 'y', '\030', '\021', ' ', '\001', '(', '\016', '2', '0', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', +'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', +'D', 'n', 's', 'L', 'o', 'o', 'k', 'u', 'p', 'F', 'a', 'm', 'i', 'l', 'y', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', +'R', '\017', 'd', 'n', 's', 'L', 'o', 'o', 'k', 'u', 'p', 'F', 'a', 'm', 'i', 'l', 'y', '\022', 'B', '\n', '\r', 'd', 'n', 's', '_', +'r', 'e', 's', 'o', 'l', 'v', 'e', 'r', 's', '\030', '\022', ' ', '\003', '(', '\013', '2', '\035', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', +'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'A', 'd', 'd', 'r', 'e', 's', 's', 'R', '\014', 'd', 'n', +'s', 'R', 'e', 's', 'o', 'l', 'v', 'e', 'r', 's', '\022', '4', '\n', '\027', 'u', 's', 'e', '_', 't', 'c', 'p', '_', 'f', 'o', 'r', +'_', 'd', 'n', 's', '_', 'l', 'o', 'o', 'k', 'u', 'p', 's', '\030', '-', ' ', '\001', '(', '\010', 'R', '\023', 'u', 's', 'e', 'T', 'c', +'p', 'F', 'o', 'r', 'D', 'n', 's', 'L', 'o', 'o', 'k', 'u', 'p', 's', '\022', 'V', '\n', '\021', 'o', 'u', 't', 'l', 'i', 'e', 'r', +'_', 'd', 'e', 't', 'e', 'c', 't', 'i', 'o', 'n', '\030', '\023', ' ', '\001', '(', '\013', '2', ')', '.', 'e', 'n', 'v', 'o', 'y', '.', +'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'O', 'u', 't', 'l', 'i', 'e', 'r', +'D', 'e', 't', 'e', 'c', 't', 'i', 'o', 'n', 'R', '\020', 'o', 'u', 't', 'l', 'i', 'e', 'r', 'D', 'e', 't', 'e', 'c', 't', 'i', +'o', 'n', '\022', 'N', '\n', '\020', 'c', 'l', 'e', 'a', 'n', 'u', 'p', '_', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\030', '\024', ' ', +'\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', +'a', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\252', '\001', '\002', '*', '\000', 'R', '\017', 'c', 'l', 'e', 'a', 'n', 'u', 'p', 'I', +'n', 't', 'e', 'r', 'v', 'a', 'l', '\022', 'R', '\n', '\024', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'b', 'i', 'n', 'd', '_', +'c', 'o', 'n', 'f', 'i', 'g', '\030', '\025', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', +'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'B', 'i', 'n', 'd', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\022', 'u', 'p', +'s', 't', 'r', 'e', 'a', 'm', 'B', 'i', 'n', 'd', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'Y', '\n', '\020', 'l', 'b', '_', 's', 'u', +'b', 's', 'e', 't', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\026', ' ', '\001', '(', '\013', '2', '/', '.', 'e', 'n', 'v', 'o', 'y', +'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', +'r', '.', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\016', 'l', 'b', 'S', 'u', 'b', 's', 'e', +'t', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'b', '\n', '\023', 'r', 'i', 'n', 'g', '_', 'h', 'a', 's', 'h', '_', 'l', 'b', '_', 'c', +'o', 'n', 'f', 'i', 'g', '\030', '\027', ' ', '\001', '(', '\013', '2', '1', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', +'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'R', 'i', 'n', 'g', +'H', 'a', 's', 'h', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', 'H', '\001', 'R', '\020', 'r', 'i', 'n', 'g', 'H', 'a', 's', 'h', 'L', +'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '[', '\n', '\020', 'm', 'a', 'g', 'l', 'e', 'v', '_', 'l', 'b', '_', 'c', 'o', 'n', 'f', +'i', 'g', '\030', '4', ' ', '\001', '(', '\013', '2', '/', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', +'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'M', 'a', 'g', 'l', 'e', 'v', 'L', +'b', 'C', 'o', 'n', 'f', 'i', 'g', 'H', '\001', 'R', '\016', 'm', 'a', 'g', 'l', 'e', 'v', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', +'\022', 'k', '\n', '\026', 'o', 'r', 'i', 'g', 'i', 'n', 'a', 'l', '_', 'd', 's', 't', '_', 'l', 'b', '_', 'c', 'o', 'n', 'f', 'i', +'g', '\030', '\"', ' ', '\001', '(', '\013', '2', '4', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', +'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'O', 'r', 'i', 'g', 'i', 'n', 'a', 'l', +'D', 's', 't', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', 'H', '\001', 'R', '\023', 'o', 'r', 'i', 'g', 'i', 'n', 'a', 'l', 'D', 's', +'t', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'n', '\n', '\027', 'l', 'e', 'a', 's', 't', '_', 'r', 'e', 'q', 'u', 'e', 's', +'t', '_', 'l', 'b', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '%', ' ', '\001', '(', '\013', '2', '5', '.', 'e', 'n', 'v', 'o', 'y', +'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', +'r', '.', 'L', 'e', 'a', 's', 't', 'R', 'e', 'q', 'u', 'e', 's', 't', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', 'H', '\001', 'R', +'\024', 'l', 'e', 'a', 's', 't', 'R', 'e', 'q', 'u', 'e', 's', 't', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'Y', '\n', '\020', +'c', 'o', 'm', 'm', 'o', 'n', '_', 'l', 'b', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\033', ' ', '\001', '(', '\013', '2', '/', '.', +'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', +'l', 'u', 's', 't', 'e', 'r', '.', 'C', 'o', 'm', 'm', 'o', 'n', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\016', 'c', 'o', +'m', 'm', 'o', 'n', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'P', '\n', '\020', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', +'_', 's', 'o', 'c', 'k', 'e', 't', '\030', '\030', ' ', '\001', '(', '\013', '2', '%', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', +'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', 'S', 'o', 'c', 'k', +'e', 't', 'R', '\017', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', 'S', 'o', 'c', 'k', 'e', 't', '\022', ':', '\n', '\010', 'm', 'e', +'t', 'a', 'd', 'a', 't', 'a', '\030', '\031', ' ', '\001', '(', '\013', '2', '\036', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', +'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'R', '\010', 'm', 'e', 't', 'a', +'d', 'a', 't', 'a', '\022', 'l', '\n', '\022', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '_', 's', 'e', 'l', 'e', 'c', 't', 'i', 'o', +'n', '\030', '\032', ' ', '\001', '(', '\016', '2', '9', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', +'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', 'P', +'r', 'o', 't', 'o', 'c', 'o', 'l', 'S', 'e', 'l', 'e', 'c', 't', 'i', 'o', 'n', 'B', '\002', '\030', '\001', 'R', '\021', 'p', 'r', 'o', +'t', 'o', 'c', 'o', 'l', 'S', 'e', 'l', 'e', 'c', 't', 'i', 'o', 'n', '\022', 'r', '\n', '\033', 'u', 'p', 's', 't', 'r', 'e', 'a', +'m', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\036', ' ', '\001', '(', +'\013', '2', '2', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', +'v', '3', '.', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'O', 'p', 't', 'i', +'o', 'n', 's', 'R', '\031', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'O', 'p', +'t', 'i', 'o', 'n', 's', '\022', 'U', '\n', '(', 'c', 'l', 'o', 's', 'e', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', +'s', '_', 'o', 'n', '_', 'h', 'o', 's', 't', '_', 'h', 'e', 'a', 'l', 't', 'h', '_', 'f', 'a', 'i', 'l', 'u', 'r', 'e', '\030', +'\037', ' ', '\001', '(', '\010', 'R', '#', 'c', 'l', 'o', 's', 'e', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 's', 'O', 'n', +'H', 'o', 's', 't', 'H', 'e', 'a', 'l', 't', 'h', 'F', 'a', 'i', 'l', 'u', 'r', 'e', '\022', '@', '\n', '\035', 'i', 'g', 'n', 'o', +'r', 'e', '_', 'h', 'e', 'a', 'l', 't', 'h', '_', 'o', 'n', '_', 'h', 'o', 's', 't', '_', 'r', 'e', 'm', 'o', 'v', 'a', 'l', +'\030', ' ', ' ', '\001', '(', '\010', 'R', '\031', 'i', 'g', 'n', 'o', 'r', 'e', 'H', 'e', 'a', 'l', 't', 'h', 'O', 'n', 'H', 'o', 's', +'t', 'R', 'e', 'm', 'o', 'v', 'a', 'l', '\022', '9', '\n', '\007', 'f', 'i', 'l', 't', 'e', 'r', 's', '\030', '(', ' ', '\003', '(', '\013', +'2', '\037', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', +'3', '.', 'F', 'i', 'l', 't', 'e', 'r', 'R', '\007', 'f', 'i', 'l', 't', 'e', 'r', 's', '\022', '`', '\n', '\025', 'l', 'o', 'a', 'd', +'_', 'b', 'a', 'l', 'a', 'n', 'c', 'i', 'n', 'g', '_', 'p', 'o', 'l', 'i', 'c', 'y', '\030', ')', ' ', '\001', '(', '\013', '2', ',', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', -'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'R', 'e', 'f', 'r', 'e', 's', 'h', 'R', 'a', 't', 'e', 'R', '\025', 'd', 'n', 's', 'F', -'a', 'i', 'l', 'u', 'r', 'e', 'R', 'e', 'f', 'r', 'e', 's', 'h', 'R', 'a', 't', 'e', '\022', '&', '\n', '\017', 'r', 'e', 's', 'p', -'e', 'c', 't', '_', 'd', 'n', 's', '_', 't', 't', 'l', '\030', '\'', ' ', '\001', '(', '\010', 'R', '\r', 'r', 'e', 's', 'p', 'e', 'c', -'t', 'D', 'n', 's', 'T', 't', 'l', '\022', 'f', '\n', '\021', 'd', 'n', 's', '_', 'l', 'o', 'o', 'k', 'u', 'p', '_', 'f', 'a', 'm', -'i', 'l', 'y', '\030', '\021', ' ', '\001', '(', '\016', '2', '0', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', -'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'D', 'n', 's', 'L', 'o', 'o', -'k', 'u', 'p', 'F', 'a', 'm', 'i', 'l', 'y', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\017', 'd', 'n', 's', 'L', -'o', 'o', 'k', 'u', 'p', 'F', 'a', 'm', 'i', 'l', 'y', '\022', 'B', '\n', '\r', 'd', 'n', 's', '_', 'r', 'e', 's', 'o', 'l', 'v', -'e', 'r', 's', '\030', '\022', ' ', '\003', '(', '\013', '2', '\035', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', -'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'A', 'd', 'd', 'r', 'e', 's', 's', 'R', '\014', 'd', 'n', 's', 'R', 'e', 's', 'o', 'l', -'v', 'e', 'r', 's', '\022', '4', '\n', '\027', 'u', 's', 'e', '_', 't', 'c', 'p', '_', 'f', 'o', 'r', '_', 'd', 'n', 's', '_', 'l', -'o', 'o', 'k', 'u', 'p', 's', '\030', '-', ' ', '\001', '(', '\010', 'R', '\023', 'u', 's', 'e', 'T', 'c', 'p', 'F', 'o', 'r', 'D', 'n', -'s', 'L', 'o', 'o', 'k', 'u', 'p', 's', '\022', 'V', '\n', '\021', 'o', 'u', 't', 'l', 'i', 'e', 'r', '_', 'd', 'e', 't', 'e', 'c', -'t', 'i', 'o', 'n', '\030', '\023', ' ', '\001', '(', '\013', '2', ')', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', -'.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'O', 'u', 't', 'l', 'i', 'e', 'r', 'D', 'e', 't', 'e', 'c', 't', -'i', 'o', 'n', 'R', '\020', 'o', 'u', 't', 'l', 'i', 'e', 'r', 'D', 'e', 't', 'e', 'c', 't', 'i', 'o', 'n', '\022', 'N', '\n', '\020', -'c', 'l', 'e', 'a', 'n', 'u', 'p', '_', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\030', '\024', ' ', '\001', '(', '\013', '2', '\031', '.', -'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', -'\010', '\372', 'B', '\005', '\252', '\001', '\002', '*', '\000', 'R', '\017', 'c', 'l', 'e', 'a', 'n', 'u', 'p', 'I', 'n', 't', 'e', 'r', 'v', 'a', -'l', '\022', 'R', '\n', '\024', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'b', 'i', 'n', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', -'\030', '\025', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', -'e', '.', 'v', '3', '.', 'B', 'i', 'n', 'd', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\022', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', -'B', 'i', 'n', 'd', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'Y', '\n', '\020', 'l', 'b', '_', 's', 'u', 'b', 's', 'e', 't', '_', 'c', -'o', 'n', 'f', 'i', 'g', '\030', '\026', ' ', '\001', '(', '\013', '2', '/', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', -'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'L', 'b', 'S', 'u', -'b', 's', 'e', 't', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\016', 'l', 'b', 'S', 'u', 'b', 's', 'e', 't', 'C', 'o', 'n', 'f', 'i', -'g', '\022', 'b', '\n', '\023', 'r', 'i', 'n', 'g', '_', 'h', 'a', 's', 'h', '_', 'l', 'b', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', -'\027', ' ', '\001', '(', '\013', '2', '1', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', -'t', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'R', 'i', 'n', 'g', 'H', 'a', 's', 'h', 'L', 'b', -'C', 'o', 'n', 'f', 'i', 'g', 'H', '\001', 'R', '\020', 'r', 'i', 'n', 'g', 'H', 'a', 's', 'h', 'L', 'b', 'C', 'o', 'n', 'f', 'i', -'g', '\022', '[', '\n', '\020', 'm', 'a', 'g', 'l', 'e', 'v', '_', 'l', 'b', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '4', ' ', '\001', -'(', '\013', '2', '/', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', -'.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'M', 'a', 'g', 'l', 'e', 'v', 'L', 'b', 'C', 'o', 'n', 'f', 'i', -'g', 'H', '\001', 'R', '\016', 'm', 'a', 'g', 'l', 'e', 'v', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'k', '\n', '\026', 'o', 'r', -'i', 'g', 'i', 'n', 'a', 'l', '_', 'd', 's', 't', '_', 'l', 'b', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\"', ' ', '\001', '(', -'\013', '2', '4', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', -'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'O', 'r', 'i', 'g', 'i', 'n', 'a', 'l', 'D', 's', 't', 'L', 'b', 'C', -'o', 'n', 'f', 'i', 'g', 'H', '\001', 'R', '\023', 'o', 'r', 'i', 'g', 'i', 'n', 'a', 'l', 'D', 's', 't', 'L', 'b', 'C', 'o', 'n', -'f', 'i', 'g', '\022', 'n', '\n', '\027', 'l', 'e', 'a', 's', 't', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'l', 'b', '_', 'c', -'o', 'n', 'f', 'i', 'g', '\030', '%', ' ', '\001', '(', '\013', '2', '5', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', -'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'L', 'e', 'a', 's', -'t', 'R', 'e', 'q', 'u', 'e', 's', 't', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', 'H', '\001', 'R', '\024', 'l', 'e', 'a', 's', 't', -'R', 'e', 'q', 'u', 'e', 's', 't', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'Y', '\n', '\020', 'c', 'o', 'm', 'm', 'o', 'n', -'_', 'l', 'b', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\033', ' ', '\001', '(', '\013', '2', '/', '.', 'e', 'n', 'v', 'o', 'y', '.', -'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', -'.', 'C', 'o', 'm', 'm', 'o', 'n', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\016', 'c', 'o', 'm', 'm', 'o', 'n', 'L', 'b', -'C', 'o', 'n', 'f', 'i', 'g', '\022', 'P', '\n', '\020', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', -'t', '\030', '\030', ' ', '\001', '(', '\013', '2', '%', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', -'r', 'e', '.', 'v', '3', '.', 'T', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', 'S', 'o', 'c', 'k', 'e', 't', 'R', '\017', 't', 'r', -'a', 'n', 's', 'p', 'o', 'r', 't', 'S', 'o', 'c', 'k', 'e', 't', '\022', ':', '\n', '\010', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', -'\030', '\031', ' ', '\001', '(', '\013', '2', '\036', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', -'e', '.', 'v', '3', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'R', '\010', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '\022', 'h', -'\n', '\022', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '_', 's', 'e', 'l', 'e', 'c', 't', 'i', 'o', 'n', '\030', '\032', ' ', '\001', '(', -'\016', '2', '9', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', -'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', 'P', 'r', 'o', 't', 'o', 'c', 'o', -'l', 'S', 'e', 'l', 'e', 'c', 't', 'i', 'o', 'n', 'R', '\021', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'S', 'e', 'l', 'e', 'c', -'t', 'i', 'o', 'n', '\022', 'r', '\n', '\033', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', -'o', 'n', '_', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\036', ' ', '\001', '(', '\013', '2', '2', '.', 'e', 'n', 'v', 'o', 'y', '.', -'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'U', 'p', 's', 't', 'r', 'e', 'a', -'m', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\031', 'u', 'p', 's', 't', 'r', -'e', 'a', 'm', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', 'U', '\n', '(', 'c', -'l', 'o', 's', 'e', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 's', '_', 'o', 'n', '_', 'h', 'o', 's', 't', '_', -'h', 'e', 'a', 'l', 't', 'h', '_', 'f', 'a', 'i', 'l', 'u', 'r', 'e', '\030', '\037', ' ', '\001', '(', '\010', 'R', '#', 'c', 'l', 'o', -'s', 'e', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 's', 'O', 'n', 'H', 'o', 's', 't', 'H', 'e', 'a', 'l', 't', 'h', -'F', 'a', 'i', 'l', 'u', 'r', 'e', '\022', '@', '\n', '\035', 'i', 'g', 'n', 'o', 'r', 'e', '_', 'h', 'e', 'a', 'l', 't', 'h', '_', -'o', 'n', '_', 'h', 'o', 's', 't', '_', 'r', 'e', 'm', 'o', 'v', 'a', 'l', '\030', ' ', ' ', '\001', '(', '\010', 'R', '\031', 'i', 'g', -'n', 'o', 'r', 'e', 'H', 'e', 'a', 'l', 't', 'h', 'O', 'n', 'H', 'o', 's', 't', 'R', 'e', 'm', 'o', 'v', 'a', 'l', '\022', '9', -'\n', '\007', 'f', 'i', 'l', 't', 'e', 'r', 's', '\030', '(', ' ', '\003', '(', '\013', '2', '\037', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', -'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'F', 'i', 'l', 't', 'e', 'r', 'R', '\007', -'f', 'i', 'l', 't', 'e', 'r', 's', '\022', '`', '\n', '\025', 'l', 'o', 'a', 'd', '_', 'b', 'a', 'l', 'a', 'n', 'c', 'i', 'n', 'g', -'_', 'p', 'o', 'l', 'i', 'c', 'y', '\030', ')', ' ', '\001', '(', '\013', '2', ',', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', -'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'L', 'o', 'a', 'd', 'B', 'a', 'l', 'a', 'n', 'c', -'i', 'n', 'g', 'P', 'o', 'l', 'i', 'c', 'y', 'R', '\023', 'l', 'o', 'a', 'd', 'B', 'a', 'l', 'a', 'n', 'c', 'i', 'n', 'g', 'P', -'o', 'l', 'i', 'c', 'y', '\022', 'A', '\n', '\n', 'l', 'r', 's', '_', 's', 'e', 'r', 'v', 'e', 'r', '\030', '*', ' ', '\001', '(', '\013', -'2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'C', -'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', 'R', '\t', 'l', 'r', 's', 'S', 'e', 'r', 'v', 'e', 'r', '\022', '6', '\n', -'\025', 't', 'r', 'a', 'c', 'k', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '_', 'b', 'u', 'd', 'g', 'e', 't', 's', '\030', '/', ' ', -'\001', '(', '\010', 'B', '\002', '\030', '\001', 'R', '\023', 't', 'r', 'a', 'c', 'k', 'T', 'i', 'm', 'e', 'o', 'u', 't', 'B', 'u', 'd', 'g', -'e', 't', 's', '\022', 'S', '\n', '\017', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '0', ' ', -'\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', -'3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\016', 'u', -'p', 's', 't', 'r', 'e', 'a', 'm', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'Z', '\n', '\023', 't', 'r', 'a', 'c', 'k', '_', 'c', 'l', -'u', 's', 't', 'e', 'r', '_', 's', 't', 'a', 't', 's', '\030', '1', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', -'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'T', 'r', 'a', 'c', 'k', 'C', -'l', 'u', 's', 't', 'e', 'r', 'S', 't', 'a', 't', 's', 'R', '\021', 't', 'r', 'a', 'c', 'k', 'C', 'l', 'u', 's', 't', 'e', 'r', -'S', 't', 'a', 't', 's', '\022', 'X', '\n', '\017', 'p', 'r', 'e', 'f', 'e', 't', 'c', 'h', '_', 'p', 'o', 'l', 'i', 'c', 'y', '\030', -'2', ' ', '\001', '(', '\013', '2', '/', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', -'t', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'P', 'r', 'e', 'f', 'e', 't', 'c', 'h', 'P', 'o', -'l', 'i', 'c', 'y', 'R', '\016', 'p', 'r', 'e', 'f', 'e', 't', 'c', 'h', 'P', 'o', 'l', 'i', 'c', 'y', '\022', 'X', '\n', ')', 'c', -'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'p', 'o', 'o', 'l', '_', 'p', 'e', 'r', '_', 'd', 'o', 'w', 'n', 's', 't', -'r', 'e', 'a', 'm', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '\030', '3', ' ', '\001', '(', '\010', 'R', '%', 'c', 'o', -'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'P', 'o', 'o', 'l', 'P', 'e', 'r', 'D', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', -'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '\032', '\346', '\001', '\n', '\024', 'T', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', 'S', -'o', 'c', 'k', 'e', 't', 'M', 'a', 't', 'c', 'h', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', -'\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '-', '\n', '\005', 'm', 'a', 't', 'c', 'h', '\030', '\002', -' ', '\001', '(', '\013', '2', '\027', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 't', -'r', 'u', 'c', 't', 'R', '\005', 'm', 'a', 't', 'c', 'h', '\022', 'P', '\n', '\020', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', -'s', 'o', 'c', 'k', 'e', 't', '\030', '\003', ' ', '\001', '(', '\013', '2', '%', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', -'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', 'S', 'o', 'c', 'k', 'e', -'t', 'R', '\017', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', 'S', 'o', 'c', 'k', 'e', 't', ':', '0', '\232', '\305', '\210', '\036', '+', -'\n', ')', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'T', 'r', -'a', 'n', 's', 'p', 'o', 'r', 't', 'S', 'o', 'c', 'k', 'e', 't', 'M', 'a', 't', 'c', 'h', '\032', '\230', '\001', '\n', '\021', 'C', 'u', -'s', 't', 'o', 'm', 'C', 'l', 'u', 's', 't', 'e', 'r', 'T', 'y', 'p', 'e', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', -' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '7', '\n', '\014', 't', 'y', -'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\002', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', -'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'R', '\013', 't', 'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', 'i', -'g', ':', '-', '\232', '\305', '\210', '\036', '(', '\n', '&', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', -'u', 's', 't', 'e', 'r', '.', 'C', 'u', 's', 't', 'o', 'm', 'C', 'l', 'u', 's', 't', 'e', 'r', 'T', 'y', 'p', 'e', '\032', '\247', -'\002', '\n', '\020', 'E', 'd', 's', 'C', 'l', 'u', 's', 't', 'e', 'r', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'A', '\n', '\n', 'e', 'd', -'s', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\001', ' ', '\001', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', -'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', -'R', '\t', 'e', 'd', 's', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '9', '\n', '\014', 's', 'e', 'r', 'v', 'i', 'c', 'e', '_', 'n', 'a', -'m', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'B', '\026', '\362', '\230', '\376', '\217', '\005', '\020', '\022', '\016', 'n', 'a', 'm', 'e', '_', 's', 'p', -'e', 'c', 'i', 'f', 'i', 'e', 'r', 'R', '\013', 's', 'e', 'r', 'v', 'i', 'c', 'e', 'N', 'a', 'm', 'e', '\022', 'g', '\n', '\024', 'e', -'d', 's', '_', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', '_', 'l', 'o', 'c', 'a', 't', 'o', 'r', '\030', '\003', ' ', '\001', '(', '\013', -'2', '\035', '.', 'u', 'd', 'p', 'a', '.', 'c', 'o', 'r', 'e', '.', 'v', '1', '.', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', 'L', -'o', 'c', 'a', 't', 'o', 'r', 'B', '\026', '\362', '\230', '\376', '\217', '\005', '\020', '\022', '\016', 'n', 'a', 'm', 'e', '_', 's', 'p', 'e', 'c', -'i', 'f', 'i', 'e', 'r', 'R', '\022', 'e', 'd', 's', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', 'L', 'o', 'c', 'a', 't', 'o', 'r', -':', ',', '\232', '\305', '\210', '\036', '\'', '\n', '%', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', -'s', 't', 'e', 'r', '.', 'E', 'd', 's', 'C', 'l', 'u', 's', 't', 'e', 'r', 'C', 'o', 'n', 'f', 'i', 'g', '\032', '\300', '\010', '\n', -'\016', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'y', '\n', '\017', 'f', 'a', 'l', 'l', 'b', 'a', -'c', 'k', '_', 'p', 'o', 'l', 'i', 'c', 'y', '\030', '\001', ' ', '\001', '(', '\016', '2', 'F', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', +'L', 'o', 'a', 'd', 'B', 'a', 'l', 'a', 'n', 'c', 'i', 'n', 'g', 'P', 'o', 'l', 'i', 'c', 'y', 'R', '\023', 'l', 'o', 'a', 'd', +'B', 'a', 'l', 'a', 'n', 'c', 'i', 'n', 'g', 'P', 'o', 'l', 'i', 'c', 'y', '\022', 'A', '\n', '\n', 'l', 'r', 's', '_', 's', 'e', +'r', 'v', 'e', 'r', '\030', '*', ' ', '\001', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', +'.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', 'R', '\t', 'l', 'r', +'s', 'S', 'e', 'r', 'v', 'e', 'r', '\022', '6', '\n', '\025', 't', 'r', 'a', 'c', 'k', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '_', +'b', 'u', 'd', 'g', 'e', 't', 's', '\030', '/', ' ', '\001', '(', '\010', 'B', '\002', '\030', '\001', 'R', '\023', 't', 'r', 'a', 'c', 'k', 'T', +'i', 'm', 'e', 'o', 'u', 't', 'B', 'u', 'd', 'g', 'e', 't', 's', '\022', 'S', '\n', '\017', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', +'_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '0', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', +'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', +'n', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\016', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'Z', +'\n', '\023', 't', 'r', 'a', 'c', 'k', '_', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 's', 't', 'a', 't', 's', '\030', '1', ' ', '\001', +'(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', +'.', 'v', '3', '.', 'T', 'r', 'a', 'c', 'k', 'C', 'l', 'u', 's', 't', 'e', 'r', 'S', 't', 'a', 't', 's', 'R', '\021', 't', 'r', +'a', 'c', 'k', 'C', 'l', 'u', 's', 't', 'e', 'r', 'S', 't', 'a', 't', 's', '\022', '^', '\n', '\021', 'p', 'r', 'e', 'c', 'o', 'n', +'n', 'e', 'c', 't', '_', 'p', 'o', 'l', 'i', 'c', 'y', '\030', '2', ' ', '\001', '(', '\013', '2', '1', '.', 'e', 'n', 'v', 'o', 'y', +'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', +'r', '.', 'P', 'r', 'e', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'P', 'o', 'l', 'i', 'c', 'y', 'R', '\020', 'p', 'r', 'e', 'c', 'o', +'n', 'n', 'e', 'c', 't', 'P', 'o', 'l', 'i', 'c', 'y', '\022', 'X', '\n', ')', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', +'_', 'p', 'o', 'o', 'l', '_', 'p', 'e', 'r', '_', 'd', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', '_', 'c', 'o', 'n', 'n', +'e', 'c', 't', 'i', 'o', 'n', '\030', '3', ' ', '\001', '(', '\010', 'R', '%', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'P', +'o', 'o', 'l', 'P', 'e', 'r', 'D', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', +'n', '\032', '\346', '\001', '\n', '\024', 'T', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', 'S', 'o', 'c', 'k', 'e', 't', 'M', 'a', 't', 'c', +'h', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', +'\004', 'n', 'a', 'm', 'e', '\022', '-', '\n', '\005', 'm', 'a', 't', 'c', 'h', '\030', '\002', ' ', '\001', '(', '\013', '2', '\027', '.', 'g', 'o', +'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 't', 'r', 'u', 'c', 't', 'R', '\005', 'm', 'a', 't', +'c', 'h', '\022', 'P', '\n', '\020', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', '\030', '\003', ' ', +'\001', '(', '\013', '2', '%', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', +'3', '.', 'T', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', 'S', 'o', 'c', 'k', 'e', 't', 'R', '\017', 't', 'r', 'a', 'n', 's', 'p', +'o', 'r', 't', 'S', 'o', 'c', 'k', 'e', 't', ':', '0', '\232', '\305', '\210', '\036', '+', '\n', ')', 'e', 'n', 'v', 'o', 'y', '.', 'a', +'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'T', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', 'S', 'o', +'c', 'k', 'e', 't', 'M', 'a', 't', 'c', 'h', '\032', '\230', '\001', '\n', '\021', 'C', 'u', 's', 't', 'o', 'm', 'C', 'l', 'u', 's', 't', +'e', 'r', 'T', 'y', 'p', 'e', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', +'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '7', '\n', '\014', 't', 'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', +'g', '\030', '\002', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', +'.', 'A', 'n', 'y', 'R', '\013', 't', 'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', ':', '-', '\232', '\305', '\210', '\036', '(', '\n', +'&', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'C', 'u', 's', +'t', 'o', 'm', 'C', 'l', 'u', 's', 't', 'e', 'r', 'T', 'y', 'p', 'e', '\032', '\246', '\001', '\n', '\020', 'E', 'd', 's', 'C', 'l', 'u', +'s', 't', 'e', 'r', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'A', '\n', '\n', 'e', 'd', 's', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', +'\001', ' ', '\001', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', +'.', 'v', '3', '.', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', 'R', '\t', 'e', 'd', 's', 'C', 'o', 'n', 'f', +'i', 'g', '\022', '!', '\n', '\014', 's', 'e', 'r', 'v', 'i', 'c', 'e', '_', 'n', 'a', 'm', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', +'\013', 's', 'e', 'r', 'v', 'i', 'c', 'e', 'N', 'a', 'm', 'e', ':', ',', '\232', '\305', '\210', '\036', '\'', '\n', '%', 'e', 'n', 'v', 'o', +'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'E', 'd', 's', 'C', 'l', 'u', 's', 't', +'e', 'r', 'C', 'o', 'n', 'f', 'i', 'g', '\032', '\300', '\010', '\n', '\016', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'C', 'o', 'n', 'f', +'i', 'g', '\022', 'y', '\n', '\017', 'f', 'a', 'l', 'l', 'b', 'a', 'c', 'k', '_', 'p', 'o', 'l', 'i', 'c', 'y', '\030', '\001', ' ', '\001', +'(', '\016', '2', 'F', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', +'.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'C', 'o', 'n', 'f', 'i', +'g', '.', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'F', 'a', 'l', 'l', 'b', 'a', 'c', 'k', 'P', 'o', 'l', 'i', 'c', 'y', 'B', +'\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\016', 'f', 'a', 'l', 'l', 'b', 'a', 'c', 'k', 'P', 'o', 'l', 'i', 'c', 'y', +'\022', '>', '\n', '\016', 'd', 'e', 'f', 'a', 'u', 'l', 't', '_', 's', 'u', 'b', 's', 'e', 't', '\030', '\002', ' ', '\001', '(', '\013', '2', +'\027', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 't', 'r', 'u', 'c', 't', 'R', +'\r', 'd', 'e', 'f', 'a', 'u', 'l', 't', 'S', 'u', 'b', 's', 'e', 't', '\022', 'k', '\n', '\020', 's', 'u', 'b', 's', 'e', 't', '_', +'s', 'e', 'l', 'e', 'c', 't', 'o', 'r', 's', '\030', '\003', ' ', '\003', '(', '\013', '2', '@', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', -'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'F', 'a', -'l', 'l', 'b', 'a', 'c', 'k', 'P', 'o', 'l', 'i', 'c', 'y', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\016', 'f', -'a', 'l', 'l', 'b', 'a', 'c', 'k', 'P', 'o', 'l', 'i', 'c', 'y', '\022', '>', '\n', '\016', 'd', 'e', 'f', 'a', 'u', 'l', 't', '_', -'s', 'u', 'b', 's', 'e', 't', '\030', '\002', ' ', '\001', '(', '\013', '2', '\027', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', -'t', 'o', 'b', 'u', 'f', '.', 'S', 't', 'r', 'u', 'c', 't', 'R', '\r', 'd', 'e', 'f', 'a', 'u', 'l', 't', 'S', 'u', 'b', 's', -'e', 't', '\022', 'k', '\n', '\020', 's', 'u', 'b', 's', 'e', 't', '_', 's', 'e', 'l', 'e', 'c', 't', 'o', 'r', 's', '\030', '\003', ' ', -'\003', '(', '\013', '2', '@', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', -'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'C', 'o', 'n', 'f', -'i', 'g', '.', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'S', 'e', 'l', 'e', 'c', 't', 'o', 'r', 'R', '\017', 's', 'u', 'b', 's', -'e', 't', 'S', 'e', 'l', 'e', 'c', 't', 'o', 'r', 's', '\022', '2', '\n', '\025', 'l', 'o', 'c', 'a', 'l', 'i', 't', 'y', '_', 'w', -'e', 'i', 'g', 'h', 't', '_', 'a', 'w', 'a', 'r', 'e', '\030', '\004', ' ', '\001', '(', '\010', 'R', '\023', 'l', 'o', 'c', 'a', 'l', 'i', -'t', 'y', 'W', 'e', 'i', 'g', 'h', 't', 'A', 'w', 'a', 'r', 'e', '\022', '2', '\n', '\025', 's', 'c', 'a', 'l', 'e', '_', 'l', 'o', -'c', 'a', 'l', 'i', 't', 'y', '_', 'w', 'e', 'i', 'g', 'h', 't', '\030', '\005', ' ', '\001', '(', '\010', 'R', '\023', 's', 'c', 'a', 'l', -'e', 'L', 'o', 'c', 'a', 'l', 'i', 't', 'y', 'W', 'e', 'i', 'g', 'h', 't', '\022', '$', '\n', '\016', 'p', 'a', 'n', 'i', 'c', '_', -'m', 'o', 'd', 'e', '_', 'a', 'n', 'y', '\030', '\006', ' ', '\001', '(', '\010', 'R', '\014', 'p', 'a', 'n', 'i', 'c', 'M', 'o', 'd', 'e', -'A', 'n', 'y', '\022', '\036', '\n', '\013', 'l', 'i', 's', 't', '_', 'a', 's', '_', 'a', 'n', 'y', '\030', '\007', ' ', '\001', '(', '\010', 'R', -'\t', 'l', 'i', 's', 't', 'A', 's', 'A', 'n', 'y', '\032', '\332', '\003', '\n', '\020', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'S', 'e', -'l', 'e', 'c', 't', 'o', 'r', '\022', '\022', '\n', '\004', 'k', 'e', 'y', 's', '\030', '\001', ' ', '\003', '(', '\t', 'R', '\004', 'k', 'e', 'y', -'s', '\022', '3', '\n', '\026', 's', 'i', 'n', 'g', 'l', 'e', '_', 'h', 'o', 's', 't', '_', 'p', 'e', 'r', '_', 's', 'u', 'b', 's', -'e', 't', '\030', '\004', ' ', '\001', '(', '\010', 'R', '\023', 's', 'i', 'n', 'g', 'l', 'e', 'H', 'o', 's', 't', 'P', 'e', 'r', 'S', 'u', -'b', 's', 'e', 't', '\022', '\222', '\001', '\n', '\017', 'f', 'a', 'l', 'l', 'b', 'a', 'c', 'k', '_', 'p', 'o', 'l', 'i', 'c', 'y', '\030', -'\002', ' ', '\001', '(', '\016', '2', '_', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', -'t', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'C', 'o', -'n', 'f', 'i', 'g', '.', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'S', 'e', 'l', 'e', 'c', 't', 'o', 'r', '.', 'L', 'b', 'S', -'u', 'b', 's', 'e', 't', 'S', 'e', 'l', 'e', 'c', 't', 'o', 'r', 'F', 'a', 'l', 'l', 'b', 'a', 'c', 'k', 'P', 'o', 'l', 'i', -'c', 'y', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\016', 'f', 'a', 'l', 'l', 'b', 'a', 'c', 'k', 'P', 'o', 'l', -'i', 'c', 'y', '\022', '0', '\n', '\024', 'f', 'a', 'l', 'l', 'b', 'a', 'c', 'k', '_', 'k', 'e', 'y', 's', '_', 's', 'u', 'b', 's', -'e', 't', '\030', '\003', ' ', '\003', '(', '\t', 'R', '\022', 'f', 'a', 'l', 'l', 'b', 'a', 'c', 'k', 'K', 'e', 'y', 's', 'S', 'u', 'b', -'s', 'e', 't', '\"', 'y', '\n', '\036', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'S', 'e', 'l', 'e', 'c', 't', 'o', 'r', 'F', 'a', -'l', 'l', 'b', 'a', 'c', 'k', 'P', 'o', 'l', 'i', 'c', 'y', '\022', '\017', '\n', '\013', 'N', 'O', 'T', '_', 'D', 'E', 'F', 'I', 'N', -'E', 'D', '\020', '\000', '\022', '\017', '\n', '\013', 'N', 'O', '_', 'F', 'A', 'L', 'L', 'B', 'A', 'C', 'K', '\020', '\001', '\022', '\020', '\n', '\014', -'A', 'N', 'Y', '_', 'E', 'N', 'D', 'P', 'O', 'I', 'N', 'T', '\020', '\002', '\022', '\022', '\n', '\016', 'D', 'E', 'F', 'A', 'U', 'L', 'T', -'_', 'S', 'U', 'B', 'S', 'E', 'T', '\020', '\003', '\022', '\017', '\n', '\013', 'K', 'E', 'Y', 'S', '_', 'S', 'U', 'B', 'S', 'E', 'T', '\020', -'\004', ':', ';', '\232', '\305', '\210', '\036', '6', '\n', '4', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', -'u', 's', 't', 'e', 'r', '.', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'L', 'b', 'S', 'u', -'b', 's', 'e', 't', 'S', 'e', 'l', 'e', 'c', 't', 'o', 'r', '\"', 'O', '\n', '\026', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'F', -'a', 'l', 'l', 'b', 'a', 'c', 'k', 'P', 'o', 'l', 'i', 'c', 'y', '\022', '\017', '\n', '\013', 'N', 'O', '_', 'F', 'A', 'L', 'L', 'B', -'A', 'C', 'K', '\020', '\000', '\022', '\020', '\n', '\014', 'A', 'N', 'Y', '_', 'E', 'N', 'D', 'P', 'O', 'I', 'N', 'T', '\020', '\001', '\022', '\022', -'\n', '\016', 'D', 'E', 'F', 'A', 'U', 'L', 'T', '_', 'S', 'U', 'B', 'S', 'E', 'T', '\020', '\002', ':', '*', '\232', '\305', '\210', '\036', '%', -'\n', '#', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'L', 'b', -'S', 'u', 'b', 's', 'e', 't', 'C', 'o', 'n', 'f', 'i', 'g', '\032', '\347', '\001', '\n', '\024', 'L', 'e', 'a', 's', 't', 'R', 'e', 'q', -'u', 'e', 's', 't', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'H', '\n', '\014', 'c', 'h', 'o', 'i', 'c', 'e', '_', 'c', 'o', -'u', 'n', 't', '\030', '\001', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', -'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\007', '\372', 'B', '\004', '*', '\002', '(', '\002', 'R', '\013', -'c', 'h', 'o', 'i', 'c', 'e', 'C', 'o', 'u', 'n', 't', '\022', 'S', '\n', '\023', 'a', 'c', 't', 'i', 'v', 'e', '_', 'r', 'e', 'q', -'u', 'e', 's', 't', '_', 'b', 'i', 'a', 's', '\030', '\002', ' ', '\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', -'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'D', 'o', 'u', 'b', -'l', 'e', 'R', '\021', 'a', 'c', 't', 'i', 'v', 'e', 'R', 'e', 'q', 'u', 'e', 's', 't', 'B', 'i', 'a', 's', ':', '0', '\232', '\305', -'\210', '\036', '+', '\n', ')', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', -'.', 'L', 'e', 'a', 's', 't', 'R', 'e', 'q', 'u', 'e', 's', 't', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\032', '\221', '\003', '\n', -'\020', 'R', 'i', 'n', 'g', 'H', 'a', 's', 'h', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'T', '\n', '\021', 'm', 'i', 'n', 'i', -'m', 'u', 'm', '_', 'r', 'i', 'n', 'g', '_', 's', 'i', 'z', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', -'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '6', '4', 'V', 'a', 'l', 'u', 'e', 'B', -'\n', '\372', 'B', '\007', '2', '\005', '\030', '\200', '\200', '\200', '\004', 'R', '\017', 'm', 'i', 'n', 'i', 'm', 'u', 'm', 'R', 'i', 'n', 'g', 'S', -'i', 'z', 'e', '\022', 'm', '\n', '\r', 'h', 'a', 's', 'h', '_', 'f', 'u', 'n', 'c', 't', 'i', 'o', 'n', '\030', '\003', ' ', '\001', '(', -'\016', '2', '>', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', -'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'R', 'i', 'n', 'g', 'H', 'a', 's', 'h', 'L', 'b', 'C', 'o', 'n', 'f', -'i', 'g', '.', 'H', 'a', 's', 'h', 'F', 'u', 'n', 'c', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', -'R', '\014', 'h', 'a', 's', 'h', 'F', 'u', 'n', 'c', 't', 'i', 'o', 'n', '\022', 'T', '\n', '\021', 'm', 'a', 'x', 'i', 'm', 'u', 'm', -'_', 'r', 'i', 'n', 'g', '_', 's', 'i', 'z', 'e', '\030', '\004', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', -'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '6', '4', 'V', 'a', 'l', 'u', 'e', 'B', '\n', '\372', 'B', -'\007', '2', '\005', '\030', '\200', '\200', '\200', '\004', 'R', '\017', 'm', 'a', 'x', 'i', 'm', 'u', 'm', 'R', 'i', 'n', 'g', 'S', 'i', 'z', 'e', -'\"', '.', '\n', '\014', 'H', 'a', 's', 'h', 'F', 'u', 'n', 'c', 't', 'i', 'o', 'n', '\022', '\013', '\n', '\007', 'X', 'X', '_', 'H', 'A', -'S', 'H', '\020', '\000', '\022', '\021', '\n', '\r', 'M', 'U', 'R', 'M', 'U', 'R', '_', 'H', 'A', 'S', 'H', '_', '2', '\020', '\001', ':', ',', -'\232', '\305', '\210', '\036', '\'', '\n', '%', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', -'e', 'r', '.', 'R', 'i', 'n', 'g', 'H', 'a', 's', 'h', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', 'J', '\004', '\010', '\002', '\020', '\003', -'\032', 'M', '\n', '\016', 'M', 'a', 'g', 'l', 'e', 'v', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', ';', '\n', '\n', 't', 'a', 'b', -'l', 'e', '_', 's', 'i', 'z', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', -'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '6', '4', 'V', 'a', 'l', 'u', 'e', 'R', '\t', 't', 'a', 'b', 'l', 'e', -'S', 'i', 'z', 'e', '\032', 'n', '\n', '\023', 'O', 'r', 'i', 'g', 'i', 'n', 'a', 'l', 'D', 's', 't', 'L', 'b', 'C', 'o', 'n', 'f', -'i', 'g', '\022', '&', '\n', '\017', 'u', 's', 'e', '_', 'h', 't', 't', 'p', '_', 'h', 'e', 'a', 'd', 'e', 'r', '\030', '\001', ' ', '\001', -'(', '\010', 'R', '\r', 'u', 's', 'e', 'H', 't', 't', 'p', 'H', 'e', 'a', 'd', 'e', 'r', ':', '/', '\232', '\305', '\210', '\036', '*', '\n', -'(', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'O', 'r', 'i', -'g', 'i', 'n', 'a', 'l', 'D', 's', 't', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\032', '\374', '\n', '\n', '\016', 'C', 'o', 'm', 'm', -'o', 'n', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'N', '\n', '\027', 'h', 'e', 'a', 'l', 't', 'h', 'y', '_', 'p', 'a', 'n', -'i', 'c', '_', 't', 'h', 'r', 'e', 's', 'h', 'o', 'l', 'd', '\030', '\001', ' ', '\001', '(', '\013', '2', '\026', '.', 'e', 'n', 'v', 'o', -'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', '\025', 'h', 'e', 'a', 'l', 't', 'h', -'y', 'P', 'a', 'n', 'i', 'c', 'T', 'h', 'r', 'e', 's', 'h', 'o', 'l', 'd', '\022', 't', '\n', '\024', 'z', 'o', 'n', 'e', '_', 'a', -'w', 'a', 'r', 'e', '_', 'l', 'b', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\002', ' ', '\001', '(', '\013', '2', 'A', '.', 'e', 'n', -'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', -'s', 't', 'e', 'r', '.', 'C', 'o', 'm', 'm', 'o', 'n', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'Z', 'o', 'n', 'e', 'A', -'w', 'a', 'r', 'e', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', 'H', '\000', 'R', '\021', 'z', 'o', 'n', 'e', 'A', 'w', 'a', 'r', 'e', -'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '\211', '\001', '\n', '\033', 'l', 'o', 'c', 'a', 'l', 'i', 't', 'y', '_', 'w', 'e', 'i', -'g', 'h', 't', 'e', 'd', '_', 'l', 'b', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\003', ' ', '\001', '(', '\013', '2', 'H', '.', 'e', -'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', -'u', 's', 't', 'e', 'r', '.', 'C', 'o', 'm', 'm', 'o', 'n', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'L', 'o', 'c', 'a', -'l', 'i', 't', 'y', 'W', 'e', 'i', 'g', 'h', 't', 'e', 'd', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', 'H', '\000', 'R', '\030', 'l', -'o', 'c', 'a', 'l', 'i', 't', 'y', 'W', 'e', 'i', 'g', 'h', 't', 'e', 'd', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'I', -'\n', '\023', 'u', 'p', 'd', 'a', 't', 'e', '_', 'm', 'e', 'r', 'g', 'e', '_', 'w', 'i', 'n', 'd', 'o', 'w', '\030', '\004', ' ', '\001', -'(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', -'t', 'i', 'o', 'n', 'R', '\021', 'u', 'p', 'd', 'a', 't', 'e', 'M', 'e', 'r', 'g', 'e', 'W', 'i', 'n', 'd', 'o', 'w', '\022', 'C', -'\n', '\037', 'i', 'g', 'n', 'o', 'r', 'e', '_', 'n', 'e', 'w', '_', 'h', 'o', 's', 't', 's', '_', 'u', 'n', 't', 'i', 'l', '_', -'f', 'i', 'r', 's', 't', '_', 'h', 'c', '\030', '\005', ' ', '\001', '(', '\010', 'R', '\032', 'i', 'g', 'n', 'o', 'r', 'e', 'N', 'e', 'w', -'H', 'o', 's', 't', 's', 'U', 'n', 't', 'i', 'l', 'F', 'i', 'r', 's', 't', 'H', 'c', '\022', 'M', '\n', '$', 'c', 'l', 'o', 's', -'e', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 's', '_', 'o', 'n', '_', 'h', 'o', 's', 't', '_', 's', 'e', 't', -'_', 'c', 'h', 'a', 'n', 'g', 'e', '\030', '\006', ' ', '\001', '(', '\010', 'R', '\037', 'c', 'l', 'o', 's', 'e', 'C', 'o', 'n', 'n', 'e', -'c', 't', 'i', 'o', 'n', 's', 'O', 'n', 'H', 'o', 's', 't', 'S', 'e', 't', 'C', 'h', 'a', 'n', 'g', 'e', '\022', '\212', '\001', '\n', -'\034', 'c', 'o', 'n', 's', 'i', 's', 't', 'e', 'n', 't', '_', 'h', 'a', 's', 'h', 'i', 'n', 'g', '_', 'l', 'b', '_', 'c', 'o', -'n', 'f', 'i', 'g', '\030', '\007', ' ', '\001', '(', '\013', '2', 'I', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', -'.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'C', 'o', 'm', 'm', 'o', -'n', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'C', 'o', 'n', 's', 'i', 's', 't', 'e', 'n', 't', 'H', 'a', 's', 'h', 'i', -'n', 'g', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\031', 'c', 'o', 'n', 's', 'i', 's', 't', 'e', 'n', 't', 'H', 'a', 's', -'h', 'i', 'n', 'g', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\032', '\215', '\002', '\n', '\021', 'Z', 'o', 'n', 'e', 'A', 'w', 'a', 'r', -'e', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '?', '\n', '\017', 'r', 'o', 'u', 't', 'i', 'n', 'g', '_', 'e', 'n', 'a', 'b', -'l', 'e', 'd', '\030', '\001', ' ', '\001', '(', '\013', '2', '\026', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', -'.', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', '\016', 'r', 'o', 'u', 't', 'i', 'n', 'g', 'E', 'n', 'a', 'b', 'l', 'e', 'd', '\022', -'F', '\n', '\020', 'm', 'i', 'n', '_', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 's', 'i', 'z', 'e', '\030', '\002', ' ', '\001', '(', '\013', +'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'S', 'e', +'l', 'e', 'c', 't', 'o', 'r', 'R', '\017', 's', 'u', 'b', 's', 'e', 't', 'S', 'e', 'l', 'e', 'c', 't', 'o', 'r', 's', '\022', '2', +'\n', '\025', 'l', 'o', 'c', 'a', 'l', 'i', 't', 'y', '_', 'w', 'e', 'i', 'g', 'h', 't', '_', 'a', 'w', 'a', 'r', 'e', '\030', '\004', +' ', '\001', '(', '\010', 'R', '\023', 'l', 'o', 'c', 'a', 'l', 'i', 't', 'y', 'W', 'e', 'i', 'g', 'h', 't', 'A', 'w', 'a', 'r', 'e', +'\022', '2', '\n', '\025', 's', 'c', 'a', 'l', 'e', '_', 'l', 'o', 'c', 'a', 'l', 'i', 't', 'y', '_', 'w', 'e', 'i', 'g', 'h', 't', +'\030', '\005', ' ', '\001', '(', '\010', 'R', '\023', 's', 'c', 'a', 'l', 'e', 'L', 'o', 'c', 'a', 'l', 'i', 't', 'y', 'W', 'e', 'i', 'g', +'h', 't', '\022', '$', '\n', '\016', 'p', 'a', 'n', 'i', 'c', '_', 'm', 'o', 'd', 'e', '_', 'a', 'n', 'y', '\030', '\006', ' ', '\001', '(', +'\010', 'R', '\014', 'p', 'a', 'n', 'i', 'c', 'M', 'o', 'd', 'e', 'A', 'n', 'y', '\022', '\036', '\n', '\013', 'l', 'i', 's', 't', '_', 'a', +'s', '_', 'a', 'n', 'y', '\030', '\007', ' ', '\001', '(', '\010', 'R', '\t', 'l', 'i', 's', 't', 'A', 's', 'A', 'n', 'y', '\032', '\332', '\003', +'\n', '\020', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'S', 'e', 'l', 'e', 'c', 't', 'o', 'r', '\022', '\022', '\n', '\004', 'k', 'e', 'y', +'s', '\030', '\001', ' ', '\003', '(', '\t', 'R', '\004', 'k', 'e', 'y', 's', '\022', '3', '\n', '\026', 's', 'i', 'n', 'g', 'l', 'e', '_', 'h', +'o', 's', 't', '_', 'p', 'e', 'r', '_', 's', 'u', 'b', 's', 'e', 't', '\030', '\004', ' ', '\001', '(', '\010', 'R', '\023', 's', 'i', 'n', +'g', 'l', 'e', 'H', 'o', 's', 't', 'P', 'e', 'r', 'S', 'u', 'b', 's', 'e', 't', '\022', '\222', '\001', '\n', '\017', 'f', 'a', 'l', 'l', +'b', 'a', 'c', 'k', '_', 'p', 'o', 'l', 'i', 'c', 'y', '\030', '\002', ' ', '\001', '(', '\016', '2', '_', '.', 'e', 'n', 'v', 'o', 'y', +'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', +'r', '.', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', +'S', 'e', 'l', 'e', 'c', 't', 'o', 'r', '.', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'S', 'e', 'l', 'e', 'c', 't', 'o', 'r', +'F', 'a', 'l', 'l', 'b', 'a', 'c', 'k', 'P', 'o', 'l', 'i', 'c', 'y', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', +'\016', 'f', 'a', 'l', 'l', 'b', 'a', 'c', 'k', 'P', 'o', 'l', 'i', 'c', 'y', '\022', '0', '\n', '\024', 'f', 'a', 'l', 'l', 'b', 'a', +'c', 'k', '_', 'k', 'e', 'y', 's', '_', 's', 'u', 'b', 's', 'e', 't', '\030', '\003', ' ', '\003', '(', '\t', 'R', '\022', 'f', 'a', 'l', +'l', 'b', 'a', 'c', 'k', 'K', 'e', 'y', 's', 'S', 'u', 'b', 's', 'e', 't', '\"', 'y', '\n', '\036', 'L', 'b', 'S', 'u', 'b', 's', +'e', 't', 'S', 'e', 'l', 'e', 'c', 't', 'o', 'r', 'F', 'a', 'l', 'l', 'b', 'a', 'c', 'k', 'P', 'o', 'l', 'i', 'c', 'y', '\022', +'\017', '\n', '\013', 'N', 'O', 'T', '_', 'D', 'E', 'F', 'I', 'N', 'E', 'D', '\020', '\000', '\022', '\017', '\n', '\013', 'N', 'O', '_', 'F', 'A', +'L', 'L', 'B', 'A', 'C', 'K', '\020', '\001', '\022', '\020', '\n', '\014', 'A', 'N', 'Y', '_', 'E', 'N', 'D', 'P', 'O', 'I', 'N', 'T', '\020', +'\002', '\022', '\022', '\n', '\016', 'D', 'E', 'F', 'A', 'U', 'L', 'T', '_', 'S', 'U', 'B', 'S', 'E', 'T', '\020', '\003', '\022', '\017', '\n', '\013', +'K', 'E', 'Y', 'S', '_', 'S', 'U', 'B', 'S', 'E', 'T', '\020', '\004', ':', ';', '\232', '\305', '\210', '\036', '6', '\n', '4', 'e', 'n', 'v', +'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'L', 'b', 'S', 'u', 'b', 's', 'e', +'t', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'S', 'e', 'l', 'e', 'c', 't', 'o', 'r', '\"', +'O', '\n', '\026', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'F', 'a', 'l', 'l', 'b', 'a', 'c', 'k', 'P', 'o', 'l', 'i', 'c', 'y', +'\022', '\017', '\n', '\013', 'N', 'O', '_', 'F', 'A', 'L', 'L', 'B', 'A', 'C', 'K', '\020', '\000', '\022', '\020', '\n', '\014', 'A', 'N', 'Y', '_', +'E', 'N', 'D', 'P', 'O', 'I', 'N', 'T', '\020', '\001', '\022', '\022', '\n', '\016', 'D', 'E', 'F', 'A', 'U', 'L', 'T', '_', 'S', 'U', 'B', +'S', 'E', 'T', '\020', '\002', ':', '*', '\232', '\305', '\210', '\036', '%', '\n', '#', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', +'2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'L', 'b', 'S', 'u', 'b', 's', 'e', 't', 'C', 'o', 'n', 'f', 'i', 'g', '\032', +'\347', '\001', '\n', '\024', 'L', 'e', 'a', 's', 't', 'R', 'e', 'q', 'u', 'e', 's', 't', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', +'H', '\n', '\014', 'c', 'h', 'o', 'i', 'c', 'e', '_', 'c', 'o', 'u', 'n', 't', '\030', '\001', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', +'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', +'e', 'B', '\007', '\372', 'B', '\004', '*', '\002', '(', '\002', 'R', '\013', 'c', 'h', 'o', 'i', 'c', 'e', 'C', 'o', 'u', 'n', 't', '\022', 'S', +'\n', '\023', 'a', 'c', 't', 'i', 'v', 'e', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'b', 'i', 'a', 's', '\030', '\002', ' ', '\001', +'(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', +'.', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'D', 'o', 'u', 'b', 'l', 'e', 'R', '\021', 'a', 'c', 't', 'i', 'v', 'e', 'R', 'e', 'q', +'u', 'e', 's', 't', 'B', 'i', 'a', 's', ':', '0', '\232', '\305', '\210', '\036', '+', '\n', ')', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', +'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'L', 'e', 'a', 's', 't', 'R', 'e', 'q', 'u', 'e', 's', 't', +'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\032', '\221', '\003', '\n', '\020', 'R', 'i', 'n', 'g', 'H', 'a', 's', 'h', 'L', 'b', 'C', 'o', +'n', 'f', 'i', 'g', '\022', 'T', '\n', '\021', 'm', 'i', 'n', 'i', 'm', 'u', 'm', '_', 'r', 'i', 'n', 'g', '_', 's', 'i', 'z', 'e', +'\030', '\001', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', +'U', 'I', 'n', 't', '6', '4', 'V', 'a', 'l', 'u', 'e', 'B', '\n', '\372', 'B', '\007', '2', '\005', '\030', '\200', '\200', '\200', '\004', 'R', '\017', +'m', 'i', 'n', 'i', 'm', 'u', 'm', 'R', 'i', 'n', 'g', 'S', 'i', 'z', 'e', '\022', 'm', '\n', '\r', 'h', 'a', 's', 'h', '_', 'f', +'u', 'n', 'c', 't', 'i', 'o', 'n', '\030', '\003', ' ', '\001', '(', '\016', '2', '>', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', +'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'R', 'i', +'n', 'g', 'H', 'a', 's', 'h', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'H', 'a', 's', 'h', 'F', 'u', 'n', 'c', 't', 'i', +'o', 'n', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\014', 'h', 'a', 's', 'h', 'F', 'u', 'n', 'c', 't', 'i', 'o', +'n', '\022', 'T', '\n', '\021', 'm', 'a', 'x', 'i', 'm', 'u', 'm', '_', 'r', 'i', 'n', 'g', '_', 's', 'i', 'z', 'e', '\030', '\004', ' ', +'\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', +'t', '6', '4', 'V', 'a', 'l', 'u', 'e', 'B', '\n', '\372', 'B', '\007', '2', '\005', '\030', '\200', '\200', '\200', '\004', 'R', '\017', 'm', 'a', 'x', +'i', 'm', 'u', 'm', 'R', 'i', 'n', 'g', 'S', 'i', 'z', 'e', '\"', '.', '\n', '\014', 'H', 'a', 's', 'h', 'F', 'u', 'n', 'c', 't', +'i', 'o', 'n', '\022', '\013', '\n', '\007', 'X', 'X', '_', 'H', 'A', 'S', 'H', '\020', '\000', '\022', '\021', '\n', '\r', 'M', 'U', 'R', 'M', 'U', +'R', '_', 'H', 'A', 'S', 'H', '_', '2', '\020', '\001', ':', ',', '\232', '\305', '\210', '\036', '\'', '\n', '%', 'e', 'n', 'v', 'o', 'y', '.', +'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'R', 'i', 'n', 'g', 'H', 'a', 's', 'h', 'L', 'b', +'C', 'o', 'n', 'f', 'i', 'g', 'J', '\004', '\010', '\002', '\020', '\003', '\032', 'M', '\n', '\016', 'M', 'a', 'g', 'l', 'e', 'v', 'L', 'b', 'C', +'o', 'n', 'f', 'i', 'g', '\022', ';', '\n', '\n', 't', 'a', 'b', 'l', 'e', '_', 's', 'i', 'z', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '6', '4', -'V', 'a', 'l', 'u', 'e', 'R', '\016', 'm', 'i', 'n', 'C', 'l', 'u', 's', 't', 'e', 'r', 'S', 'i', 'z', 'e', '\022', '1', '\n', '\025', -'f', 'a', 'i', 'l', '_', 't', 'r', 'a', 'f', 'f', 'i', 'c', '_', 'o', 'n', '_', 'p', 'a', 'n', 'i', 'c', '\030', '\003', ' ', '\001', -'(', '\010', 'R', '\022', 'f', 'a', 'i', 'l', 'T', 'r', 'a', 'f', 'f', 'i', 'c', 'O', 'n', 'P', 'a', 'n', 'i', 'c', ':', '<', '\232', -'\305', '\210', '\036', '7', '\n', '5', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', -'r', '.', 'C', 'o', 'm', 'm', 'o', 'n', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'Z', 'o', 'n', 'e', 'A', 'w', 'a', 'r', -'e', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\032', '_', '\n', '\030', 'L', 'o', 'c', 'a', 'l', 'i', 't', 'y', 'W', 'e', 'i', 'g', -'h', 't', 'e', 'd', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', ':', 'C', '\232', '\305', '\210', '\036', '>', '\n', '<', 'e', 'n', 'v', 'o', +'V', 'a', 'l', 'u', 'e', 'R', '\t', 't', 'a', 'b', 'l', 'e', 'S', 'i', 'z', 'e', '\032', 'n', '\n', '\023', 'O', 'r', 'i', 'g', 'i', +'n', 'a', 'l', 'D', 's', 't', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '&', '\n', '\017', 'u', 's', 'e', '_', 'h', 't', 't', +'p', '_', 'h', 'e', 'a', 'd', 'e', 'r', '\030', '\001', ' ', '\001', '(', '\010', 'R', '\r', 'u', 's', 'e', 'H', 't', 't', 'p', 'H', 'e', +'a', 'd', 'e', 'r', ':', '/', '\232', '\305', '\210', '\036', '*', '\n', '(', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', +'.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'O', 'r', 'i', 'g', 'i', 'n', 'a', 'l', 'D', 's', 't', 'L', 'b', 'C', 'o', 'n', +'f', 'i', 'g', '\032', '\374', '\n', '\n', '\016', 'C', 'o', 'm', 'm', 'o', 'n', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'N', '\n', +'\027', 'h', 'e', 'a', 'l', 't', 'h', 'y', '_', 'p', 'a', 'n', 'i', 'c', '_', 't', 'h', 'r', 'e', 's', 'h', 'o', 'l', 'd', '\030', +'\001', ' ', '\001', '(', '\013', '2', '\026', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'P', 'e', 'r', +'c', 'e', 'n', 't', 'R', '\025', 'h', 'e', 'a', 'l', 't', 'h', 'y', 'P', 'a', 'n', 'i', 'c', 'T', 'h', 'r', 'e', 's', 'h', 'o', +'l', 'd', '\022', 't', '\n', '\024', 'z', 'o', 'n', 'e', '_', 'a', 'w', 'a', 'r', 'e', '_', 'l', 'b', '_', 'c', 'o', 'n', 'f', 'i', +'g', '\030', '\002', ' ', '\001', '(', '\013', '2', 'A', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', +'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'C', 'o', 'm', 'm', 'o', 'n', 'L', 'b', +'C', 'o', 'n', 'f', 'i', 'g', '.', 'Z', 'o', 'n', 'e', 'A', 'w', 'a', 'r', 'e', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', 'H', +'\000', 'R', '\021', 'z', 'o', 'n', 'e', 'A', 'w', 'a', 'r', 'e', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '\211', '\001', '\n', '\033', +'l', 'o', 'c', 'a', 'l', 'i', 't', 'y', '_', 'w', 'e', 'i', 'g', 'h', 't', 'e', 'd', '_', 'l', 'b', '_', 'c', 'o', 'n', 'f', +'i', 'g', '\030', '\003', ' ', '\001', '(', '\013', '2', 'H', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', +'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'C', 'o', 'm', 'm', 'o', 'n', 'L', +'b', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'L', 'o', 'c', 'a', 'l', 'i', 't', 'y', 'W', 'e', 'i', 'g', 'h', 't', 'e', 'd', 'L', +'b', 'C', 'o', 'n', 'f', 'i', 'g', 'H', '\000', 'R', '\030', 'l', 'o', 'c', 'a', 'l', 'i', 't', 'y', 'W', 'e', 'i', 'g', 'h', 't', +'e', 'd', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'I', '\n', '\023', 'u', 'p', 'd', 'a', 't', 'e', '_', 'm', 'e', 'r', 'g', +'e', '_', 'w', 'i', 'n', 'd', 'o', 'w', '\030', '\004', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', +'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\021', 'u', 'p', 'd', 'a', 't', 'e', 'M', +'e', 'r', 'g', 'e', 'W', 'i', 'n', 'd', 'o', 'w', '\022', 'C', '\n', '\037', 'i', 'g', 'n', 'o', 'r', 'e', '_', 'n', 'e', 'w', '_', +'h', 'o', 's', 't', 's', '_', 'u', 'n', 't', 'i', 'l', '_', 'f', 'i', 'r', 's', 't', '_', 'h', 'c', '\030', '\005', ' ', '\001', '(', +'\010', 'R', '\032', 'i', 'g', 'n', 'o', 'r', 'e', 'N', 'e', 'w', 'H', 'o', 's', 't', 's', 'U', 'n', 't', 'i', 'l', 'F', 'i', 'r', +'s', 't', 'H', 'c', '\022', 'M', '\n', '$', 'c', 'l', 'o', 's', 'e', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 's', +'_', 'o', 'n', '_', 'h', 'o', 's', 't', '_', 's', 'e', 't', '_', 'c', 'h', 'a', 'n', 'g', 'e', '\030', '\006', ' ', '\001', '(', '\010', +'R', '\037', 'c', 'l', 'o', 's', 'e', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 's', 'O', 'n', 'H', 'o', 's', 't', 'S', +'e', 't', 'C', 'h', 'a', 'n', 'g', 'e', '\022', '\212', '\001', '\n', '\034', 'c', 'o', 'n', 's', 'i', 's', 't', 'e', 'n', 't', '_', 'h', +'a', 's', 'h', 'i', 'n', 'g', '_', 'l', 'b', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\007', ' ', '\001', '(', '\013', '2', 'I', '.', +'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '.', 'C', +'l', 'u', 's', 't', 'e', 'r', '.', 'C', 'o', 'm', 'm', 'o', 'n', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'C', 'o', 'n', +'s', 'i', 's', 't', 'e', 'n', 't', 'H', 'a', 's', 'h', 'i', 'n', 'g', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\031', 'c', +'o', 'n', 's', 'i', 's', 't', 'e', 'n', 't', 'H', 'a', 's', 'h', 'i', 'n', 'g', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\032', +'\215', '\002', '\n', '\021', 'Z', 'o', 'n', 'e', 'A', 'w', 'a', 'r', 'e', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '?', '\n', '\017', +'r', 'o', 'u', 't', 'i', 'n', 'g', '_', 'e', 'n', 'a', 'b', 'l', 'e', 'd', '\030', '\001', ' ', '\001', '(', '\013', '2', '\026', '.', 'e', +'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', '\016', 'r', 'o', 'u', +'t', 'i', 'n', 'g', 'E', 'n', 'a', 'b', 'l', 'e', 'd', '\022', 'F', '\n', '\020', 'm', 'i', 'n', '_', 'c', 'l', 'u', 's', 't', 'e', +'r', '_', 's', 'i', 'z', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', +'t', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '6', '4', 'V', 'a', 'l', 'u', 'e', 'R', '\016', 'm', 'i', 'n', 'C', 'l', 'u', +'s', 't', 'e', 'r', 'S', 'i', 'z', 'e', '\022', '1', '\n', '\025', 'f', 'a', 'i', 'l', '_', 't', 'r', 'a', 'f', 'f', 'i', 'c', '_', +'o', 'n', '_', 'p', 'a', 'n', 'i', 'c', '\030', '\003', ' ', '\001', '(', '\010', 'R', '\022', 'f', 'a', 'i', 'l', 'T', 'r', 'a', 'f', 'f', +'i', 'c', 'O', 'n', 'P', 'a', 'n', 'i', 'c', ':', '<', '\232', '\305', '\210', '\036', '7', '\n', '5', 'e', 'n', 'v', 'o', 'y', '.', 'a', +'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'C', 'o', 'm', 'm', 'o', 'n', 'L', 'b', 'C', 'o', 'n', +'f', 'i', 'g', '.', 'Z', 'o', 'n', 'e', 'A', 'w', 'a', 'r', 'e', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\032', '_', '\n', '\030', +'L', 'o', 'c', 'a', 'l', 'i', 't', 'y', 'W', 'e', 'i', 'g', 'h', 't', 'e', 'd', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', ':', +'C', '\232', '\305', '\210', '\036', '>', '\n', '<', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', +'t', 'e', 'r', '.', 'C', 'o', 'm', 'm', 'o', 'n', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'L', 'o', 'c', 'a', 'l', 'i', +'t', 'y', 'W', 'e', 'i', 'g', 'h', 't', 'e', 'd', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\032', '\361', '\001', '\n', '\031', 'C', 'o', +'n', 's', 'i', 's', 't', 'e', 'n', 't', 'H', 'a', 's', 'h', 'i', 'n', 'g', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '7', +'\n', '\030', 'u', 's', 'e', '_', 'h', 'o', 's', 't', 'n', 'a', 'm', 'e', '_', 'f', 'o', 'r', '_', 'h', 'a', 's', 'h', 'i', 'n', +'g', '\030', '\001', ' ', '\001', '(', '\010', 'R', '\025', 'u', 's', 'e', 'H', 'o', 's', 't', 'n', 'a', 'm', 'e', 'F', 'o', 'r', 'H', 'a', +'s', 'h', 'i', 'n', 'g', '\022', 'U', '\n', '\023', 'h', 'a', 's', 'h', '_', 'b', 'a', 'l', 'a', 'n', 'c', 'e', '_', 'f', 'a', 'c', +'t', 'o', 'r', '\030', '\002', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', +'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\007', '\372', 'B', '\004', '*', '\002', '(', 'd', 'R', '\021', +'h', 'a', 's', 'h', 'B', 'a', 'l', 'a', 'n', 'c', 'e', 'F', 'a', 'c', 't', 'o', 'r', ':', 'D', '\232', '\305', '\210', '\036', '?', '\n', +'=', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'C', 'o', 'm', +'m', 'o', 'n', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'C', 'o', 'n', 's', 'i', 's', 't', 'e', 'n', 't', 'H', 'a', 's', +'h', 'i', 'n', 'g', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', ':', '*', '\232', '\305', '\210', '\036', '%', '\n', '#', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'C', 'o', 'm', 'm', 'o', 'n', 'L', 'b', -'C', 'o', 'n', 'f', 'i', 'g', '.', 'L', 'o', 'c', 'a', 'l', 'i', 't', 'y', 'W', 'e', 'i', 'g', 'h', 't', 'e', 'd', 'L', 'b', -'C', 'o', 'n', 'f', 'i', 'g', '\032', '\361', '\001', '\n', '\031', 'C', 'o', 'n', 's', 'i', 's', 't', 'e', 'n', 't', 'H', 'a', 's', 'h', -'i', 'n', 'g', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '7', '\n', '\030', 'u', 's', 'e', '_', 'h', 'o', 's', 't', 'n', 'a', -'m', 'e', '_', 'f', 'o', 'r', '_', 'h', 'a', 's', 'h', 'i', 'n', 'g', '\030', '\001', ' ', '\001', '(', '\010', 'R', '\025', 'u', 's', 'e', -'H', 'o', 's', 't', 'n', 'a', 'm', 'e', 'F', 'o', 'r', 'H', 'a', 's', 'h', 'i', 'n', 'g', '\022', 'U', '\n', '\023', 'h', 'a', 's', -'h', '_', 'b', 'a', 'l', 'a', 'n', 'c', 'e', '_', 'f', 'a', 'c', 't', 'o', 'r', '\030', '\002', ' ', '\001', '(', '\013', '2', '\034', '.', -'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', -'u', 'e', 'B', '\007', '\372', 'B', '\004', '*', '\002', '(', 'd', 'R', '\021', 'h', 'a', 's', 'h', 'B', 'a', 'l', 'a', 'n', 'c', 'e', 'F', -'a', 'c', 't', 'o', 'r', ':', 'D', '\232', '\305', '\210', '\036', '?', '\n', '=', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', -'2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'C', 'o', 'm', 'm', 'o', 'n', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', '.', -'C', 'o', 'n', 's', 'i', 's', 't', 'e', 'n', 't', 'H', 'a', 's', 'h', 'i', 'n', 'g', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', -':', '*', '\232', '\305', '\210', '\036', '%', '\n', '#', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', -'s', 't', 'e', 'r', '.', 'C', 'o', 'm', 'm', 'o', 'n', 'L', 'b', 'C', 'o', 'n', 'f', 'i', 'g', 'B', '\033', '\n', '\031', 'l', 'o', -'c', 'a', 'l', 'i', 't', 'y', '_', 'c', 'o', 'n', 'f', 'i', 'g', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\032', '\322', -'\001', '\n', '\013', 'R', 'e', 'f', 'r', 'e', 's', 'h', 'R', 'a', 't', 'e', '\022', 'N', '\n', '\r', 'b', 'a', 's', 'e', '_', 'i', 'n', -'t', 'e', 'r', 'v', 'a', 'l', '\030', '\001', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', -'t', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\016', '\372', 'B', '\013', '\252', '\001', '\010', '\010', '\001', '*', -'\004', '\020', '\300', '\204', '=', 'R', '\014', 'b', 'a', 's', 'e', 'I', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\022', 'J', '\n', '\014', 'm', 'a', -'x', '_', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\030', '\002', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', -'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\014', '\372', 'B', '\t', '\252', '\001', -'\006', '*', '\004', '\020', '\300', '\204', '=', 'R', '\013', 'm', 'a', 'x', 'I', 'n', 't', 'e', 'r', 'v', 'a', 'l', ':', '\'', '\232', '\305', '\210', -'\036', '\"', '\n', ' ', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', -'R', 'e', 'f', 'r', 'e', 's', 'h', 'R', 'a', 't', 'e', '\032', '\371', '\001', '\n', '\016', 'P', 'r', 'e', 'f', 'e', 't', 'c', 'h', 'P', -'o', 'l', 'i', 'c', 'y', '\022', 't', '\n', '\033', 'p', 'e', 'r', '_', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'p', 'r', 'e', -'f', 'e', 't', 'c', 'h', '_', 'r', 'a', 't', 'i', 'o', '\030', '\001', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', -'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'o', 'u', 'b', 'l', 'e', 'V', 'a', 'l', 'u', 'e', 'B', '\027', '\372', -'B', '\024', '\022', '\022', '\031', '\000', '\000', '\000', '\000', '\000', '\000', '\010', '@', ')', '\000', '\000', '\000', '\000', '\000', '\000', '\360', '?', 'R', '\030', 'p', -'e', 'r', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'P', 'r', 'e', 'f', 'e', 't', 'c', 'h', 'R', 'a', 't', 'i', 'o', '\022', 'q', -'\n', '\031', 'p', 'r', 'e', 'd', 'i', 'c', 't', 'i', 'v', 'e', '_', 'p', 'r', 'e', 'f', 'e', 't', 'c', 'h', '_', 'r', 'a', 't', -'i', 'o', '\030', '\002', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', +'C', 'o', 'n', 'f', 'i', 'g', 'B', '\033', '\n', '\031', 'l', 'o', 'c', 'a', 'l', 'i', 't', 'y', '_', 'c', 'o', 'n', 'f', 'i', 'g', +'_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\032', '\322', '\001', '\n', '\013', 'R', 'e', 'f', 'r', 'e', 's', 'h', 'R', 'a', 't', +'e', '\022', 'N', '\n', '\r', 'b', 'a', 's', 'e', '_', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\030', '\001', ' ', '\001', '(', '\013', '2', +'\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', +'n', 'B', '\016', '\372', 'B', '\013', '\252', '\001', '\010', '\010', '\001', '*', '\004', '\020', '\300', '\204', '=', 'R', '\014', 'b', 'a', 's', 'e', 'I', 'n', +'t', 'e', 'r', 'v', 'a', 'l', '\022', 'J', '\n', '\014', 'm', 'a', 'x', '_', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\030', '\002', ' ', +'\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', +'a', 't', 'i', 'o', 'n', 'B', '\014', '\372', 'B', '\t', '\252', '\001', '\006', '*', '\004', '\020', '\300', '\204', '=', 'R', '\013', 'm', 'a', 'x', 'I', +'n', 't', 'e', 'r', 'v', 'a', 'l', ':', '\'', '\232', '\305', '\210', '\036', '\"', '\n', ' ', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', +'.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'R', 'e', 'f', 'r', 'e', 's', 'h', 'R', 'a', 't', 'e', '\032', '\203', +'\002', '\n', '\020', 'P', 'r', 'e', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'P', 'o', 'l', 'i', 'c', 'y', '\022', 'x', '\n', '\035', 'p', 'e', +'r', '_', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'p', 'r', 'e', 'c', 'o', 'n', 'n', 'e', 'c', 't', '_', 'r', 'a', 't', +'i', 'o', '\030', '\001', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'o', 'u', 'b', 'l', 'e', 'V', 'a', 'l', 'u', 'e', 'B', '\027', '\372', 'B', '\024', '\022', '\022', '\031', '\000', '\000', '\000', '\000', -'\000', '\000', '\010', '@', ')', '\000', '\000', '\000', '\000', '\000', '\000', '\360', '?', 'R', '\027', 'p', 'r', 'e', 'd', 'i', 'c', 't', 'i', 'v', 'e', -'P', 'r', 'e', 'f', 'e', 't', 'c', 'h', 'R', 'a', 't', 'i', 'o', '\032', 'f', '\n', '\"', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', -'e', 'n', 's', 'i', 'o', 'n', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', 'E', 'n', 't', 'r', -'y', '\022', '\020', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\003', 'k', 'e', 'y', '\022', '*', '\n', '\005', 'v', 'a', -'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', -'u', 'f', '.', 'A', 'n', 'y', 'R', '\005', 'v', 'a', 'l', 'u', 'e', ':', '\002', '8', '\001', '\"', 'W', '\n', '\r', 'D', 'i', 's', 'c', -'o', 'v', 'e', 'r', 'y', 'T', 'y', 'p', 'e', '\022', '\n', '\n', '\006', 'S', 'T', 'A', 'T', 'I', 'C', '\020', '\000', '\022', '\016', '\n', '\n', -'S', 'T', 'R', 'I', 'C', 'T', '_', 'D', 'N', 'S', '\020', '\001', '\022', '\017', '\n', '\013', 'L', 'O', 'G', 'I', 'C', 'A', 'L', '_', 'D', -'N', 'S', '\020', '\002', '\022', '\007', '\n', '\003', 'E', 'D', 'S', '\020', '\003', '\022', '\020', '\n', '\014', 'O', 'R', 'I', 'G', 'I', 'N', 'A', 'L', -'_', 'D', 'S', 'T', '\020', '\004', '\"', '\244', '\001', '\n', '\010', 'L', 'b', 'P', 'o', 'l', 'i', 'c', 'y', '\022', '\017', '\n', '\013', 'R', 'O', -'U', 'N', 'D', '_', 'R', 'O', 'B', 'I', 'N', '\020', '\000', '\022', '\021', '\n', '\r', 'L', 'E', 'A', 'S', 'T', '_', 'R', 'E', 'Q', 'U', -'E', 'S', 'T', '\020', '\001', '\022', '\r', '\n', '\t', 'R', 'I', 'N', 'G', '_', 'H', 'A', 'S', 'H', '\020', '\002', '\022', '\n', '\n', '\006', 'R', -'A', 'N', 'D', 'O', 'M', '\020', '\003', '\022', '\n', '\n', '\006', 'M', 'A', 'G', 'L', 'E', 'V', '\020', '\005', '\022', '\024', '\n', '\020', 'C', 'L', -'U', 'S', 'T', 'E', 'R', '_', 'P', 'R', 'O', 'V', 'I', 'D', 'E', 'D', '\020', '\006', '\022', ' ', '\n', '\034', 'L', 'O', 'A', 'D', '_', -'B', 'A', 'L', 'A', 'N', 'C', 'I', 'N', 'G', '_', 'P', 'O', 'L', 'I', 'C', 'Y', '_', 'C', 'O', 'N', 'F', 'I', 'G', '\020', '\007', -'\"', '\004', '\010', '\004', '\020', '\004', '*', '\017', 'O', 'R', 'I', 'G', 'I', 'N', 'A', 'L', '_', 'D', 'S', 'T', '_', 'L', 'B', '\"', '5', -'\n', '\017', 'D', 'n', 's', 'L', 'o', 'o', 'k', 'u', 'p', 'F', 'a', 'm', 'i', 'l', 'y', '\022', '\010', '\n', '\004', 'A', 'U', 'T', 'O', -'\020', '\000', '\022', '\013', '\n', '\007', 'V', '4', '_', 'O', 'N', 'L', 'Y', '\020', '\001', '\022', '\013', '\n', '\007', 'V', '6', '_', 'O', 'N', 'L', -'Y', '\020', '\002', '\"', 'T', '\n', '\030', 'C', 'l', 'u', 's', 't', 'e', 'r', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'S', 'e', 'l', -'e', 'c', 't', 'i', 'o', 'n', '\022', '\033', '\n', '\027', 'U', 'S', 'E', '_', 'C', 'O', 'N', 'F', 'I', 'G', 'U', 'R', 'E', 'D', '_', -'P', 'R', 'O', 'T', 'O', 'C', 'O', 'L', '\020', '\000', '\022', '\033', '\n', '\027', 'U', 'S', 'E', '_', 'D', 'O', 'W', 'N', 'S', 'T', 'R', -'E', 'A', 'M', '_', 'P', 'R', 'O', 'T', 'O', 'C', 'O', 'L', '\020', '\001', ':', '\033', '\232', '\305', '\210', '\036', '\026', '\n', '\024', 'e', 'n', -'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', 'B', '\030', '\n', '\026', 'c', 'l', 'u', -'s', 't', 'e', 'r', '_', 'd', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', '_', 't', 'y', 'p', 'e', 'B', '\013', '\n', '\t', 'l', 'b', -'_', 'c', 'o', 'n', 'f', 'i', 'g', 'J', '\004', '\010', '\014', '\020', '\r', 'J', '\004', '\010', '\017', '\020', '\020', 'J', '\004', '\010', '\007', '\020', '\010', -'J', '\004', '\010', '\013', '\020', '\014', 'J', '\004', '\010', '#', '\020', '$', 'R', '\005', 'h', 'o', 's', 't', 's', 'R', '\013', 't', 'l', 's', '_', -'c', 'o', 'n', 't', 'e', 'x', 't', 'R', '\032', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '_', 'p', 'r', 'o', 't', 'o', 'c', -'o', 'l', '_', 'o', 'p', 't', 'i', 'o', 'n', 's', '\"', '\245', '\002', '\n', '\023', 'L', 'o', 'a', 'd', 'B', 'a', 'l', 'a', 'n', 'c', -'i', 'n', 'g', 'P', 'o', 'l', 'i', 'c', 'y', '\022', 'O', '\n', '\010', 'p', 'o', 'l', 'i', 'c', 'i', 'e', 's', '\030', '\001', ' ', '\003', -'(', '\013', '2', '3', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', -'.', 'v', '3', '.', 'L', 'o', 'a', 'd', 'B', 'a', 'l', 'a', 'n', 'c', 'i', 'n', 'g', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'P', -'o', 'l', 'i', 'c', 'y', 'R', '\010', 'p', 'o', 'l', 'i', 'c', 'i', 'e', 's', '\032', '\223', '\001', '\n', '\006', 'P', 'o', 'l', 'i', 'c', -'y', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '7', '\n', '\014', -'t', 'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\003', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', -'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'R', '\013', 't', 'y', 'p', 'e', 'd', 'C', 'o', 'n', -'f', 'i', 'g', ':', '.', '\232', '\305', '\210', '\036', ')', '\n', '\'', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', -'L', 'o', 'a', 'd', 'B', 'a', 'l', 'a', 'n', 'c', 'i', 'n', 'g', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'P', 'o', 'l', 'i', 'c', -'y', 'J', '\004', '\010', '\002', '\020', '\003', 'R', '\006', 'c', 'o', 'n', 'f', 'i', 'g', ':', '\'', '\232', '\305', '\210', '\036', '\"', '\n', ' ', 'e', -'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'L', 'o', 'a', 'd', 'B', 'a', 'l', 'a', 'n', 'c', 'i', 'n', 'g', -'P', 'o', 'l', 'i', 'c', 'y', '\"', '\202', '\001', '\n', '\022', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'B', 'i', 'n', 'd', 'C', 'o', -'n', 'f', 'i', 'g', '\022', 'D', '\n', '\016', 's', 'o', 'u', 'r', 'c', 'e', '_', 'a', 'd', 'd', 'r', 'e', 's', 's', '\030', '\001', ' ', -'\001', '(', '\013', '2', '\035', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', -'3', '.', 'A', 'd', 'd', 'r', 'e', 's', 's', 'R', '\r', 's', 'o', 'u', 'r', 'c', 'e', 'A', 'd', 'd', 'r', 'e', 's', 's', ':', -'&', '\232', '\305', '\210', '\036', '!', '\n', '\037', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'U', 'p', 's', 't', -'r', 'e', 'a', 'm', 'B', 'i', 'n', 'd', 'C', 'o', 'n', 'f', 'i', 'g', '\"', '\223', '\001', '\n', '\031', 'U', 'p', 's', 't', 'r', 'e', -'a', 'm', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', 'G', '\n', '\r', 't', 'c', -'p', '_', 'k', 'e', 'e', 'p', 'a', 'l', 'i', 'v', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', -'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'c', 'p', 'K', 'e', 'e', 'p', 'a', 'l', -'i', 'v', 'e', 'R', '\014', 't', 'c', 'p', 'K', 'e', 'e', 'p', 'a', 'l', 'i', 'v', 'e', ':', '-', '\232', '\305', '\210', '\036', '(', '\n', -'&', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'C', 'o', 'n', -'n', 'e', 'c', 't', 'i', 'o', 'n', 'O', 'p', 't', 'i', 'o', 'n', 's', '\"', 'r', '\n', '\021', 'T', 'r', 'a', 'c', 'k', 'C', 'l', -'u', 's', 't', 'e', 'r', 'S', 't', 'a', 't', 's', '\022', '\'', '\n', '\017', 't', 'i', 'm', 'e', 'o', 'u', 't', '_', 'b', 'u', 'd', -'g', 'e', 't', 's', '\030', '\001', ' ', '\001', '(', '\010', 'R', '\016', 't', 'i', 'm', 'e', 'o', 'u', 't', 'B', 'u', 'd', 'g', 'e', 't', -'s', '\022', '4', '\n', '\026', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 's', 'i', 'z', -'e', 's', '\030', '\002', ' ', '\001', '(', '\010', 'R', '\024', 'r', 'e', 'q', 'u', 'e', 's', 't', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', -'S', 'i', 'z', 'e', 's', 'B', '?', '\n', '%', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', -'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', 'B', '\014', 'C', 'l', -'u', 's', 't', 'e', 'r', 'P', 'r', 'o', 't', 'o', 'P', '\001', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', -'t', 'o', '3', +'\000', '\000', '\010', '@', ')', '\000', '\000', '\000', '\000', '\000', '\000', '\360', '?', 'R', '\032', 'p', 'e', 'r', 'U', 'p', 's', 't', 'r', 'e', 'a', +'m', 'P', 'r', 'e', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'R', 'a', 't', 'i', 'o', '\022', 'u', '\n', '\033', 'p', 'r', 'e', 'd', 'i', +'c', 't', 'i', 'v', 'e', '_', 'p', 'r', 'e', 'c', 'o', 'n', 'n', 'e', 'c', 't', '_', 'r', 'a', 't', 'i', 'o', '\030', '\002', ' ', +'\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'o', 'u', +'b', 'l', 'e', 'V', 'a', 'l', 'u', 'e', 'B', '\027', '\372', 'B', '\024', '\022', '\022', '\031', '\000', '\000', '\000', '\000', '\000', '\000', '\010', '@', ')', +'\000', '\000', '\000', '\000', '\000', '\000', '\360', '?', 'R', '\031', 'p', 'r', 'e', 'd', 'i', 'c', 't', 'i', 'v', 'e', 'P', 'r', 'e', 'c', 'o', +'n', 'n', 'e', 'c', 't', 'R', 'a', 't', 'i', 'o', '\032', 'f', '\n', '\"', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', +'i', 'o', 'n', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', 'E', 'n', 't', 'r', 'y', '\022', '\020', +'\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\003', 'k', 'e', 'y', '\022', '*', '\n', '\005', 'v', 'a', 'l', 'u', 'e', +'\030', '\002', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', +'A', 'n', 'y', 'R', '\005', 'v', 'a', 'l', 'u', 'e', ':', '\002', '8', '\001', '\"', 'W', '\n', '\r', 'D', 'i', 's', 'c', 'o', 'v', 'e', +'r', 'y', 'T', 'y', 'p', 'e', '\022', '\n', '\n', '\006', 'S', 'T', 'A', 'T', 'I', 'C', '\020', '\000', '\022', '\016', '\n', '\n', 'S', 'T', 'R', +'I', 'C', 'T', '_', 'D', 'N', 'S', '\020', '\001', '\022', '\017', '\n', '\013', 'L', 'O', 'G', 'I', 'C', 'A', 'L', '_', 'D', 'N', 'S', '\020', +'\002', '\022', '\007', '\n', '\003', 'E', 'D', 'S', '\020', '\003', '\022', '\020', '\n', '\014', 'O', 'R', 'I', 'G', 'I', 'N', 'A', 'L', '_', 'D', 'S', +'T', '\020', '\004', '\"', '\244', '\001', '\n', '\010', 'L', 'b', 'P', 'o', 'l', 'i', 'c', 'y', '\022', '\017', '\n', '\013', 'R', 'O', 'U', 'N', 'D', +'_', 'R', 'O', 'B', 'I', 'N', '\020', '\000', '\022', '\021', '\n', '\r', 'L', 'E', 'A', 'S', 'T', '_', 'R', 'E', 'Q', 'U', 'E', 'S', 'T', +'\020', '\001', '\022', '\r', '\n', '\t', 'R', 'I', 'N', 'G', '_', 'H', 'A', 'S', 'H', '\020', '\002', '\022', '\n', '\n', '\006', 'R', 'A', 'N', 'D', +'O', 'M', '\020', '\003', '\022', '\n', '\n', '\006', 'M', 'A', 'G', 'L', 'E', 'V', '\020', '\005', '\022', '\024', '\n', '\020', 'C', 'L', 'U', 'S', 'T', +'E', 'R', '_', 'P', 'R', 'O', 'V', 'I', 'D', 'E', 'D', '\020', '\006', '\022', ' ', '\n', '\034', 'L', 'O', 'A', 'D', '_', 'B', 'A', 'L', +'A', 'N', 'C', 'I', 'N', 'G', '_', 'P', 'O', 'L', 'I', 'C', 'Y', '_', 'C', 'O', 'N', 'F', 'I', 'G', '\020', '\007', '\"', '\004', '\010', +'\004', '\020', '\004', '*', '\017', 'O', 'R', 'I', 'G', 'I', 'N', 'A', 'L', '_', 'D', 'S', 'T', '_', 'L', 'B', '\"', '5', '\n', '\017', 'D', +'n', 's', 'L', 'o', 'o', 'k', 'u', 'p', 'F', 'a', 'm', 'i', 'l', 'y', '\022', '\010', '\n', '\004', 'A', 'U', 'T', 'O', '\020', '\000', '\022', +'\013', '\n', '\007', 'V', '4', '_', 'O', 'N', 'L', 'Y', '\020', '\001', '\022', '\013', '\n', '\007', 'V', '6', '_', 'O', 'N', 'L', 'Y', '\020', '\002', +'\"', 'T', '\n', '\030', 'C', 'l', 'u', 's', 't', 'e', 'r', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'S', 'e', 'l', 'e', 'c', 't', +'i', 'o', 'n', '\022', '\033', '\n', '\027', 'U', 'S', 'E', '_', 'C', 'O', 'N', 'F', 'I', 'G', 'U', 'R', 'E', 'D', '_', 'P', 'R', 'O', +'T', 'O', 'C', 'O', 'L', '\020', '\000', '\022', '\033', '\n', '\027', 'U', 'S', 'E', '_', 'D', 'O', 'W', 'N', 'S', 'T', 'R', 'E', 'A', 'M', +'_', 'P', 'R', 'O', 'T', 'O', 'C', 'O', 'L', '\020', '\001', ':', '\033', '\232', '\305', '\210', '\036', '\026', '\n', '\024', 'e', 'n', 'v', 'o', 'y', +'.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', 'B', '\030', '\n', '\026', 'c', 'l', 'u', 's', 't', 'e', +'r', '_', 'd', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', '_', 't', 'y', 'p', 'e', 'B', '\013', '\n', '\t', 'l', 'b', '_', 'c', 'o', +'n', 'f', 'i', 'g', 'J', '\004', '\010', '\014', '\020', '\r', 'J', '\004', '\010', '\017', '\020', '\020', 'J', '\004', '\010', '\007', '\020', '\010', 'J', '\004', '\010', +'\013', '\020', '\014', 'J', '\004', '\010', '#', '\020', '$', 'R', '\005', 'h', 'o', 's', 't', 's', 'R', '\013', 't', 'l', 's', '_', 'c', 'o', 'n', +'t', 'e', 'x', 't', 'R', '\032', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '_', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '_', +'o', 'p', 't', 'i', 'o', 'n', 's', '\"', '\245', '\002', '\n', '\023', 'L', 'o', 'a', 'd', 'B', 'a', 'l', 'a', 'n', 'c', 'i', 'n', 'g', +'P', 'o', 'l', 'i', 'c', 'y', '\022', 'O', '\n', '\010', 'p', 'o', 'l', 'i', 'c', 'i', 'e', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', +'3', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', +'.', 'L', 'o', 'a', 'd', 'B', 'a', 'l', 'a', 'n', 'c', 'i', 'n', 'g', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'P', 'o', 'l', 'i', +'c', 'y', 'R', '\010', 'p', 'o', 'l', 'i', 'c', 'i', 'e', 's', '\032', '\223', '\001', '\n', '\006', 'P', 'o', 'l', 'i', 'c', 'y', '\022', '\022', +'\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '7', '\n', '\014', 't', 'y', 'p', +'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\003', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', +'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'R', '\013', 't', 'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', +':', '.', '\232', '\305', '\210', '\036', ')', '\n', '\'', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'L', 'o', 'a', +'d', 'B', 'a', 'l', 'a', 'n', 'c', 'i', 'n', 'g', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'P', 'o', 'l', 'i', 'c', 'y', 'J', '\004', +'\010', '\002', '\020', '\003', 'R', '\006', 'c', 'o', 'n', 'f', 'i', 'g', ':', '\'', '\232', '\305', '\210', '\036', '\"', '\n', ' ', 'e', 'n', 'v', 'o', +'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'L', 'o', 'a', 'd', 'B', 'a', 'l', 'a', 'n', 'c', 'i', 'n', 'g', 'P', 'o', 'l', +'i', 'c', 'y', '\"', '\202', '\001', '\n', '\022', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'B', 'i', 'n', 'd', 'C', 'o', 'n', 'f', 'i', +'g', '\022', 'D', '\n', '\016', 's', 'o', 'u', 'r', 'c', 'e', '_', 'a', 'd', 'd', 'r', 'e', 's', 's', '\030', '\001', ' ', '\001', '(', '\013', +'2', '\035', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'A', +'d', 'd', 'r', 'e', 's', 's', 'R', '\r', 's', 'o', 'u', 'r', 'c', 'e', 'A', 'd', 'd', 'r', 'e', 's', 's', ':', '&', '\232', '\305', +'\210', '\036', '!', '\n', '\037', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'U', 'p', 's', 't', 'r', 'e', 'a', +'m', 'B', 'i', 'n', 'd', 'C', 'o', 'n', 'f', 'i', 'g', '\"', '\223', '\001', '\n', '\031', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'C', +'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', 'G', '\n', '\r', 't', 'c', 'p', '_', 'k', +'e', 'e', 'p', 'a', 'l', 'i', 'v', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', +'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'c', 'p', 'K', 'e', 'e', 'p', 'a', 'l', 'i', 'v', 'e', +'R', '\014', 't', 'c', 'p', 'K', 'e', 'e', 'p', 'a', 'l', 'i', 'v', 'e', ':', '-', '\232', '\305', '\210', '\036', '(', '\n', '&', 'e', 'n', +'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'C', 'o', 'n', 'n', 'e', 'c', +'t', 'i', 'o', 'n', 'O', 'p', 't', 'i', 'o', 'n', 's', '\"', 'r', '\n', '\021', 'T', 'r', 'a', 'c', 'k', 'C', 'l', 'u', 's', 't', +'e', 'r', 'S', 't', 'a', 't', 's', '\022', '\'', '\n', '\017', 't', 'i', 'm', 'e', 'o', 'u', 't', '_', 'b', 'u', 'd', 'g', 'e', 't', +'s', '\030', '\001', ' ', '\001', '(', '\010', 'R', '\016', 't', 'i', 'm', 'e', 'o', 'u', 't', 'B', 'u', 'd', 'g', 'e', 't', 's', '\022', '4', +'\n', '\026', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 's', 'i', 'z', 'e', 's', '\030', +'\002', ' ', '\001', '(', '\010', 'R', '\024', 'r', 'e', 'q', 'u', 'e', 's', 't', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'S', 'i', 'z', +'e', 's', 'B', '?', '\n', '%', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', +'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', 'B', '\014', 'C', 'l', 'u', 's', 't', +'e', 'r', 'P', 'r', 'o', 't', 'o', 'P', '\001', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; -static upb_def_init *deps[24] = { +static upb_def_init *deps[21] = { &envoy_config_cluster_v3_circuit_breaker_proto_upbdefinit, &envoy_config_cluster_v3_filter_proto_upbdefinit, &envoy_config_cluster_v3_outlier_detection_proto_upbdefinit, @@ -539,10 +527,7 @@ static upb_def_init *deps[24] = { &google_protobuf_duration_proto_upbdefinit, &google_protobuf_struct_proto_upbdefinit, &google_protobuf_wrappers_proto_upbdefinit, - &udpa_core_v1_collection_entry_proto_upbdefinit, - &udpa_core_v1_resource_locator_proto_upbdefinit, - &envoy_annotations_deprecation_proto_upbdefinit, - &udpa_annotations_migrate_proto_upbdefinit, + &xds_core_v3_collection_entry_proto_upbdefinit, &udpa_annotations_security_proto_upbdefinit, &udpa_annotations_status_proto_upbdefinit, &udpa_annotations_versioning_proto_upbdefinit, @@ -554,5 +539,5 @@ upb_def_init envoy_config_cluster_v3_cluster_proto_upbdefinit = { deps, layouts, "envoy/config/cluster/v3/cluster.proto", - UPB_STRVIEW_INIT(descriptor, 10953) + UPB_STRVIEW_INIT(descriptor, 10750) }; diff --git a/grpc/src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.h b/grpc/src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.h index 5664a0ad..1bbc8997 100644 --- a/grpc/src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.h +++ b/grpc/src/core/ext/upbdefs-generated/envoy/config/cluster/v3/cluster.upbdefs.h @@ -101,9 +101,9 @@ UPB_INLINE const upb_msgdef *envoy_config_cluster_v3_Cluster_RefreshRate_getmsgd return upb_symtab_lookupmsg(s, "envoy.config.cluster.v3.Cluster.RefreshRate"); } -UPB_INLINE const upb_msgdef *envoy_config_cluster_v3_Cluster_PrefetchPolicy_getmsgdef(upb_symtab *s) { +UPB_INLINE const upb_msgdef *envoy_config_cluster_v3_Cluster_PreconnectPolicy_getmsgdef(upb_symtab *s) { _upb_symtab_loaddefinit(s, &envoy_config_cluster_v3_cluster_proto_upbdefinit); - return upb_symtab_lookupmsg(s, "envoy.config.cluster.v3.Cluster.PrefetchPolicy"); + return upb_symtab_lookupmsg(s, "envoy.config.cluster.v3.Cluster.PreconnectPolicy"); } UPB_INLINE const upb_msgdef *envoy_config_cluster_v3_Cluster_TypedExtensionProtocolOptionsEntry_getmsgdef(upb_symtab *s) { diff --git a/grpc/src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.c b/grpc/src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.c index 3ebd234f..8ab795d9 100644 --- a/grpc/src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.c +++ b/grpc/src/core/ext/upbdefs-generated/envoy/config/cluster/v3/outlier_detection.upbdefs.c @@ -20,7 +20,7 @@ static const upb_msglayout *layouts[1] = { &envoy_config_cluster_v3_OutlierDetection_msginit, }; -static const char descriptor[2342] = {'\n', '/', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'l', 'u', 's', 't', 'e', 'r', '/', 'v', '3', +static const char descriptor[2423] = {'\n', '/', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'l', 'u', 's', 't', 'e', 'r', '/', 'v', '3', '/', 'o', 'u', 't', 'l', 'i', 'e', 'r', '_', 'd', 'e', 't', 'e', 'c', 't', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\022', '\027', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', '3', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', @@ -29,7 +29,7 @@ static const char descriptor[2342] = {'\n', '/', 'e', 'n', 'v', 'o', 'y', '/', ' 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', -'r', 'o', 't', 'o', '\"', '\354', '\017', '\n', '\020', 'O', 'u', 't', 'l', 'i', 'e', 'r', 'D', 'e', 't', 'e', 'c', 't', 'i', 'o', 'n', +'r', 'o', 't', 'o', '\"', '\275', '\020', '\n', '\020', 'O', 'u', 't', 'l', 'i', 'e', 'r', 'D', 'e', 't', 'e', 'c', 't', 'i', 'o', 'n', '\022', 'E', '\n', '\017', 'c', 'o', 'n', 's', 'e', 'c', 'u', 't', 'i', 'v', 'e', '_', '5', 'x', 'x', '\030', '\001', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\016', 'c', 'o', 'n', 's', 'e', 'c', 'u', 't', 'i', 'v', 'e', '5', 'x', 'x', '\022', '?', '\n', '\010', @@ -108,12 +108,15 @@ static const char descriptor[2342] = {'\n', '/', 'e', 'n', 'v', 'o', 'y', '/', ' 'e', 'n', 't', 'a', 'g', 'e', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'v', 'o', 'l', 'u', 'm', 'e', '\030', '\024', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\036', 'f', 'a', 'i', 'l', 'u', 'r', 'e', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'a', 'g', -'e', 'R', 'e', 'q', 'u', 'e', 's', 't', 'V', 'o', 'l', 'u', 'm', 'e', ':', ',', '\232', '\305', '\210', '\036', '\'', '\n', '%', 'e', 'n', -'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'O', 'u', 't', 'l', 'i', 'e', -'r', 'D', 'e', 't', 'e', 'c', 't', 'i', 'o', 'n', 'B', 'H', '\n', '%', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', -'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'v', -'3', 'B', '\025', 'O', 'u', 't', 'l', 'i', 'e', 'r', 'D', 'e', 't', 'e', 'c', 't', 'i', 'o', 'n', 'P', 'r', 'o', 't', 'o', 'P', -'\001', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +'e', 'R', 'e', 'q', 'u', 'e', 's', 't', 'V', 'o', 'l', 'u', 'm', 'e', '\022', 'O', '\n', '\021', 'm', 'a', 'x', '_', 'e', 'j', 'e', +'c', 't', 'i', 'o', 'n', '_', 't', 'i', 'm', 'e', '\030', '\025', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', +'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\252', '\001', +'\002', '*', '\000', 'R', '\017', 'm', 'a', 'x', 'E', 'j', 'e', 'c', 't', 'i', 'o', 'n', 'T', 'i', 'm', 'e', ':', ',', '\232', '\305', '\210', +'\036', '\'', '\n', '%', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', +'O', 'u', 't', 'l', 'i', 'e', 'r', 'D', 'e', 't', 'e', 'c', 't', 'i', 'o', 'n', 'B', 'H', '\n', '%', 'i', 'o', '.', 'e', 'n', +'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', +'s', 't', 'e', 'r', '.', 'v', '3', 'B', '\025', 'O', 'u', 't', 'l', 'i', 'e', 'r', 'D', 'e', 't', 'e', 'c', 't', 'i', 'o', 'n', +'P', 'r', 'o', 't', 'o', 'P', '\001', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; static upb_def_init *deps[6] = { @@ -129,5 +132,5 @@ upb_def_init envoy_config_cluster_v3_outlier_detection_proto_upbdefinit = { deps, layouts, "envoy/config/cluster/v3/outlier_detection.proto", - UPB_STRVIEW_INIT(descriptor, 2342) + UPB_STRVIEW_INIT(descriptor, 2423) }; diff --git a/grpc/src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.c b/grpc/src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.c index 51f89947..a91ff3d6 100644 --- a/grpc/src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.c +++ b/grpc/src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.c @@ -15,7 +15,6 @@ extern upb_def_init envoy_config_core_v3_http_uri_proto_upbdefinit; extern upb_def_init envoy_type_v3_percent_proto_upbdefinit; extern upb_def_init envoy_type_v3_semantic_version_proto_upbdefinit; extern upb_def_init google_protobuf_any_proto_upbdefinit; -extern upb_def_init google_protobuf_duration_proto_upbdefinit; extern upb_def_init google_protobuf_struct_proto_upbdefinit; extern upb_def_init google_protobuf_wrappers_proto_upbdefinit; extern upb_def_init udpa_annotations_migrate_proto_upbdefinit; @@ -29,11 +28,13 @@ extern const upb_msglayout envoy_config_core_v3_Node_msginit; extern const upb_msglayout envoy_config_core_v3_Metadata_msginit; extern const upb_msglayout envoy_config_core_v3_Metadata_FilterMetadataEntry_msginit; extern const upb_msglayout envoy_config_core_v3_RuntimeUInt32_msginit; +extern const upb_msglayout envoy_config_core_v3_RuntimePercent_msginit; extern const upb_msglayout envoy_config_core_v3_RuntimeDouble_msginit; extern const upb_msglayout envoy_config_core_v3_RuntimeFeatureFlag_msginit; extern const upb_msglayout envoy_config_core_v3_HeaderValue_msginit; extern const upb_msglayout envoy_config_core_v3_HeaderValueOption_msginit; extern const upb_msglayout envoy_config_core_v3_HeaderMap_msginit; +extern const upb_msglayout envoy_config_core_v3_WatchedDirectory_msginit; extern const upb_msglayout envoy_config_core_v3_DataSource_msginit; extern const upb_msglayout envoy_config_core_v3_RetryPolicy_msginit; extern const upb_msglayout envoy_config_core_v3_RemoteDataSource_msginit; @@ -42,7 +43,7 @@ extern const upb_msglayout envoy_config_core_v3_TransportSocket_msginit; extern const upb_msglayout envoy_config_core_v3_RuntimeFractionalPercent_msginit; extern const upb_msglayout envoy_config_core_v3_ControlPlane_msginit; -static const upb_msglayout *layouts[19] = { +static const upb_msglayout *layouts[21] = { &envoy_config_core_v3_Locality_msginit, &envoy_config_core_v3_BuildVersion_msginit, &envoy_config_core_v3_Extension_msginit, @@ -50,11 +51,13 @@ static const upb_msglayout *layouts[19] = { &envoy_config_core_v3_Metadata_msginit, &envoy_config_core_v3_Metadata_FilterMetadataEntry_msginit, &envoy_config_core_v3_RuntimeUInt32_msginit, + &envoy_config_core_v3_RuntimePercent_msginit, &envoy_config_core_v3_RuntimeDouble_msginit, &envoy_config_core_v3_RuntimeFeatureFlag_msginit, &envoy_config_core_v3_HeaderValue_msginit, &envoy_config_core_v3_HeaderValueOption_msginit, &envoy_config_core_v3_HeaderMap_msginit, + &envoy_config_core_v3_WatchedDirectory_msginit, &envoy_config_core_v3_DataSource_msginit, &envoy_config_core_v3_RetryPolicy_msginit, &envoy_config_core_v3_RemoteDataSource_msginit, @@ -64,7 +67,7 @@ static const upb_msglayout *layouts[19] = { &envoy_config_core_v3_ControlPlane_msginit, }; -static const char descriptor[4353] = {'\n', '\037', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'b', 'a', +static const char descriptor[4473] = {'\n', '\037', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'b', 'a', 's', 'e', '.', 'p', 'r', 'o', 't', 'o', '\022', '\024', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '\032', '\"', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'a', 'd', 'd', 'r', 'e', 's', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '\"', 'e', 'n', 'v', 'o', 'y', '/', 'c', @@ -74,181 +77,184 @@ static const char descriptor[4353] = {'\n', '\037', 'e', 'n', 'v', 'o', 'y', '/' 'e', '/', 'v', '3', '/', 'p', 'e', 'r', 'c', 'e', 'n', 't', '.', 'p', 'r', 'o', 't', 'o', '\032', '$', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'v', '3', '/', 's', 'e', 'm', 'a', 'n', 't', 'i', 'c', '_', 'v', 'e', 'r', 's', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\032', '\031', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'a', -'n', 'y', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', -'/', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\032', '\034', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', -'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 's', 't', 'r', 'u', 'c', 't', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', 'o', -'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'w', 'r', 'a', 'p', 'p', 'e', 'r', 's', '.', 'p', 'r', 'o', -'t', 'o', '\032', '\036', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'm', 'i', 'g', 'r', -'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', -'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', -'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', -'\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', -'\"', 't', '\n', '\010', 'L', 'o', 'c', 'a', 'l', 'i', 't', 'y', '\022', '\026', '\n', '\006', 'r', 'e', 'g', 'i', 'o', 'n', '\030', '\001', ' ', -'\001', '(', '\t', 'R', '\006', 'r', 'e', 'g', 'i', 'o', 'n', '\022', '\022', '\n', '\004', 'z', 'o', 'n', 'e', '\030', '\002', ' ', '\001', '(', '\t', -'R', '\004', 'z', 'o', 'n', 'e', '\022', '\031', '\n', '\010', 's', 'u', 'b', '_', 'z', 'o', 'n', 'e', '\030', '\003', ' ', '\001', '(', '\t', 'R', -'\007', 's', 'u', 'b', 'Z', 'o', 'n', 'e', ':', '!', '\232', '\305', '\210', '\036', '\034', '\n', '\032', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', -'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'L', 'o', 'c', 'a', 'l', 'i', 't', 'y', '\"', '\244', '\001', '\n', '\014', 'B', 'u', -'i', 'l', 'd', 'V', 'e', 'r', 's', 'i', 'o', 'n', '\022', '8', '\n', '\007', 'v', 'e', 'r', 's', 'i', 'o', 'n', '\030', '\001', ' ', '\001', -'(', '\013', '2', '\036', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'S', 'e', 'm', 'a', 'n', 't', -'i', 'c', 'V', 'e', 'r', 's', 'i', 'o', 'n', 'R', '\007', 'v', 'e', 'r', 's', 'i', 'o', 'n', '\022', '3', '\n', '\010', 'm', 'e', 't', -'a', 'd', 'a', 't', 'a', '\030', '\002', ' ', '\001', '(', '\013', '2', '\027', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', -'o', 'b', 'u', 'f', '.', 'S', 't', 'r', 'u', 'c', 't', 'R', '\010', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', ':', '%', '\232', '\305', -'\210', '\036', ' ', '\n', '\036', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'B', 'u', -'i', 'l', 'd', 'V', 'e', 'r', 's', 'i', 'o', 'n', '\"', '\342', '\001', '\n', '\t', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '\022', -'\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '\032', '\n', '\010', 'c', 'a', -'t', 'e', 'g', 'o', 'r', 'y', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\010', 'c', 'a', 't', 'e', 'g', 'o', 'r', 'y', '\022', '\'', '\n', -'\017', 't', 'y', 'p', 'e', '_', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\016', 't', -'y', 'p', 'e', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', '\022', '<', '\n', '\007', 'v', 'e', 'r', 's', 'i', 'o', 'n', '\030', -'\004', ' ', '\001', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', -'.', 'v', '3', '.', 'B', 'u', 'i', 'l', 'd', 'V', 'e', 'r', 's', 'i', 'o', 'n', 'R', '\007', 'v', 'e', 'r', 's', 'i', 'o', 'n', -'\022', '\032', '\n', '\010', 'd', 'i', 's', 'a', 'b', 'l', 'e', 'd', '\030', '\005', ' ', '\001', '(', '\010', 'R', '\010', 'd', 'i', 's', 'a', 'b', -'l', 'e', 'd', ':', '\"', '\232', '\305', '\210', '\036', '\035', '\n', '\033', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', -'c', 'o', 'r', 'e', '.', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '\"', '\345', '\004', '\n', '\004', 'N', 'o', 'd', 'e', '\022', '\016', -'\n', '\002', 'i', 'd', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\002', 'i', 'd', '\022', '\030', '\n', '\007', 'c', 'l', 'u', 's', 't', 'e', 'r', -'\030', '\002', ' ', '\001', '(', '\t', 'R', '\007', 'c', 'l', 'u', 's', 't', 'e', 'r', '\022', '3', '\n', '\010', 'm', 'e', 't', 'a', 'd', 'a', -'t', 'a', '\030', '\003', ' ', '\001', '(', '\013', '2', '\027', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', -'f', '.', 'S', 't', 'r', 'u', 'c', 't', 'R', '\010', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '\022', ':', '\n', '\010', 'l', 'o', 'c', -'a', 'l', 'i', 't', 'y', '\030', '\004', ' ', '\001', '(', '\013', '2', '\036', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', -'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'L', 'o', 'c', 'a', 'l', 'i', 't', 'y', 'R', '\010', 'l', 'o', 'c', 'a', 'l', -'i', 't', 'y', '\022', '&', '\n', '\017', 'u', 's', 'e', 'r', '_', 'a', 'g', 'e', 'n', 't', '_', 'n', 'a', 'm', 'e', '\030', '\006', ' ', -'\001', '(', '\t', 'R', '\r', 'u', 's', 'e', 'r', 'A', 'g', 'e', 'n', 't', 'N', 'a', 'm', 'e', '\022', '.', '\n', '\022', 'u', 's', 'e', -'r', '_', 'a', 'g', 'e', 'n', 't', '_', 'v', 'e', 'r', 's', 'i', 'o', 'n', '\030', '\007', ' ', '\001', '(', '\t', 'H', '\000', 'R', '\020', -'u', 's', 'e', 'r', 'A', 'g', 'e', 'n', 't', 'V', 'e', 'r', 's', 'i', 'o', 'n', '\022', ']', '\n', '\030', 'u', 's', 'e', 'r', '_', -'a', 'g', 'e', 'n', 't', '_', 'b', 'u', 'i', 'l', 'd', '_', 'v', 'e', 'r', 's', 'i', 'o', 'n', '\030', '\010', ' ', '\001', '(', '\013', -'2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'B', -'u', 'i', 'l', 'd', 'V', 'e', 'r', 's', 'i', 'o', 'n', 'H', '\000', 'R', '\025', 'u', 's', 'e', 'r', 'A', 'g', 'e', 'n', 't', 'B', -'u', 'i', 'l', 'd', 'V', 'e', 'r', 's', 'i', 'o', 'n', '\022', '?', '\n', '\n', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', -'\030', '\t', ' ', '\003', '(', '\013', '2', '\037', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', -'e', '.', 'v', '3', '.', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'R', '\n', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', -'s', '\022', '\'', '\n', '\017', 'c', 'l', 'i', 'e', 'n', 't', '_', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '\n', ' ', '\003', '(', -'\t', 'R', '\016', 'c', 'l', 'i', 'e', 'n', 't', 'F', 'e', 'a', 't', 'u', 'r', 'e', 's', '\022', 'R', '\n', '\023', 'l', 'i', 's', 't', -'e', 'n', 'i', 'n', 'g', '_', 'a', 'd', 'd', 'r', 'e', 's', 's', 'e', 's', '\030', '\013', ' ', '\003', '(', '\013', '2', '\035', '.', 'e', -'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'A', 'd', 'd', 'r', 'e', -'s', 's', 'B', '\002', '\030', '\001', 'R', '\022', 'l', 'i', 's', 't', 'e', 'n', 'i', 'n', 'g', 'A', 'd', 'd', 'r', 'e', 's', 's', 'e', -'s', ':', '\035', '\232', '\305', '\210', '\036', '\030', '\n', '\026', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', -'r', 'e', '.', 'N', 'o', 'd', 'e', 'B', '\031', '\n', '\027', 'u', 's', 'e', 'r', '_', 'a', 'g', 'e', 'n', 't', '_', 'v', 'e', 'r', -'s', 'i', 'o', 'n', '_', 't', 'y', 'p', 'e', 'J', '\004', '\010', '\005', '\020', '\006', 'R', '\r', 'b', 'u', 'i', 'l', 'd', '_', 'v', 'e', -'r', 's', 'i', 'o', 'n', '\"', '\346', '\001', '\n', '\010', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', '\022', '[', '\n', '\017', 'f', 'i', 'l', -'t', 'e', 'r', '_', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '\030', '\001', ' ', '\003', '(', '\013', '2', '2', '.', 'e', 'n', 'v', 'o', -'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', -'.', 'F', 'i', 'l', 't', 'e', 'r', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'E', 'n', 't', 'r', 'y', 'R', '\016', 'f', 'i', 'l', -'t', 'e', 'r', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', '\032', 'Z', '\n', '\023', 'F', 'i', 'l', 't', 'e', 'r', 'M', 'e', 't', 'a', -'d', 'a', 't', 'a', 'E', 'n', 't', 'r', 'y', '\022', '\020', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\003', 'k', -'e', 'y', '\022', '-', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '\027', '.', 'g', 'o', 'o', 'g', 'l', -'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 't', 'r', 'u', 'c', 't', 'R', '\005', 'v', 'a', 'l', 'u', 'e', ':', -'\002', '8', '\001', ':', '!', '\232', '\305', '\210', '\036', '\034', '\n', '\032', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', -'c', 'o', 'r', 'e', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', '\"', '\206', '\001', '\n', '\r', 'R', 'u', 'n', 't', 'i', 'm', 'e', -'U', 'I', 'n', 't', '3', '2', '\022', '#', '\n', '\r', 'd', 'e', 'f', 'a', 'u', 'l', 't', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\002', -' ', '\001', '(', '\r', 'R', '\014', 'd', 'e', 'f', 'a', 'u', 'l', 't', 'V', 'a', 'l', 'u', 'e', '\022', '(', '\n', '\013', 'r', 'u', 'n', -'t', 'i', 'm', 'e', '_', 'k', 'e', 'y', '\030', '\003', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\n', -'r', 'u', 'n', 't', 'i', 'm', 'e', 'K', 'e', 'y', ':', '&', '\232', '\305', '\210', '\036', '!', '\n', '\037', 'e', 'n', 'v', 'o', 'y', '.', -'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'U', 'I', 'n', 't', '3', '2', -'\"', '\206', '\001', '\n', '\r', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'D', 'o', 'u', 'b', 'l', 'e', '\022', '#', '\n', '\r', 'd', 'e', 'f', -'a', 'u', 'l', 't', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\001', ' ', '\001', '(', '\001', 'R', '\014', 'd', 'e', 'f', 'a', 'u', 'l', 't', -'V', 'a', 'l', 'u', 'e', '\022', '(', '\n', '\013', 'r', 'u', 'n', 't', 'i', 'm', 'e', '_', 'k', 'e', 'y', '\030', '\002', ' ', '\001', '(', -'\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\n', 'r', 'u', 'n', 't', 'i', 'm', 'e', 'K', 'e', 'y', ':', '&', '\232', -'\305', '\210', '\036', '!', '\n', '\037', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'R', -'u', 'n', 't', 'i', 'm', 'e', 'D', 'o', 'u', 'b', 'l', 'e', '\"', '\266', '\001', '\n', '\022', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'F', -'e', 'a', 't', 'u', 'r', 'e', 'F', 'l', 'a', 'g', '\022', 'I', '\n', '\r', 'd', 'e', 'f', 'a', 'u', 'l', 't', '_', 'v', 'a', 'l', -'u', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', -'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\014', 'd', 'e', -'f', 'a', 'u', 'l', 't', 'V', 'a', 'l', 'u', 'e', '\022', '(', '\n', '\013', 'r', 'u', 'n', 't', 'i', 'm', 'e', '_', 'k', 'e', 'y', -'\030', '\002', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\n', 'r', 'u', 'n', 't', 'i', 'm', 'e', 'K', -'e', 'y', ':', '+', '\232', '\305', '\210', '\036', '&', '\n', '$', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', -'o', 'r', 'e', '.', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'F', 'l', 'a', 'g', '\"', '\177', '\n', -'\013', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', '\022', '#', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', -'B', '\021', '\372', 'B', '\016', 'r', '\014', '\020', '\001', '(', '\200', '\200', '\001', '\300', '\001', '\001', '\310', '\001', '\000', 'R', '\003', 'k', 'e', 'y', '\022', -'%', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'B', '\017', '\372', 'B', '\014', 'r', '\n', '(', '\200', '\200', '\001', -'\300', '\001', '\002', '\310', '\001', '\000', 'R', '\005', 'v', 'a', 'l', 'u', 'e', ':', '$', '\232', '\305', '\210', '\036', '\037', '\n', '\035', 'e', 'n', 'v', -'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', -'e', '\"', '\270', '\001', '\n', '\021', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'O', 'p', 't', 'i', 'o', 'n', '\022', 'C', -'\n', '\006', 'h', 'e', 'a', 'd', 'e', 'r', '\030', '\001', ' ', '\001', '(', '\013', '2', '!', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', -'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'B', -'\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\006', 'h', 'e', 'a', 'd', 'e', 'r', '\022', '2', '\n', '\006', 'a', 'p', 'p', 'e', -'n', 'd', '\030', '\002', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', -'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\006', 'a', 'p', 'p', 'e', 'n', 'd', ':', '*', '\232', '\305', '\210', '\036', -'%', '\n', '#', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'H', 'e', 'a', 'd', -'e', 'r', 'V', 'a', 'l', 'u', 'e', 'O', 'p', 't', 'i', 'o', 'n', '\"', 'l', '\n', '\t', 'H', 'e', 'a', 'd', 'e', 'r', 'M', 'a', -'p', '\022', ';', '\n', '\007', 'h', 'e', 'a', 'd', 'e', 'r', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '!', '.', 'e', 'n', 'v', 'o', -'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', -'l', 'u', 'e', 'R', '\007', 'h', 'e', 'a', 'd', 'e', 'r', 's', ':', '\"', '\232', '\305', '\210', '\036', '\035', '\n', '\033', 'e', 'n', 'v', 'o', -'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'M', 'a', 'p', '\"', '\310', -'\001', '\n', '\n', 'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', '\022', '%', '\n', '\010', 'f', 'i', 'l', 'e', 'n', 'a', 'm', 'e', -'\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'H', '\000', 'R', '\010', 'f', 'i', 'l', 'e', 'n', 'a', -'m', 'e', '\022', ',', '\n', '\014', 'i', 'n', 'l', 'i', 'n', 'e', '_', 'b', 'y', 't', 'e', 's', '\030', '\002', ' ', '\001', '(', '\014', 'B', -'\007', '\372', 'B', '\004', 'z', '\002', '\020', '\001', 'H', '\000', 'R', '\013', 'i', 'n', 'l', 'i', 'n', 'e', 'B', 'y', 't', 'e', 's', '\022', '.', -'\n', '\r', 'i', 'n', 'l', 'i', 'n', 'e', '_', 's', 't', 'r', 'i', 'n', 'g', '\030', '\003', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', -'\004', 'r', '\002', '\020', '\001', 'H', '\000', 'R', '\014', 'i', 'n', 'l', 'i', 'n', 'e', 'S', 't', 'r', 'i', 'n', 'g', ':', '#', '\232', '\305', -'\210', '\036', '\036', '\n', '\034', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'D', 'a', -'t', 'a', 'S', 'o', 'u', 'r', 'c', 'e', 'B', '\020', '\n', '\t', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', -'\001', '\"', '\324', '\001', '\n', '\013', 'R', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', '\022', 'K', '\n', '\016', 'r', 'e', 't', 'r', -'y', '_', 'b', 'a', 'c', 'k', '_', 'o', 'f', 'f', '\030', '\001', ' ', '\001', '(', '\013', '2', '%', '.', 'e', 'n', 'v', 'o', 'y', '.', -'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'B', 'a', 'c', 'k', 'o', 'f', 'f', 'S', 't', 'r', -'a', 't', 'e', 'g', 'y', 'R', '\014', 'r', 'e', 't', 'r', 'y', 'B', 'a', 'c', 'k', 'O', 'f', 'f', '\022', 'R', '\n', '\013', 'n', 'u', -'m', '_', 'r', 'e', 't', 'r', 'i', 'e', 's', '\030', '\002', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', -'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\023', '\362', '\230', '\376', -'\217', '\005', '\r', '\n', '\013', 'm', 'a', 'x', '_', 'r', 'e', 't', 'r', 'i', 'e', 's', 'R', '\n', 'n', 'u', 'm', 'R', 'e', 't', 'r', -'i', 'e', 's', ':', '$', '\232', '\305', '\210', '\036', '\037', '\n', '\035', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', -'c', 'o', 'r', 'e', '.', 'R', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', '\"', '\350', '\001', '\n', '\020', 'R', 'e', 'm', 'o', -'t', 'e', 'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', '\022', 'B', '\n', '\010', 'h', 't', 't', 'p', '_', 'u', 'r', 'i', '\030', -'\001', ' ', '\001', '(', '\013', '2', '\035', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', -'.', 'v', '3', '.', 'H', 't', 't', 'p', 'U', 'r', 'i', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\007', 'h', 't', -'t', 'p', 'U', 'r', 'i', '\022', '\037', '\n', '\006', 's', 'h', 'a', '2', '5', '6', '\030', '\002', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', -'\004', 'r', '\002', '\020', '\001', 'R', '\006', 's', 'h', 'a', '2', '5', '6', '\022', 'D', '\n', '\014', 'r', 'e', 't', 'r', 'y', '_', 'p', 'o', -'l', 'i', 'c', 'y', '\030', '\003', ' ', '\001', '(', '\013', '2', '!', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', -'.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'R', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', 'R', '\013', 'r', 'e', 't', -'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', ':', ')', '\232', '\305', '\210', '\036', '$', '\n', '\"', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', -'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'R', 'e', 'm', 'o', 't', 'e', 'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', -'e', '\"', '\311', '\001', '\n', '\017', 'A', 's', 'y', 'n', 'c', 'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', '\022', '8', '\n', '\005', -'l', 'o', 'c', 'a', 'l', '\030', '\001', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', -'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', 'H', '\000', 'R', '\005', 'l', -'o', 'c', 'a', 'l', '\022', '@', '\n', '\006', 'r', 'e', 'm', 'o', 't', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '&', '.', 'e', 'n', -'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'R', 'e', 'm', 'o', 't', 'e', -'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', 'H', '\000', 'R', '\006', 'r', 'e', 'm', 'o', 't', 'e', ':', '(', '\232', '\305', '\210', -'\036', '#', '\n', '!', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'A', 's', 'y', -'n', 'c', 'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', 'B', '\020', '\n', '\t', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', -'\022', '\003', '\370', 'B', '\001', '\"', '\260', '\001', '\n', '\017', 'T', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', 'S', 'o', 'c', 'k', 'e', 't', -'\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', -'n', 'a', 'm', 'e', '\022', '9', '\n', '\014', 't', 'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\003', ' ', '\001', '(', -'\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'H', '\000', -'R', '\013', 't', 'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', ':', '(', '\232', '\305', '\210', '\036', '#', '\n', '!', 'e', 'n', 'v', -'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'T', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', 'S', -'o', 'c', 'k', 'e', 't', 'B', '\r', '\n', '\013', 'c', 'o', 'n', 'f', 'i', 'g', '_', 't', 'y', 'p', 'e', 'J', '\004', '\010', '\002', '\020', -'\003', 'R', '\006', 'c', 'o', 'n', 'f', 'i', 'g', '\"', '\277', '\001', '\n', '\030', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'F', 'r', 'a', 'c', -'t', 'i', 'o', 'n', 'a', 'l', 'P', 'e', 'r', 'c', 'e', 'n', 't', '\022', 'O', '\n', '\r', 'd', 'e', 'f', 'a', 'u', 'l', 't', '_', -'v', 'a', 'l', 'u', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', -'v', '3', '.', 'F', 'r', 'a', 'c', 't', 'i', 'o', 'n', 'a', 'l', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'B', '\010', '\372', 'B', '\005', -'\212', '\001', '\002', '\020', '\001', 'R', '\014', 'd', 'e', 'f', 'a', 'u', 'l', 't', 'V', 'a', 'l', 'u', 'e', '\022', '\037', '\n', '\013', 'r', 'u', -'n', 't', 'i', 'm', 'e', '_', 'k', 'e', 'y', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\n', 'r', 'u', 'n', 't', 'i', 'm', 'e', 'K', -'e', 'y', ':', '1', '\232', '\305', '\210', '\036', ',', '\n', '*', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', -'o', 'r', 'e', '.', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'F', 'r', 'a', 'c', 't', 'i', 'o', 'n', 'a', 'l', 'P', 'e', 'r', 'c', -'e', 'n', 't', '\"', 'U', '\n', '\014', 'C', 'o', 'n', 't', 'r', 'o', 'l', 'P', 'l', 'a', 'n', 'e', '\022', '\036', '\n', '\n', 'i', 'd', -'e', 'n', 't', 'i', 'f', 'i', 'e', 'r', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\n', 'i', 'd', 'e', 'n', 't', 'i', 'f', 'i', 'e', -'r', ':', '%', '\232', '\305', '\210', '\036', ' ', '\n', '\036', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', -'r', 'e', '.', 'C', 'o', 'n', 't', 'r', 'o', 'l', 'P', 'l', 'a', 'n', 'e', '*', '(', '\n', '\017', 'R', 'o', 'u', 't', 'i', 'n', -'g', 'P', 'r', 'i', 'o', 'r', 'i', 't', 'y', '\022', '\013', '\n', '\007', 'D', 'E', 'F', 'A', 'U', 'L', 'T', '\020', '\000', '\022', '\010', '\n', -'\004', 'H', 'I', 'G', 'H', '\020', '\001', '*', '\211', '\001', '\n', '\r', 'R', 'e', 'q', 'u', 'e', 's', 't', 'M', 'e', 't', 'h', 'o', 'd', -'\022', '\026', '\n', '\022', 'M', 'E', 'T', 'H', 'O', 'D', '_', 'U', 'N', 'S', 'P', 'E', 'C', 'I', 'F', 'I', 'E', 'D', '\020', '\000', '\022', -'\007', '\n', '\003', 'G', 'E', 'T', '\020', '\001', '\022', '\010', '\n', '\004', 'H', 'E', 'A', 'D', '\020', '\002', '\022', '\010', '\n', '\004', 'P', 'O', 'S', -'T', '\020', '\003', '\022', '\007', '\n', '\003', 'P', 'U', 'T', '\020', '\004', '\022', '\n', '\n', '\006', 'D', 'E', 'L', 'E', 'T', 'E', '\020', '\005', '\022', -'\013', '\n', '\007', 'C', 'O', 'N', 'N', 'E', 'C', 'T', '\020', '\006', '\022', '\013', '\n', '\007', 'O', 'P', 'T', 'I', 'O', 'N', 'S', '\020', '\007', -'\022', '\t', '\n', '\005', 'T', 'R', 'A', 'C', 'E', '\020', '\010', '\022', '\t', '\n', '\005', 'P', 'A', 'T', 'C', 'H', '\020', '\t', '*', '>', '\n', -'\020', 'T', 'r', 'a', 'f', 'f', 'i', 'c', 'D', 'i', 'r', 'e', 'c', 't', 'i', 'o', 'n', '\022', '\017', '\n', '\013', 'U', 'N', 'S', 'P', -'E', 'C', 'I', 'F', 'I', 'E', 'D', '\020', '\000', '\022', '\013', '\n', '\007', 'I', 'N', 'B', 'O', 'U', 'N', 'D', '\020', '\001', '\022', '\014', '\n', -'\010', 'O', 'U', 'T', 'B', 'O', 'U', 'N', 'D', '\020', '\002', 'B', '9', '\n', '\"', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', -'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', 'B', -'\t', 'B', 'a', 's', 'e', 'P', 'r', 'o', 't', 'o', 'P', '\001', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', -'t', 'o', '3', +'n', 'y', '.', 'p', 'r', 'o', 't', 'o', '\032', '\034', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', +'/', 's', 't', 'r', 'u', 'c', 't', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', +'t', 'o', 'b', 'u', 'f', '/', 'w', 'r', 'a', 'p', 'p', 'e', 'r', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'u', 'd', 'p', +'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'm', 'i', 'g', 'r', 'a', 't', 'e', '.', 'p', 'r', 'o', +'t', 'o', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', +'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', +'s', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', 'l', 'i', 'd', +'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', 't', '\n', '\010', 'L', 'o', 'c', +'a', 'l', 'i', 't', 'y', '\022', '\026', '\n', '\006', 'r', 'e', 'g', 'i', 'o', 'n', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\006', 'r', 'e', +'g', 'i', 'o', 'n', '\022', '\022', '\n', '\004', 'z', 'o', 'n', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\004', 'z', 'o', 'n', 'e', '\022', +'\031', '\n', '\010', 's', 'u', 'b', '_', 'z', 'o', 'n', 'e', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\007', 's', 'u', 'b', 'Z', 'o', 'n', +'e', ':', '!', '\232', '\305', '\210', '\036', '\034', '\n', '\032', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', +'r', 'e', '.', 'L', 'o', 'c', 'a', 'l', 'i', 't', 'y', '\"', '\244', '\001', '\n', '\014', 'B', 'u', 'i', 'l', 'd', 'V', 'e', 'r', 's', +'i', 'o', 'n', '\022', '8', '\n', '\007', 'v', 'e', 'r', 's', 'i', 'o', 'n', '\030', '\001', ' ', '\001', '(', '\013', '2', '\036', '.', 'e', 'n', +'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'S', 'e', 'm', 'a', 'n', 't', 'i', 'c', 'V', 'e', 'r', 's', 'i', +'o', 'n', 'R', '\007', 'v', 'e', 'r', 's', 'i', 'o', 'n', '\022', '3', '\n', '\010', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '\030', '\002', +' ', '\001', '(', '\013', '2', '\027', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 't', +'r', 'u', 'c', 't', 'R', '\010', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', ':', '%', '\232', '\305', '\210', '\036', ' ', '\n', '\036', 'e', 'n', +'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'B', 'u', 'i', 'l', 'd', 'V', 'e', 'r', 's', +'i', 'o', 'n', '\"', '\342', '\001', '\n', '\t', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', +'\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '\032', '\n', '\010', 'c', 'a', 't', 'e', 'g', 'o', 'r', 'y', '\030', +'\002', ' ', '\001', '(', '\t', 'R', '\010', 'c', 'a', 't', 'e', 'g', 'o', 'r', 'y', '\022', '\'', '\n', '\017', 't', 'y', 'p', 'e', '_', 'd', +'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\016', 't', 'y', 'p', 'e', 'D', 'e', 's', 'c', +'r', 'i', 'p', 't', 'o', 'r', '\022', '<', '\n', '\007', 'v', 'e', 'r', 's', 'i', 'o', 'n', '\030', '\004', ' ', '\001', '(', '\013', '2', '\"', +'.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'B', 'u', 'i', +'l', 'd', 'V', 'e', 'r', 's', 'i', 'o', 'n', 'R', '\007', 'v', 'e', 'r', 's', 'i', 'o', 'n', '\022', '\032', '\n', '\010', 'd', 'i', 's', +'a', 'b', 'l', 'e', 'd', '\030', '\005', ' ', '\001', '(', '\010', 'R', '\010', 'd', 'i', 's', 'a', 'b', 'l', 'e', 'd', ':', '\"', '\232', '\305', +'\210', '\036', '\035', '\n', '\033', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'E', 'x', +'t', 'e', 'n', 's', 'i', 'o', 'n', '\"', '\345', '\004', '\n', '\004', 'N', 'o', 'd', 'e', '\022', '\016', '\n', '\002', 'i', 'd', '\030', '\001', ' ', +'\001', '(', '\t', 'R', '\002', 'i', 'd', '\022', '\030', '\n', '\007', 'c', 'l', 'u', 's', 't', 'e', 'r', '\030', '\002', ' ', '\001', '(', '\t', 'R', +'\007', 'c', 'l', 'u', 's', 't', 'e', 'r', '\022', '3', '\n', '\010', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '\030', '\003', ' ', '\001', '(', +'\013', '2', '\027', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 't', 'r', 'u', 'c', +'t', 'R', '\010', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '\022', ':', '\n', '\010', 'l', 'o', 'c', 'a', 'l', 'i', 't', 'y', '\030', '\004', +' ', '\001', '(', '\013', '2', '\036', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', +'v', '3', '.', 'L', 'o', 'c', 'a', 'l', 'i', 't', 'y', 'R', '\010', 'l', 'o', 'c', 'a', 'l', 'i', 't', 'y', '\022', '&', '\n', '\017', +'u', 's', 'e', 'r', '_', 'a', 'g', 'e', 'n', 't', '_', 'n', 'a', 'm', 'e', '\030', '\006', ' ', '\001', '(', '\t', 'R', '\r', 'u', 's', +'e', 'r', 'A', 'g', 'e', 'n', 't', 'N', 'a', 'm', 'e', '\022', '.', '\n', '\022', 'u', 's', 'e', 'r', '_', 'a', 'g', 'e', 'n', 't', +'_', 'v', 'e', 'r', 's', 'i', 'o', 'n', '\030', '\007', ' ', '\001', '(', '\t', 'H', '\000', 'R', '\020', 'u', 's', 'e', 'r', 'A', 'g', 'e', +'n', 't', 'V', 'e', 'r', 's', 'i', 'o', 'n', '\022', ']', '\n', '\030', 'u', 's', 'e', 'r', '_', 'a', 'g', 'e', 'n', 't', '_', 'b', +'u', 'i', 'l', 'd', '_', 'v', 'e', 'r', 's', 'i', 'o', 'n', '\030', '\010', ' ', '\001', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', +'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'B', 'u', 'i', 'l', 'd', 'V', 'e', 'r', +'s', 'i', 'o', 'n', 'H', '\000', 'R', '\025', 'u', 's', 'e', 'r', 'A', 'g', 'e', 'n', 't', 'B', 'u', 'i', 'l', 'd', 'V', 'e', 'r', +'s', 'i', 'o', 'n', '\022', '?', '\n', '\n', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '\030', '\t', ' ', '\003', '(', '\013', '2', +'\037', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'E', 'x', +'t', 'e', 'n', 's', 'i', 'o', 'n', 'R', '\n', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '\022', '\'', '\n', '\017', 'c', 'l', +'i', 'e', 'n', 't', '_', 'f', 'e', 'a', 't', 'u', 'r', 'e', 's', '\030', '\n', ' ', '\003', '(', '\t', 'R', '\016', 'c', 'l', 'i', 'e', +'n', 't', 'F', 'e', 'a', 't', 'u', 'r', 'e', 's', '\022', 'R', '\n', '\023', 'l', 'i', 's', 't', 'e', 'n', 'i', 'n', 'g', '_', 'a', +'d', 'd', 'r', 'e', 's', 's', 'e', 's', '\030', '\013', ' ', '\003', '(', '\013', '2', '\035', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', +'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'A', 'd', 'd', 'r', 'e', 's', 's', 'B', '\002', '\030', '\001', 'R', +'\022', 'l', 'i', 's', 't', 'e', 'n', 'i', 'n', 'g', 'A', 'd', 'd', 'r', 'e', 's', 's', 'e', 's', ':', '\035', '\232', '\305', '\210', '\036', +'\030', '\n', '\026', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'N', 'o', 'd', 'e', +'B', '\031', '\n', '\027', 'u', 's', 'e', 'r', '_', 'a', 'g', 'e', 'n', 't', '_', 'v', 'e', 'r', 's', 'i', 'o', 'n', '_', 't', 'y', +'p', 'e', 'J', '\004', '\010', '\005', '\020', '\006', 'R', '\r', 'b', 'u', 'i', 'l', 'd', '_', 'v', 'e', 'r', 's', 'i', 'o', 'n', '\"', '\346', +'\001', '\n', '\010', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', '\022', '[', '\n', '\017', 'f', 'i', 'l', 't', 'e', 'r', '_', 'm', 'e', 't', +'a', 'd', 'a', 't', 'a', '\030', '\001', ' ', '\003', '(', '\013', '2', '2', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', +'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', '.', 'F', 'i', 'l', 't', 'e', 'r', +'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'E', 'n', 't', 'r', 'y', 'R', '\016', 'f', 'i', 'l', 't', 'e', 'r', 'M', 'e', 't', 'a', +'d', 'a', 't', 'a', '\032', 'Z', '\n', '\023', 'F', 'i', 'l', 't', 'e', 'r', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'E', 'n', 't', +'r', 'y', '\022', '\020', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\003', 'k', 'e', 'y', '\022', '-', '\n', '\005', 'v', +'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '\027', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', +'b', 'u', 'f', '.', 'S', 't', 'r', 'u', 'c', 't', 'R', '\005', 'v', 'a', 'l', 'u', 'e', ':', '\002', '8', '\001', ':', '!', '\232', '\305', +'\210', '\036', '\034', '\n', '\032', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'M', 'e', +'t', 'a', 'd', 'a', 't', 'a', '\"', '\206', '\001', '\n', '\r', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'U', 'I', 'n', 't', '3', '2', '\022', +'#', '\n', '\r', 'd', 'e', 'f', 'a', 'u', 'l', 't', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\r', 'R', '\014', 'd', +'e', 'f', 'a', 'u', 'l', 't', 'V', 'a', 'l', 'u', 'e', '\022', '(', '\n', '\013', 'r', 'u', 'n', 't', 'i', 'm', 'e', '_', 'k', 'e', +'y', '\030', '\003', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\n', 'r', 'u', 'n', 't', 'i', 'm', 'e', +'K', 'e', 'y', ':', '&', '\232', '\305', '\210', '\036', '!', '\n', '\037', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', +'c', 'o', 'r', 'e', '.', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'U', 'I', 'n', 't', '3', '2', '\"', 'w', '\n', '\016', 'R', 'u', 'n', +'t', 'i', 'm', 'e', 'P', 'e', 'r', 'c', 'e', 'n', 't', '\022', ';', '\n', '\r', 'd', 'e', 'f', 'a', 'u', 'l', 't', '_', 'v', 'a', +'l', 'u', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '\026', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', +'.', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', '\014', 'd', 'e', 'f', 'a', 'u', 'l', 't', 'V', 'a', 'l', 'u', 'e', '\022', '(', '\n', +'\013', 'r', 'u', 'n', 't', 'i', 'm', 'e', '_', 'k', 'e', 'y', '\030', '\002', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', +'\020', '\001', 'R', '\n', 'r', 'u', 'n', 't', 'i', 'm', 'e', 'K', 'e', 'y', '\"', '\206', '\001', '\n', '\r', 'R', 'u', 'n', 't', 'i', 'm', +'e', 'D', 'o', 'u', 'b', 'l', 'e', '\022', '#', '\n', '\r', 'd', 'e', 'f', 'a', 'u', 'l', 't', '_', 'v', 'a', 'l', 'u', 'e', '\030', +'\001', ' ', '\001', '(', '\001', 'R', '\014', 'd', 'e', 'f', 'a', 'u', 'l', 't', 'V', 'a', 'l', 'u', 'e', '\022', '(', '\n', '\013', 'r', 'u', +'n', 't', 'i', 'm', 'e', '_', 'k', 'e', 'y', '\030', '\002', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', +'\n', 'r', 'u', 'n', 't', 'i', 'm', 'e', 'K', 'e', 'y', ':', '&', '\232', '\305', '\210', '\036', '!', '\n', '\037', 'e', 'n', 'v', 'o', 'y', +'.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'D', 'o', 'u', 'b', 'l', +'e', '\"', '\266', '\001', '\n', '\022', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'F', 'e', 'a', 't', 'u', 'r', 'e', 'F', 'l', 'a', 'g', '\022', +'I', '\n', '\r', 'd', 'e', 'f', 'a', 'u', 'l', 't', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '\032', '.', +'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', +'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\014', 'd', 'e', 'f', 'a', 'u', 'l', 't', 'V', 'a', 'l', 'u', 'e', '\022', +'(', '\n', '\013', 'r', 'u', 'n', 't', 'i', 'm', 'e', '_', 'k', 'e', 'y', '\030', '\002', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', +'r', '\002', '\020', '\001', 'R', '\n', 'r', 'u', 'n', 't', 'i', 'm', 'e', 'K', 'e', 'y', ':', '+', '\232', '\305', '\210', '\036', '&', '\n', '$', +'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'R', 'u', 'n', 't', 'i', 'm', 'e', +'F', 'e', 'a', 't', 'u', 'r', 'e', 'F', 'l', 'a', 'g', '\"', '\177', '\n', '\013', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', +'e', '\022', '#', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\021', '\372', 'B', '\016', 'r', '\014', '\020', '\001', '(', '\200', +'\200', '\001', '\300', '\001', '\001', '\310', '\001', '\000', 'R', '\003', 'k', 'e', 'y', '\022', '%', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', +'\001', '(', '\t', 'B', '\017', '\372', 'B', '\014', 'r', '\n', '(', '\200', '\200', '\001', '\300', '\001', '\002', '\310', '\001', '\000', 'R', '\005', 'v', 'a', 'l', +'u', 'e', ':', '$', '\232', '\305', '\210', '\036', '\037', '\n', '\035', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', +'o', 'r', 'e', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', '\"', '\270', '\001', '\n', '\021', 'H', 'e', 'a', 'd', 'e', +'r', 'V', 'a', 'l', 'u', 'e', 'O', 'p', 't', 'i', 'o', 'n', '\022', 'C', '\n', '\006', 'h', 'e', 'a', 'd', 'e', 'r', '\030', '\001', ' ', +'\001', '(', '\013', '2', '!', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', +'3', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\006', +'h', 'e', 'a', 'd', 'e', 'r', '\022', '2', '\n', '\006', 'a', 'p', 'p', 'e', 'n', 'd', '\030', '\002', ' ', '\001', '(', '\013', '2', '\032', '.', +'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', +'R', '\006', 'a', 'p', 'p', 'e', 'n', 'd', ':', '*', '\232', '\305', '\210', '\036', '%', '\n', '#', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', +'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'O', 'p', 't', 'i', +'o', 'n', '\"', 'l', '\n', '\t', 'H', 'e', 'a', 'd', 'e', 'r', 'M', 'a', 'p', '\022', ';', '\n', '\007', 'h', 'e', 'a', 'd', 'e', 'r', +'s', '\030', '\001', ' ', '\003', '(', '\013', '2', '!', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', +'r', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'R', '\007', 'h', 'e', 'a', 'd', 'e', 'r', +'s', ':', '\"', '\232', '\305', '\210', '\036', '\035', '\n', '\033', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', +'r', 'e', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'M', 'a', 'p', '\"', '/', '\n', '\020', 'W', 'a', 't', 'c', 'h', 'e', 'd', 'D', 'i', +'r', 'e', 'c', 't', 'o', 'r', 'y', '\022', '\033', '\n', '\004', 'p', 'a', 't', 'h', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', +'\004', 'r', '\002', '\020', '\001', 'R', '\004', 'p', 'a', 't', 'h', '\"', '\266', '\001', '\n', '\n', 'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', +'e', '\022', '%', '\n', '\010', 'f', 'i', 'l', 'e', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', +'\002', '\020', '\001', 'H', '\000', 'R', '\010', 'f', 'i', 'l', 'e', 'n', 'a', 'm', 'e', '\022', '#', '\n', '\014', 'i', 'n', 'l', 'i', 'n', 'e', +'_', 'b', 'y', 't', 'e', 's', '\030', '\002', ' ', '\001', '(', '\014', 'H', '\000', 'R', '\013', 'i', 'n', 'l', 'i', 'n', 'e', 'B', 'y', 't', +'e', 's', '\022', '%', '\n', '\r', 'i', 'n', 'l', 'i', 'n', 'e', '_', 's', 't', 'r', 'i', 'n', 'g', '\030', '\003', ' ', '\001', '(', '\t', +'H', '\000', 'R', '\014', 'i', 'n', 'l', 'i', 'n', 'e', 'S', 't', 'r', 'i', 'n', 'g', ':', '#', '\232', '\305', '\210', '\036', '\036', '\n', '\034', +'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'D', 'a', 't', 'a', 'S', 'o', 'u', +'r', 'c', 'e', 'B', '\020', '\n', '\t', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', '\001', '\"', '\324', '\001', '\n', +'\013', 'R', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', '\022', 'K', '\n', '\016', 'r', 'e', 't', 'r', 'y', '_', 'b', 'a', 'c', +'k', '_', 'o', 'f', 'f', '\030', '\001', ' ', '\001', '(', '\013', '2', '%', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', +'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'B', 'a', 'c', 'k', 'o', 'f', 'f', 'S', 't', 'r', 'a', 't', 'e', 'g', 'y', +'R', '\014', 'r', 'e', 't', 'r', 'y', 'B', 'a', 'c', 'k', 'O', 'f', 'f', '\022', 'R', '\n', '\013', 'n', 'u', 'm', '_', 'r', 'e', 't', +'r', 'i', 'e', 's', '\030', '\002', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', +'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\023', '\362', '\230', '\376', '\217', '\005', '\r', '\n', '\013', +'m', 'a', 'x', '_', 'r', 'e', 't', 'r', 'i', 'e', 's', 'R', '\n', 'n', 'u', 'm', 'R', 'e', 't', 'r', 'i', 'e', 's', ':', '$', +'\232', '\305', '\210', '\036', '\037', '\n', '\035', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', +'R', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', '\"', '\350', '\001', '\n', '\020', 'R', 'e', 'm', 'o', 't', 'e', 'D', 'a', 't', +'a', 'S', 'o', 'u', 'r', 'c', 'e', '\022', 'B', '\n', '\010', 'h', 't', 't', 'p', '_', 'u', 'r', 'i', '\030', '\001', ' ', '\001', '(', '\013', +'2', '\035', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', +'t', 't', 'p', 'U', 'r', 'i', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\007', 'h', 't', 't', 'p', 'U', 'r', 'i', +'\022', '\037', '\n', '\006', 's', 'h', 'a', '2', '5', '6', '\030', '\002', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', +'R', '\006', 's', 'h', 'a', '2', '5', '6', '\022', 'D', '\n', '\014', 'r', 'e', 't', 'r', 'y', '_', 'p', 'o', 'l', 'i', 'c', 'y', '\030', +'\003', ' ', '\001', '(', '\013', '2', '!', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', +'.', 'v', '3', '.', 'R', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', 'R', '\013', 'r', 'e', 't', 'r', 'y', 'P', 'o', 'l', +'i', 'c', 'y', ':', ')', '\232', '\305', '\210', '\036', '$', '\n', '\"', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', +'c', 'o', 'r', 'e', '.', 'R', 'e', 'm', 'o', 't', 'e', 'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', '\"', '\311', '\001', '\n', +'\017', 'A', 's', 'y', 'n', 'c', 'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', '\022', '8', '\n', '\005', 'l', 'o', 'c', 'a', 'l', +'\030', '\001', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', +'e', '.', 'v', '3', '.', 'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', 'H', '\000', 'R', '\005', 'l', 'o', 'c', 'a', 'l', '\022', +'@', '\n', '\006', 'r', 'e', 'm', 'o', 't', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '&', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', +'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'R', 'e', 'm', 'o', 't', 'e', 'D', 'a', 't', 'a', 'S', +'o', 'u', 'r', 'c', 'e', 'H', '\000', 'R', '\006', 'r', 'e', 'm', 'o', 't', 'e', ':', '(', '\232', '\305', '\210', '\036', '#', '\n', '!', 'e', +'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'A', 's', 'y', 'n', 'c', 'D', 'a', 't', +'a', 'S', 'o', 'u', 'r', 'c', 'e', 'B', '\020', '\n', '\t', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', '\001', +'\"', '\260', '\001', '\n', '\017', 'T', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', 'S', 'o', 'c', 'k', 'e', 't', '\022', '\033', '\n', '\004', 'n', +'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', 'm', 'e', '\022', +'9', '\n', '\014', 't', 'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\003', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', +'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'H', '\000', 'R', '\013', 't', 'y', 'p', +'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', ':', '(', '\232', '\305', '\210', '\036', '#', '\n', '!', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', +'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'T', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', 'S', 'o', 'c', 'k', 'e', 't', +'B', '\r', '\n', '\013', 'c', 'o', 'n', 'f', 'i', 'g', '_', 't', 'y', 'p', 'e', 'J', '\004', '\010', '\002', '\020', '\003', 'R', '\006', 'c', 'o', +'n', 'f', 'i', 'g', '\"', '\277', '\001', '\n', '\030', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'F', 'r', 'a', 'c', 't', 'i', 'o', 'n', 'a', +'l', 'P', 'e', 'r', 'c', 'e', 'n', 't', '\022', 'O', '\n', '\r', 'd', 'e', 'f', 'a', 'u', 'l', 't', '_', 'v', 'a', 'l', 'u', 'e', +'\030', '\001', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'F', 'r', +'a', 'c', 't', 'i', 'o', 'n', 'a', 'l', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', +'R', '\014', 'd', 'e', 'f', 'a', 'u', 'l', 't', 'V', 'a', 'l', 'u', 'e', '\022', '\037', '\n', '\013', 'r', 'u', 'n', 't', 'i', 'm', 'e', +'_', 'k', 'e', 'y', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\n', 'r', 'u', 'n', 't', 'i', 'm', 'e', 'K', 'e', 'y', ':', '1', '\232', +'\305', '\210', '\036', ',', '\n', '*', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'R', +'u', 'n', 't', 'i', 'm', 'e', 'F', 'r', 'a', 'c', 't', 'i', 'o', 'n', 'a', 'l', 'P', 'e', 'r', 'c', 'e', 'n', 't', '\"', 'U', +'\n', '\014', 'C', 'o', 'n', 't', 'r', 'o', 'l', 'P', 'l', 'a', 'n', 'e', '\022', '\036', '\n', '\n', 'i', 'd', 'e', 'n', 't', 'i', 'f', +'i', 'e', 'r', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\n', 'i', 'd', 'e', 'n', 't', 'i', 'f', 'i', 'e', 'r', ':', '%', '\232', '\305', +'\210', '\036', ' ', '\n', '\036', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'C', 'o', +'n', 't', 'r', 'o', 'l', 'P', 'l', 'a', 'n', 'e', '*', '(', '\n', '\017', 'R', 'o', 'u', 't', 'i', 'n', 'g', 'P', 'r', 'i', 'o', +'r', 'i', 't', 'y', '\022', '\013', '\n', '\007', 'D', 'E', 'F', 'A', 'U', 'L', 'T', '\020', '\000', '\022', '\010', '\n', '\004', 'H', 'I', 'G', 'H', +'\020', '\001', '*', '\211', '\001', '\n', '\r', 'R', 'e', 'q', 'u', 'e', 's', 't', 'M', 'e', 't', 'h', 'o', 'd', '\022', '\026', '\n', '\022', 'M', +'E', 'T', 'H', 'O', 'D', '_', 'U', 'N', 'S', 'P', 'E', 'C', 'I', 'F', 'I', 'E', 'D', '\020', '\000', '\022', '\007', '\n', '\003', 'G', 'E', +'T', '\020', '\001', '\022', '\010', '\n', '\004', 'H', 'E', 'A', 'D', '\020', '\002', '\022', '\010', '\n', '\004', 'P', 'O', 'S', 'T', '\020', '\003', '\022', '\007', +'\n', '\003', 'P', 'U', 'T', '\020', '\004', '\022', '\n', '\n', '\006', 'D', 'E', 'L', 'E', 'T', 'E', '\020', '\005', '\022', '\013', '\n', '\007', 'C', 'O', +'N', 'N', 'E', 'C', 'T', '\020', '\006', '\022', '\013', '\n', '\007', 'O', 'P', 'T', 'I', 'O', 'N', 'S', '\020', '\007', '\022', '\t', '\n', '\005', 'T', +'R', 'A', 'C', 'E', '\020', '\010', '\022', '\t', '\n', '\005', 'P', 'A', 'T', 'C', 'H', '\020', '\t', '*', '>', '\n', '\020', 'T', 'r', 'a', 'f', +'f', 'i', 'c', 'D', 'i', 'r', 'e', 'c', 't', 'i', 'o', 'n', '\022', '\017', '\n', '\013', 'U', 'N', 'S', 'P', 'E', 'C', 'I', 'F', 'I', +'E', 'D', '\020', '\000', '\022', '\013', '\n', '\007', 'I', 'N', 'B', 'O', 'U', 'N', 'D', '\020', '\001', '\022', '\014', '\n', '\010', 'O', 'U', 'T', 'B', +'O', 'U', 'N', 'D', '\020', '\002', 'B', '9', '\n', '\"', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', +'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', 'B', '\t', 'B', 'a', 's', 'e', +'P', 'r', 'o', 't', 'o', 'P', '\001', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; -static upb_def_init *deps[14] = { +static upb_def_init *deps[13] = { &envoy_config_core_v3_address_proto_upbdefinit, &envoy_config_core_v3_backoff_proto_upbdefinit, &envoy_config_core_v3_http_uri_proto_upbdefinit, &envoy_type_v3_percent_proto_upbdefinit, &envoy_type_v3_semantic_version_proto_upbdefinit, &google_protobuf_any_proto_upbdefinit, - &google_protobuf_duration_proto_upbdefinit, &google_protobuf_struct_proto_upbdefinit, &google_protobuf_wrappers_proto_upbdefinit, &udpa_annotations_migrate_proto_upbdefinit, @@ -262,5 +268,5 @@ upb_def_init envoy_config_core_v3_base_proto_upbdefinit = { deps, layouts, "envoy/config/core/v3/base.proto", - UPB_STRVIEW_INIT(descriptor, 4353) + UPB_STRVIEW_INIT(descriptor, 4473) }; diff --git a/grpc/src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.h b/grpc/src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.h index 96ff806a..4464edaf 100644 --- a/grpc/src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.h +++ b/grpc/src/core/ext/upbdefs-generated/envoy/config/core/v3/base.upbdefs.h @@ -56,6 +56,11 @@ UPB_INLINE const upb_msgdef *envoy_config_core_v3_RuntimeUInt32_getmsgdef(upb_sy return upb_symtab_lookupmsg(s, "envoy.config.core.v3.RuntimeUInt32"); } +UPB_INLINE const upb_msgdef *envoy_config_core_v3_RuntimePercent_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_config_core_v3_base_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.config.core.v3.RuntimePercent"); +} + UPB_INLINE const upb_msgdef *envoy_config_core_v3_RuntimeDouble_getmsgdef(upb_symtab *s) { _upb_symtab_loaddefinit(s, &envoy_config_core_v3_base_proto_upbdefinit); return upb_symtab_lookupmsg(s, "envoy.config.core.v3.RuntimeDouble"); @@ -81,6 +86,11 @@ UPB_INLINE const upb_msgdef *envoy_config_core_v3_HeaderMap_getmsgdef(upb_symtab return upb_symtab_lookupmsg(s, "envoy.config.core.v3.HeaderMap"); } +UPB_INLINE const upb_msgdef *envoy_config_core_v3_WatchedDirectory_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_config_core_v3_base_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.config.core.v3.WatchedDirectory"); +} + UPB_INLINE const upb_msgdef *envoy_config_core_v3_DataSource_getmsgdef(upb_symtab *s) { _upb_symtab_loaddefinit(s, &envoy_config_core_v3_base_proto_upbdefinit); return upb_symtab_lookupmsg(s, "envoy.config.core.v3.DataSource"); diff --git a/grpc/src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.c b/grpc/src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.c index ff4c0fe2..6eb77098 100644 --- a/grpc/src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.c +++ b/grpc/src/core/ext/upbdefs-generated/envoy/config/core/v3/config_source.upbdefs.c @@ -12,7 +12,7 @@ extern upb_def_init envoy_config_core_v3_grpc_service_proto_upbdefinit; extern upb_def_init google_protobuf_duration_proto_upbdefinit; extern upb_def_init google_protobuf_wrappers_proto_upbdefinit; -extern upb_def_init udpa_core_v1_authority_proto_upbdefinit; +extern upb_def_init xds_core_v3_authority_proto_upbdefinit; extern upb_def_init envoy_annotations_deprecation_proto_upbdefinit; extern upb_def_init udpa_annotations_status_proto_upbdefinit; extern upb_def_init udpa_annotations_versioning_proto_upbdefinit; @@ -31,103 +31,103 @@ static const upb_msglayout *layouts[5] = { &envoy_config_core_v3_ConfigSource_msginit, }; -static const char descriptor[2232] = {'\n', '(', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'c', 'o', +static const char descriptor[2238] = {'\n', '(', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'c', 'o', 'n', 'f', 'i', 'g', '_', 's', 'o', 'u', 'r', 'c', 'e', '.', 'p', 'r', 'o', 't', 'o', '\022', '\024', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '\032', '\'', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'g', 'r', 'p', 'c', '_', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', -'o', 'b', 'u', 'f', '/', 'w', 'r', 'a', 'p', 'p', 'e', 'r', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '\034', 'u', 'd', 'p', 'a', -'/', 'c', 'o', 'r', 'e', '/', 'v', '1', '/', 'a', 'u', 't', 'h', 'o', 'r', 'i', 't', 'y', '.', 'p', 'r', 'o', 't', 'o', '\032', -'#', 'e', 'n', 'v', 'o', 'y', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'd', 'e', 'p', 'r', 'e', 'c', -'a', 't', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', -'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '!', 'u', 'd', 'p', 'a', '/', 'a', -'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', -'t', 'o', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', -'t', 'o', '\"', '\233', '\006', '\n', '\017', 'A', 'p', 'i', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', '\022', 'R', '\n', -'\010', 'a', 'p', 'i', '_', 't', 'y', 'p', 'e', '\030', '\001', ' ', '\001', '(', '\016', '2', '-', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', -'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'A', 'p', 'i', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', -'u', 'r', 'c', 'e', '.', 'A', 'p', 'i', 'T', 'y', 'p', 'e', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\007', 'a', -'p', 'i', 'T', 'y', 'p', 'e', '\022', '^', '\n', '\025', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 'a', 'p', 'i', '_', 'v', -'e', 'r', 's', 'i', 'o', 'n', '\030', '\010', ' ', '\001', '(', '\016', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', -'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'A', 'p', 'i', 'V', 'e', 'r', 's', 'i', 'o', 'n', 'B', '\010', '\372', 'B', -'\005', '\202', '\001', '\002', '\020', '\001', 'R', '\023', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', 'A', 'p', 'i', 'V', 'e', 'r', 's', 'i', -'o', 'n', '\022', '#', '\n', '\r', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 'n', 'a', 'm', 'e', 's', '\030', '\002', ' ', '\003', '(', '\t', -'R', '\014', 'c', 'l', 'u', 's', 't', 'e', 'r', 'N', 'a', 'm', 'e', 's', '\022', 'F', '\n', '\r', 'g', 'r', 'p', 'c', '_', 's', 'e', -'r', 'v', 'i', 'c', 'e', 's', '\030', '\004', ' ', '\003', '(', '\013', '2', '!', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', -'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'R', '\014', 'g', -'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 's', '\022', '>', '\n', '\r', 'r', 'e', 'f', 'r', 'e', 's', 'h', '_', 'd', 'e', -'l', 'a', 'y', '\030', '\003', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', -'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\014', 'r', 'e', 'f', 'r', 'e', 's', 'h', 'D', 'e', 'l', 'a', 'y', -'\022', 'L', '\n', '\017', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\005', ' ', '\001', '(', '\013', -'2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', -'o', 'n', 'B', '\010', '\372', 'B', '\005', '\252', '\001', '\002', '*', '\000', 'R', '\016', 'r', 'e', 'q', 'u', 'e', 's', 't', 'T', 'i', 'm', 'e', -'o', 'u', 't', '\022', 'W', '\n', '\023', 'r', 'a', 't', 'e', '_', 'l', 'i', 'm', 'i', 't', '_', 's', 'e', 't', 't', 'i', 'n', 'g', -'s', '\030', '\006', ' ', '\001', '(', '\013', '2', '\'', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', -'r', 'e', '.', 'v', '3', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', 'S', 'e', 't', 't', 'i', 'n', 'g', 's', 'R', '\021', -'r', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', 'S', 'e', 't', 't', 'i', 'n', 'g', 's', '\022', 'A', '\n', '\036', 's', 'e', 't', '_', -'n', 'o', 'd', 'e', '_', 'o', 'n', '_', 'f', 'i', 'r', 's', 't', '_', 'm', 'e', 's', 's', 'a', 'g', 'e', '_', 'o', 'n', 'l', -'y', '\030', '\007', ' ', '\001', '(', '\010', 'R', '\031', 's', 'e', 't', 'N', 'o', 'd', 'e', 'O', 'n', 'F', 'i', 'r', 's', 't', 'M', 'e', -'s', 's', 'a', 'g', 'e', 'O', 'n', 'l', 'y', '\"', '\222', '\001', '\n', '\007', 'A', 'p', 'i', 'T', 'y', 'p', 'e', '\022', '3', '\n', '%', -'D', 'E', 'P', 'R', 'E', 'C', 'A', 'T', 'E', 'D', '_', 'A', 'N', 'D', '_', 'U', 'N', 'A', 'V', 'A', 'I', 'L', 'A', 'B', 'L', -'E', '_', 'D', 'O', '_', 'N', 'O', 'T', '_', 'U', 'S', 'E', '\020', '\000', '\032', '\010', '\010', '\001', '\250', '\367', '\264', '\213', '\002', '\001', '\022', -'\010', '\n', '\004', 'R', 'E', 'S', 'T', '\020', '\001', '\022', '\010', '\n', '\004', 'G', 'R', 'P', 'C', '\020', '\002', '\022', '\016', '\n', '\n', 'D', 'E', -'L', 'T', 'A', '_', 'G', 'R', 'P', 'C', '\020', '\003', '\022', '\023', '\n', '\017', 'A', 'G', 'G', 'R', 'E', 'G', 'A', 'T', 'E', 'D', '_', -'G', 'R', 'P', 'C', '\020', '\005', '\022', '\031', '\n', '\025', 'A', 'G', 'G', 'R', 'E', 'G', 'A', 'T', 'E', 'D', '_', 'D', 'E', 'L', 'T', -'A', '_', 'G', 'R', 'P', 'C', '\020', '\006', ':', '(', '\232', '\305', '\210', '\036', '#', '\n', '!', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', -'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'A', 'p', 'i', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', -'\"', 'I', '\n', '\026', 'A', 'g', 'g', 'r', 'e', 'g', 'a', 't', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', -'e', ':', '/', '\232', '\305', '\210', '\036', '*', '\n', '(', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', -'r', 'e', '.', 'A', 'g', 'g', 'r', 'e', 'g', 'a', 't', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', -'\"', '\235', '\001', '\n', '\020', 'S', 'e', 'l', 'f', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', '\022', '^', '\n', '\025', -'t', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 'a', 'p', 'i', '_', 'v', 'e', 'r', 's', 'i', 'o', 'n', '\030', '\001', ' ', '\001', -'(', '\016', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', -'.', 'A', 'p', 'i', 'V', 'e', 'r', 's', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\023', 't', 'r', -'a', 'n', 's', 'p', 'o', 'r', 't', 'A', 'p', 'i', 'V', 'e', 'r', 's', 'i', 'o', 'n', ':', ')', '\232', '\305', '\210', '\036', '$', '\n', -'\"', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'S', 'e', 'l', 'f', 'C', 'o', -'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', '\"', '\307', '\001', '\n', '\021', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', 'S', -'e', 't', 't', 'i', 'n', 'g', 's', '\022', ';', '\n', '\n', 'm', 'a', 'x', '_', 't', 'o', 'k', 'e', 'n', 's', '\030', '\001', ' ', '\001', -'(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', -'3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\t', 'm', 'a', 'x', 'T', 'o', 'k', 'e', 'n', 's', '\022', 'I', '\n', '\t', 'f', 'i', 'l', -'l', '_', 'r', 'a', 't', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', -'t', 'o', 'b', 'u', 'f', '.', 'D', 'o', 'u', 'b', 'l', 'e', 'V', 'a', 'l', 'u', 'e', 'B', '\016', '\372', 'B', '\013', '\022', '\t', '!', -'\000', '\000', '\000', '\000', '\000', '\000', '\000', '\000', 'R', '\010', 'f', 'i', 'l', 'l', 'R', 'a', 't', 'e', ':', '*', '\232', '\305', '\210', '\036', '%', -'\n', '#', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'R', 'a', 't', 'e', 'L', -'i', 'm', 'i', 't', 'S', 'e', 't', 't', 'i', 'n', 'g', 's', '\"', '\250', '\004', '\n', '\014', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', -'u', 'r', 'c', 'e', '\022', '9', '\n', '\013', 'a', 'u', 't', 'h', 'o', 'r', 'i', 't', 'i', 'e', 's', '\030', '\007', ' ', '\003', '(', '\013', -'2', '\027', '.', 'u', 'd', 'p', 'a', '.', 'c', 'o', 'r', 'e', '.', 'v', '1', '.', 'A', 'u', 't', 'h', 'o', 'r', 'i', 't', 'y', -'R', '\013', 'a', 'u', 't', 'h', 'o', 'r', 'i', 't', 'i', 'e', 's', '\022', '\024', '\n', '\004', 'p', 'a', 't', 'h', '\030', '\001', ' ', '\001', -'(', '\t', 'H', '\000', 'R', '\004', 'p', 'a', 't', 'h', '\022', 'S', '\n', '\021', 'a', 'p', 'i', '_', 'c', 'o', 'n', 'f', 'i', 'g', '_', -'s', 'o', 'u', 'r', 'c', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '%', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', -'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'A', 'p', 'i', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', -'e', 'H', '\000', 'R', '\017', 'a', 'p', 'i', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', '\022', '@', '\n', '\003', 'a', -'d', 's', '\030', '\003', ' ', '\001', '(', '\013', '2', ',', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', -'o', 'r', 'e', '.', 'v', '3', '.', 'A', 'g', 'g', 'r', 'e', 'g', 'a', 't', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', -'u', 'r', 'c', 'e', 'H', '\000', 'R', '\003', 'a', 'd', 's', '\022', '<', '\n', '\004', 's', 'e', 'l', 'f', '\030', '\005', ' ', '\001', '(', '\013', -'2', '&', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'S', -'e', 'l', 'f', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', 'H', '\000', 'R', '\004', 's', 'e', 'l', 'f', '\022', 'M', -'\n', '\025', 'i', 'n', 'i', 't', 'i', 'a', 'l', '_', 'f', 'e', 't', 'c', 'h', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\004', -' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', -'r', 'a', 't', 'i', 'o', 'n', 'R', '\023', 'i', 'n', 'i', 't', 'i', 'a', 'l', 'F', 'e', 't', 'c', 'h', 'T', 'i', 'm', 'e', 'o', -'u', 't', '\022', '\\', '\n', '\024', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', '_', 'a', 'p', 'i', '_', 'v', 'e', 'r', 's', 'i', 'o', -'n', '\030', '\006', ' ', '\001', '(', '\016', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', -'r', 'e', '.', 'v', '3', '.', 'A', 'p', 'i', 'V', 'e', 'r', 's', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', -'\001', 'R', '\022', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', 'A', 'p', 'i', 'V', 'e', 'r', 's', 'i', 'o', 'n', ':', '%', '\232', '\305', -'\210', '\036', ' ', '\n', '\036', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'C', 'o', -'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', 'B', '\036', '\n', '\027', 'c', 'o', 'n', 'f', 'i', 'g', '_', 's', 'o', 'u', 'r', -'c', 'e', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', '\001', '*', '&', '\n', '\n', 'A', 'p', 'i', 'V', -'e', 'r', 's', 'i', 'o', 'n', '\022', '\010', '\n', '\004', 'A', 'U', 'T', 'O', '\020', '\000', '\022', '\006', '\n', '\002', 'V', '2', '\020', '\001', '\022', -'\006', '\n', '\002', 'V', '3', '\020', '\002', 'B', 'A', '\n', '\"', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', -'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', 'B', '\021', 'C', 'o', 'n', -'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', 'P', 'r', 'o', 't', 'o', 'P', '\001', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', -'\006', 'p', 'r', 'o', 't', 'o', '3', +'o', 'b', 'u', 'f', '/', 'w', 'r', 'a', 'p', 'p', 'e', 'r', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '\033', 'x', 'd', 's', '/', +'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'a', 'u', 't', 'h', 'o', 'r', 'i', 't', 'y', '.', 'p', 'r', 'o', 't', 'o', '\032', '#', +'e', 'n', 'v', 'o', 'y', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'd', 'e', 'p', 'r', 'e', 'c', 'a', +'t', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', +'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', +'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', +'o', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', +'o', '\"', '\233', '\006', '\n', '\017', 'A', 'p', 'i', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', '\022', 'R', '\n', '\010', +'a', 'p', 'i', '_', 't', 'y', 'p', 'e', '\030', '\001', ' ', '\001', '(', '\016', '2', '-', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', +'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'A', 'p', 'i', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', +'r', 'c', 'e', '.', 'A', 'p', 'i', 'T', 'y', 'p', 'e', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\007', 'a', 'p', +'i', 'T', 'y', 'p', 'e', '\022', '^', '\n', '\025', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 'a', 'p', 'i', '_', 'v', 'e', +'r', 's', 'i', 'o', 'n', '\030', '\010', ' ', '\001', '(', '\016', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', +'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'A', 'p', 'i', 'V', 'e', 'r', 's', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', +'\202', '\001', '\002', '\020', '\001', 'R', '\023', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', 'A', 'p', 'i', 'V', 'e', 'r', 's', 'i', 'o', +'n', '\022', '#', '\n', '\r', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 'n', 'a', 'm', 'e', 's', '\030', '\002', ' ', '\003', '(', '\t', 'R', +'\014', 'c', 'l', 'u', 's', 't', 'e', 'r', 'N', 'a', 'm', 'e', 's', '\022', 'F', '\n', '\r', 'g', 'r', 'p', 'c', '_', 's', 'e', 'r', +'v', 'i', 'c', 'e', 's', '\030', '\004', ' ', '\003', '(', '\013', '2', '!', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', +'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'G', 'r', 'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'R', '\014', 'g', 'r', +'p', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 's', '\022', '>', '\n', '\r', 'r', 'e', 'f', 'r', 'e', 's', 'h', '_', 'd', 'e', 'l', +'a', 'y', '\030', '\003', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', +'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\014', 'r', 'e', 'f', 'r', 'e', 's', 'h', 'D', 'e', 'l', 'a', 'y', '\022', +'L', '\n', '\017', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\005', ' ', '\001', '(', '\013', '2', +'\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', +'n', 'B', '\010', '\372', 'B', '\005', '\252', '\001', '\002', '*', '\000', 'R', '\016', 'r', 'e', 'q', 'u', 'e', 's', 't', 'T', 'i', 'm', 'e', 'o', +'u', 't', '\022', 'W', '\n', '\023', 'r', 'a', 't', 'e', '_', 'l', 'i', 'm', 'i', 't', '_', 's', 'e', 't', 't', 'i', 'n', 'g', 's', +'\030', '\006', ' ', '\001', '(', '\013', '2', '\'', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', +'e', '.', 'v', '3', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', 'S', 'e', 't', 't', 'i', 'n', 'g', 's', 'R', '\021', 'r', +'a', 't', 'e', 'L', 'i', 'm', 'i', 't', 'S', 'e', 't', 't', 'i', 'n', 'g', 's', '\022', 'A', '\n', '\036', 's', 'e', 't', '_', 'n', +'o', 'd', 'e', '_', 'o', 'n', '_', 'f', 'i', 'r', 's', 't', '_', 'm', 'e', 's', 's', 'a', 'g', 'e', '_', 'o', 'n', 'l', 'y', +'\030', '\007', ' ', '\001', '(', '\010', 'R', '\031', 's', 'e', 't', 'N', 'o', 'd', 'e', 'O', 'n', 'F', 'i', 'r', 's', 't', 'M', 'e', 's', +'s', 'a', 'g', 'e', 'O', 'n', 'l', 'y', '\"', '\222', '\001', '\n', '\007', 'A', 'p', 'i', 'T', 'y', 'p', 'e', '\022', '3', '\n', '%', 'D', +'E', 'P', 'R', 'E', 'C', 'A', 'T', 'E', 'D', '_', 'A', 'N', 'D', '_', 'U', 'N', 'A', 'V', 'A', 'I', 'L', 'A', 'B', 'L', 'E', +'_', 'D', 'O', '_', 'N', 'O', 'T', '_', 'U', 'S', 'E', '\020', '\000', '\032', '\010', '\010', '\001', '\250', '\367', '\264', '\213', '\002', '\001', '\022', '\010', +'\n', '\004', 'R', 'E', 'S', 'T', '\020', '\001', '\022', '\010', '\n', '\004', 'G', 'R', 'P', 'C', '\020', '\002', '\022', '\016', '\n', '\n', 'D', 'E', 'L', +'T', 'A', '_', 'G', 'R', 'P', 'C', '\020', '\003', '\022', '\023', '\n', '\017', 'A', 'G', 'G', 'R', 'E', 'G', 'A', 'T', 'E', 'D', '_', 'G', +'R', 'P', 'C', '\020', '\005', '\022', '\031', '\n', '\025', 'A', 'G', 'G', 'R', 'E', 'G', 'A', 'T', 'E', 'D', '_', 'D', 'E', 'L', 'T', 'A', +'_', 'G', 'R', 'P', 'C', '\020', '\006', ':', '(', '\232', '\305', '\210', '\036', '#', '\n', '!', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', +'.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'A', 'p', 'i', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', '\"', +'I', '\n', '\026', 'A', 'g', 'g', 'r', 'e', 'g', 'a', 't', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', +':', '/', '\232', '\305', '\210', '\036', '*', '\n', '(', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', +'e', '.', 'A', 'g', 'g', 'r', 'e', 'g', 'a', 't', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', '\"', +'\235', '\001', '\n', '\020', 'S', 'e', 'l', 'f', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', '\022', '^', '\n', '\025', 't', +'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 'a', 'p', 'i', '_', 'v', 'e', 'r', 's', 'i', 'o', 'n', '\030', '\001', ' ', '\001', '(', +'\016', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', +'A', 'p', 'i', 'V', 'e', 'r', 's', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\023', 't', 'r', 'a', +'n', 's', 'p', 'o', 'r', 't', 'A', 'p', 'i', 'V', 'e', 'r', 's', 'i', 'o', 'n', ':', ')', '\232', '\305', '\210', '\036', '$', '\n', '\"', +'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'S', 'e', 'l', 'f', 'C', 'o', 'n', +'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', '\"', '\307', '\001', '\n', '\021', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', 'S', 'e', +'t', 't', 'i', 'n', 'g', 's', '\022', ';', '\n', '\n', 'm', 'a', 'x', '_', 't', 'o', 'k', 'e', 'n', 's', '\030', '\001', ' ', '\001', '(', +'\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', +'2', 'V', 'a', 'l', 'u', 'e', 'R', '\t', 'm', 'a', 'x', 'T', 'o', 'k', 'e', 'n', 's', '\022', 'I', '\n', '\t', 'f', 'i', 'l', 'l', +'_', 'r', 'a', 't', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', +'o', 'b', 'u', 'f', '.', 'D', 'o', 'u', 'b', 'l', 'e', 'V', 'a', 'l', 'u', 'e', 'B', '\016', '\372', 'B', '\013', '\022', '\t', '!', '\000', +'\000', '\000', '\000', '\000', '\000', '\000', '\000', 'R', '\010', 'f', 'i', 'l', 'l', 'R', 'a', 't', 'e', ':', '*', '\232', '\305', '\210', '\036', '%', '\n', +'#', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'R', 'a', 't', 'e', 'L', 'i', +'m', 'i', 't', 'S', 'e', 't', 't', 'i', 'n', 'g', 's', '\"', '\247', '\004', '\n', '\014', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', +'r', 'c', 'e', '\022', '8', '\n', '\013', 'a', 'u', 't', 'h', 'o', 'r', 'i', 't', 'i', 'e', 's', '\030', '\007', ' ', '\003', '(', '\013', '2', +'\026', '.', 'x', 'd', 's', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'A', 'u', 't', 'h', 'o', 'r', 'i', 't', 'y', 'R', '\013', +'a', 'u', 't', 'h', 'o', 'r', 'i', 't', 'i', 'e', 's', '\022', '\024', '\n', '\004', 'p', 'a', 't', 'h', '\030', '\001', ' ', '\001', '(', '\t', +'H', '\000', 'R', '\004', 'p', 'a', 't', 'h', '\022', 'S', '\n', '\021', 'a', 'p', 'i', '_', 'c', 'o', 'n', 'f', 'i', 'g', '_', 's', 'o', +'u', 'r', 'c', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '%', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', +'.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'A', 'p', 'i', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', 'H', +'\000', 'R', '\017', 'a', 'p', 'i', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', '\022', '@', '\n', '\003', 'a', 'd', 's', +'\030', '\003', ' ', '\001', '(', '\013', '2', ',', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', +'e', '.', 'v', '3', '.', 'A', 'g', 'g', 'r', 'e', 'g', 'a', 't', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', +'c', 'e', 'H', '\000', 'R', '\003', 'a', 'd', 's', '\022', '<', '\n', '\004', 's', 'e', 'l', 'f', '\030', '\005', ' ', '\001', '(', '\013', '2', '&', +'.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'S', 'e', 'l', +'f', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', 'H', '\000', 'R', '\004', 's', 'e', 'l', 'f', '\022', 'M', '\n', '\025', +'i', 'n', 'i', 't', 'i', 'a', 'l', '_', 'f', 'e', 't', 'c', 'h', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\004', ' ', '\001', +'(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', +'t', 'i', 'o', 'n', 'R', '\023', 'i', 'n', 'i', 't', 'i', 'a', 'l', 'F', 'e', 't', 'c', 'h', 'T', 'i', 'm', 'e', 'o', 'u', 't', +'\022', '\\', '\n', '\024', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', '_', 'a', 'p', 'i', '_', 'v', 'e', 'r', 's', 'i', 'o', 'n', '\030', +'\006', ' ', '\001', '(', '\016', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', +'.', 'v', '3', '.', 'A', 'p', 'i', 'V', 'e', 'r', 's', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', +'\022', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', 'A', 'p', 'i', 'V', 'e', 'r', 's', 'i', 'o', 'n', ':', '%', '\232', '\305', '\210', '\036', +' ', '\n', '\036', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'C', 'o', 'n', 'f', +'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', 'B', '\036', '\n', '\027', 'c', 'o', 'n', 'f', 'i', 'g', '_', 's', 'o', 'u', 'r', 'c', 'e', +'_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', '\001', '*', '.', '\n', '\n', 'A', 'p', 'i', 'V', 'e', 'r', +'s', 'i', 'o', 'n', '\022', '\014', '\n', '\004', 'A', 'U', 'T', 'O', '\020', '\000', '\032', '\002', '\010', '\001', '\022', '\n', '\n', '\002', 'V', '2', '\020', +'\001', '\032', '\002', '\010', '\001', '\022', '\006', '\n', '\002', 'V', '3', '\020', '\002', 'B', 'A', '\n', '\"', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', +'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', +'3', 'B', '\021', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', 'P', 'r', 'o', 't', 'o', 'P', '\001', '\272', '\200', '\310', +'\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; static upb_def_init *deps[9] = { &envoy_config_core_v3_grpc_service_proto_upbdefinit, &google_protobuf_duration_proto_upbdefinit, &google_protobuf_wrappers_proto_upbdefinit, - &udpa_core_v1_authority_proto_upbdefinit, + &xds_core_v3_authority_proto_upbdefinit, &envoy_annotations_deprecation_proto_upbdefinit, &udpa_annotations_status_proto_upbdefinit, &udpa_annotations_versioning_proto_upbdefinit, @@ -139,5 +139,5 @@ upb_def_init envoy_config_core_v3_config_source_proto_upbdefinit = { deps, layouts, "envoy/config/core/v3/config_source.proto", - UPB_STRVIEW_INIT(descriptor, 2232) + UPB_STRVIEW_INIT(descriptor, 2238) }; diff --git a/grpc/src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.c b/grpc/src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.c index 39924f80..469acd3f 100644 --- a/grpc/src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.c +++ b/grpc/src/core/ext/upbdefs-generated/envoy/config/core/v3/health_check.upbdefs.c @@ -18,7 +18,6 @@ extern upb_def_init google_protobuf_any_proto_upbdefinit; extern upb_def_init google_protobuf_duration_proto_upbdefinit; extern upb_def_init google_protobuf_struct_proto_upbdefinit; extern upb_def_init google_protobuf_wrappers_proto_upbdefinit; -extern upb_def_init envoy_annotations_deprecation_proto_upbdefinit; extern upb_def_init udpa_annotations_status_proto_upbdefinit; extern upb_def_init udpa_annotations_versioning_proto_upbdefinit; extern upb_def_init validate_validate_proto_upbdefinit; @@ -42,7 +41,7 @@ static const upb_msglayout *layouts[8] = { &envoy_config_core_v3_HealthCheck_TlsOptions_msginit, }; -static const char descriptor[4084] = {'\n', '\'', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'h', 'e', +static const char descriptor[4147] = {'\n', '\'', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'h', 'e', 'a', 'l', 't', 'h', '_', 'c', 'h', 'e', 'c', 'k', '.', 'p', 'r', 'o', 't', 'o', '\022', '\024', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '\032', '\037', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'b', 'a', 's', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', '/', 'e', 'n', @@ -56,159 +55,161 @@ static const char descriptor[4084] = {'\n', '\'', 'e', 'n', 'v', 'o', 'y', '/', 'b', 'u', 'f', '/', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\032', '\034', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 's', 't', 'r', 'u', 'c', 't', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'w', 'r', 'a', 'p', 'p', 'e', 'r', 's', '.', -'p', 'r', 'o', 't', 'o', '\032', '#', 'e', 'n', 'v', 'o', 'y', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', -'d', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', -'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '!', -'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', -'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', -'t', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '\342', '\032', '\n', '\013', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '\022', -'?', '\n', '\007', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\001', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', -'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\n', '\372', 'B', '\007', '\252', '\001', -'\004', '\010', '\001', '*', '\000', 'R', '\007', 't', 'i', 'm', 'e', 'o', 'u', 't', '\022', 'A', '\n', '\010', 'i', 'n', 't', 'e', 'r', 'v', 'a', -'l', '\030', '\002', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', -'.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\n', '\372', 'B', '\007', '\252', '\001', '\004', '\010', '\001', '*', '\000', 'R', '\010', 'i', 'n', -'t', 'e', 'r', 'v', 'a', 'l', '\022', '@', '\n', '\016', 'i', 'n', 'i', 't', 'i', 'a', 'l', '_', 'j', 'i', 't', 't', 'e', 'r', '\030', -'\024', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', -'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\r', 'i', 'n', 'i', 't', 'i', 'a', 'l', 'J', 'i', 't', 't', 'e', 'r', '\022', 'B', '\n', -'\017', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '_', 'j', 'i', 't', 't', 'e', 'r', '\030', '\003', ' ', '\001', '(', '\013', '2', '\031', '.', -'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', -'\016', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', 'J', 'i', 't', 't', 'e', 'r', '\022', '6', '\n', '\027', 'i', 'n', 't', 'e', 'r', 'v', -'a', 'l', '_', 'j', 'i', 't', 't', 'e', 'r', '_', 'p', 'e', 'r', 'c', 'e', 'n', 't', '\030', '\022', ' ', '\001', '(', '\r', 'R', '\025', -'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', 'J', 'i', 't', 't', 'e', 'r', 'P', 'e', 'r', 'c', 'e', 'n', 't', '\022', 'W', '\n', '\023', -'u', 'n', 'h', 'e', 'a', 'l', 't', 'h', 'y', '_', 't', 'h', 'r', 'e', 's', 'h', 'o', 'l', 'd', '\030', '\004', ' ', '\001', '(', '\013', +'p', 'r', 'o', 't', 'o', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', +'t', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', +'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', +'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '\306', '\033', '\n', +'\013', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '\022', '?', '\n', '\007', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\001', +' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', +'r', 'a', 't', 'i', 'o', 'n', 'B', '\n', '\372', 'B', '\007', '\252', '\001', '\004', '\010', '\001', '*', '\000', 'R', '\007', 't', 'i', 'm', 'e', 'o', +'u', 't', '\022', 'A', '\n', '\010', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\030', '\002', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', +'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\n', '\372', +'B', '\007', '\252', '\001', '\004', '\010', '\001', '*', '\000', 'R', '\010', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\022', '@', '\n', '\016', 'i', 'n', +'i', 't', 'i', 'a', 'l', '_', 'j', 'i', 't', 't', 'e', 'r', '\030', '\024', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', +'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\r', 'i', 'n', 'i', +'t', 'i', 'a', 'l', 'J', 'i', 't', 't', 'e', 'r', '\022', 'B', '\n', '\017', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '_', 'j', 'i', +'t', 't', 'e', 'r', '\030', '\003', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', +'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\016', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', 'J', 'i', 't', +'t', 'e', 'r', '\022', '6', '\n', '\027', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '_', 'j', 'i', 't', 't', 'e', 'r', '_', 'p', 'e', +'r', 'c', 'e', 'n', 't', '\030', '\022', ' ', '\001', '(', '\r', 'R', '\025', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', 'J', 'i', 't', 't', +'e', 'r', 'P', 'e', 'r', 'c', 'e', 'n', 't', '\022', 'W', '\n', '\023', 'u', 'n', 'h', 'e', 'a', 'l', 't', 'h', 'y', '_', 't', 'h', +'r', 'e', 's', 'h', 'o', 'l', 'd', '\030', '\004', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', +'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\010', '\372', 'B', '\005', '\212', '\001', +'\002', '\020', '\001', 'R', '\022', 'u', 'n', 'h', 'e', 'a', 'l', 't', 'h', 'y', 'T', 'h', 'r', 'e', 's', 'h', 'o', 'l', 'd', '\022', 'S', +'\n', '\021', 'h', 'e', 'a', 'l', 't', 'h', 'y', '_', 't', 'h', 'r', 'e', 's', 'h', 'o', 'l', 'd', '\030', '\005', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', -'V', 'a', 'l', 'u', 'e', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\022', 'u', 'n', 'h', 'e', 'a', 'l', 't', 'h', -'y', 'T', 'h', 'r', 'e', 's', 'h', 'o', 'l', 'd', '\022', 'S', '\n', '\021', 'h', 'e', 'a', 'l', 't', 'h', 'y', '_', 't', 'h', 'r', -'e', 's', 'h', 'o', 'l', 'd', '\030', '\005', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', -'t', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', -'\020', '\001', 'R', '\020', 'h', 'e', 'a', 'l', 't', 'h', 'y', 'T', 'h', 'r', 'e', 's', 'h', 'o', 'l', 'd', '\022', '7', '\n', '\010', 'a', -'l', 't', '_', 'p', 'o', 'r', 't', '\030', '\006', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', -'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\007', 'a', 'l', 't', 'P', 'o', -'r', 't', '\022', 'E', '\n', '\020', 'r', 'e', 'u', 's', 'e', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '\030', '\007', ' ', -'\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', -'l', 'V', 'a', 'l', 'u', 'e', 'R', '\017', 'r', 'e', 'u', 's', 'e', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '\022', '_', -'\n', '\021', 'h', 't', 't', 'p', '_', 'h', 'e', 'a', 'l', 't', 'h', '_', 'c', 'h', 'e', 'c', 'k', '\030', '\010', ' ', '\001', '(', '\013', -'2', '1', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', -'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '.', 'H', 't', 't', 'p', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', -'k', 'H', '\000', 'R', '\017', 'h', 't', 't', 'p', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '\022', '\\', '\n', '\020', 't', -'c', 'p', '_', 'h', 'e', 'a', 'l', 't', 'h', '_', 'c', 'h', 'e', 'c', 'k', '\030', '\t', ' ', '\001', '(', '\013', '2', '0', '.', 'e', -'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'l', 't', -'h', 'C', 'h', 'e', 'c', 'k', '.', 'T', 'c', 'p', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', 'H', '\000', 'R', '\016', -'t', 'c', 'p', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '\022', '_', '\n', '\021', 'g', 'r', 'p', 'c', '_', 'h', 'e', -'a', 'l', 't', 'h', '_', 'c', 'h', 'e', 'c', 'k', '\030', '\013', ' ', '\001', '(', '\013', '2', '1', '.', 'e', 'n', 'v', 'o', 'y', '.', +'V', 'a', 'l', 'u', 'e', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\020', 'h', 'e', 'a', 'l', 't', 'h', 'y', 'T', +'h', 'r', 'e', 's', 'h', 'o', 'l', 'd', '\022', '7', '\n', '\010', 'a', 'l', 't', '_', 'p', 'o', 'r', 't', '\030', '\006', ' ', '\001', '(', +'\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', +'2', 'V', 'a', 'l', 'u', 'e', 'R', '\007', 'a', 'l', 't', 'P', 'o', 'r', 't', '\022', 'E', '\n', '\020', 'r', 'e', 'u', 's', 'e', '_', +'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '\030', '\007', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', +'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\017', 'r', 'e', 'u', 's', +'e', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '\022', '_', '\n', '\021', 'h', 't', 't', 'p', '_', 'h', 'e', 'a', 'l', 't', +'h', '_', 'c', 'h', 'e', 'c', 'k', '\030', '\010', ' ', '\001', '(', '\013', '2', '1', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', +'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '.', 'H', +'t', 't', 'p', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', 'H', '\000', 'R', '\017', 'h', 't', 't', 'p', 'H', 'e', 'a', +'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '\022', '\\', '\n', '\020', 't', 'c', 'p', '_', 'h', 'e', 'a', 'l', 't', 'h', '_', 'c', 'h', +'e', 'c', 'k', '\030', '\t', ' ', '\001', '(', '\013', '2', '0', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', +'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '.', 'T', 'c', 'p', 'H', 'e', +'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', 'H', '\000', 'R', '\016', 't', 'c', 'p', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', +'c', 'k', '\022', '_', '\n', '\021', 'g', 'r', 'p', 'c', '_', 'h', 'e', 'a', 'l', 't', 'h', '_', 'c', 'h', 'e', 'c', 'k', '\030', '\013', +' ', '\001', '(', '\013', '2', '1', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', +'v', '3', '.', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '.', 'G', 'r', 'p', 'c', 'H', 'e', 'a', 'l', 't', 'h', +'C', 'h', 'e', 'c', 'k', 'H', '\000', 'R', '\017', 'g', 'r', 'p', 'c', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '\022', +'e', '\n', '\023', 'c', 'u', 's', 't', 'o', 'm', '_', 'h', 'e', 'a', 'l', 't', 'h', '_', 'c', 'h', 'e', 'c', 'k', '\030', '\r', ' ', +'\001', '(', '\013', '2', '3', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', +'3', '.', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '.', 'C', 'u', 's', 't', 'o', 'm', 'H', 'e', 'a', 'l', 't', +'h', 'C', 'h', 'e', 'c', 'k', 'H', '\000', 'R', '\021', 'c', 'u', 's', 't', 'o', 'm', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', +'c', 'k', '\022', 'S', '\n', '\023', 'n', 'o', '_', 't', 'r', 'a', 'f', 'f', 'i', 'c', '_', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', +'\030', '\014', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', +'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\252', '\001', '\002', '*', '\000', 'R', '\021', 'n', 'o', 'T', 'r', 'a', +'f', 'f', 'i', 'c', 'I', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\022', 'b', '\n', '\033', 'n', 'o', '_', 't', 'r', 'a', 'f', 'f', 'i', +'c', '_', 'h', 'e', 'a', 'l', 't', 'h', 'y', '_', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\030', '\030', ' ', '\001', '(', '\013', '2', +'\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', +'n', 'B', '\010', '\372', 'B', '\005', '\252', '\001', '\002', '*', '\000', 'R', '\030', 'n', 'o', 'T', 'r', 'a', 'f', 'f', 'i', 'c', 'H', 'e', 'a', +'l', 't', 'h', 'y', 'I', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\022', 'R', '\n', '\022', 'u', 'n', 'h', 'e', 'a', 'l', 't', 'h', 'y', +'_', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\030', '\016', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', +'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\252', '\001', '\002', +'*', '\000', 'R', '\021', 'u', 'n', 'h', 'e', 'a', 'l', 't', 'h', 'y', 'I', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\022', '[', '\n', '\027', +'u', 'n', 'h', 'e', 'a', 'l', 't', 'h', 'y', '_', 'e', 'd', 'g', 'e', '_', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\030', '\017', +' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', +'r', 'a', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\252', '\001', '\002', '*', '\000', 'R', '\025', 'u', 'n', 'h', 'e', 'a', 'l', 't', +'h', 'y', 'E', 'd', 'g', 'e', 'I', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\022', 'W', '\n', '\025', 'h', 'e', 'a', 'l', 't', 'h', 'y', +'_', 'e', 'd', 'g', 'e', '_', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\030', '\020', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', +'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\010', '\372', +'B', '\005', '\252', '\001', '\002', '*', '\000', 'R', '\023', 'h', 'e', 'a', 'l', 't', 'h', 'y', 'E', 'd', 'g', 'e', 'I', 'n', 't', 'e', 'r', +'v', 'a', 'l', '\022', '$', '\n', '\016', 'e', 'v', 'e', 'n', 't', '_', 'l', 'o', 'g', '_', 'p', 'a', 't', 'h', '\030', '\021', ' ', '\001', +'(', '\t', 'R', '\014', 'e', 'v', 'e', 'n', 't', 'L', 'o', 'g', 'P', 'a', 't', 'h', '\022', 'M', '\n', '\r', 'e', 'v', 'e', 'n', 't', +'_', 's', 'e', 'r', 'v', 'i', 'c', 'e', '\030', '\026', ' ', '\001', '(', '\013', '2', '(', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', +'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'E', 'v', 'e', 'n', 't', 'S', 'e', 'r', 'v', 'i', 'c', 'e', +'C', 'o', 'n', 'f', 'i', 'g', 'R', '\014', 'e', 'v', 'e', 'n', 't', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '\022', 'F', '\n', ' ', 'a', +'l', 'w', 'a', 'y', 's', '_', 'l', 'o', 'g', '_', 'h', 'e', 'a', 'l', 't', 'h', '_', 'c', 'h', 'e', 'c', 'k', '_', 'f', 'a', +'i', 'l', 'u', 'r', 'e', 's', '\030', '\023', ' ', '\001', '(', '\010', 'R', '\034', 'a', 'l', 'w', 'a', 'y', 's', 'L', 'o', 'g', 'H', 'e', +'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', 'F', 'a', 'i', 'l', 'u', 'r', 'e', 's', '\022', 'M', '\n', '\013', 't', 'l', 's', '_', +'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\025', ' ', '\001', '(', '\013', '2', ',', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', +'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '.', 'T', +'l', 's', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\n', 't', 'l', 's', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '^', '\n', '\037', +'t', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', '_', 'm', 'a', 't', 'c', 'h', '_', 'c', 'r', +'i', 't', 'e', 'r', 'i', 'a', '\030', '\027', ' ', '\001', '(', '\013', '2', '\027', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', +'t', 'o', 'b', 'u', 'f', '.', 'S', 't', 'r', 'u', 'c', 't', 'R', '\034', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', 'S', 'o', +'c', 'k', 'e', 't', 'M', 'a', 't', 'c', 'h', 'C', 'r', 'i', 't', 'e', 'r', 'i', 'a', '\032', '\200', '\001', '\n', '\007', 'P', 'a', 'y', +'l', 'o', 'a', 'd', '\022', '\035', '\n', '\004', 't', 'e', 'x', 't', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', +'\020', '\001', 'H', '\000', 'R', '\004', 't', 'e', 'x', 't', '\022', '\030', '\n', '\006', 'b', 'i', 'n', 'a', 'r', 'y', '\030', '\002', ' ', '\001', '(', +'\014', 'H', '\000', 'R', '\006', 'b', 'i', 'n', 'a', 'r', 'y', ':', ',', '\232', '\305', '\210', '\036', '\'', '\n', '%', 'e', 'n', 'v', 'o', 'y', +'.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '.', +'P', 'a', 'y', 'l', 'o', 'a', 'd', 'B', '\016', '\n', '\007', 'p', 'a', 'y', 'l', 'o', 'a', 'd', '\022', '\003', '\370', 'B', '\001', '\032', '\340', +'\005', '\n', '\017', 'H', 't', 't', 'p', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '\022', '\037', '\n', '\004', 'h', 'o', 's', +'t', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\013', '\372', 'B', '\010', 'r', '\006', '\300', '\001', '\002', '\310', '\001', '\000', 'R', '\004', 'h', 'o', 's', +'t', '\022', '!', '\n', '\004', 'p', 'a', 't', 'h', '\030', '\002', ' ', '\001', '(', '\t', 'B', '\r', '\372', 'B', '\n', 'r', '\010', '\020', '\001', '\300', +'\001', '\002', '\310', '\001', '\000', 'R', '\004', 'p', 'a', 't', 'h', '\022', '=', '\n', '\004', 's', 'e', 'n', 'd', '\030', '\003', ' ', '\001', '(', '\013', +'2', ')', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', +'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '.', 'P', 'a', 'y', 'l', 'o', 'a', 'd', 'R', '\004', 's', 'e', 'n', 'd', '\022', +'C', '\n', '\007', 'r', 'e', 'c', 'e', 'i', 'v', 'e', '\030', '\004', ' ', '\001', '(', '\013', '2', ')', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', -'k', '.', 'G', 'r', 'p', 'c', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', 'H', '\000', 'R', '\017', 'g', 'r', 'p', 'c', -'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '\022', 'e', '\n', '\023', 'c', 'u', 's', 't', 'o', 'm', '_', 'h', 'e', 'a', -'l', 't', 'h', '_', 'c', 'h', 'e', 'c', 'k', '\030', '\r', ' ', '\001', '(', '\013', '2', '3', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', -'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', -'.', 'C', 'u', 's', 't', 'o', 'm', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', 'H', '\000', 'R', '\021', 'c', 'u', 's', -'t', 'o', 'm', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '\022', 'S', '\n', '\023', 'n', 'o', '_', 't', 'r', 'a', 'f', -'f', 'i', 'c', '_', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\030', '\014', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', -'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', -'\252', '\001', '\002', '*', '\000', 'R', '\021', 'n', 'o', 'T', 'r', 'a', 'f', 'f', 'i', 'c', 'I', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\022', -'R', '\n', '\022', 'u', 'n', 'h', 'e', 'a', 'l', 't', 'h', 'y', '_', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\030', '\016', ' ', '\001', -'(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', -'t', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\252', '\001', '\002', '*', '\000', 'R', '\021', 'u', 'n', 'h', 'e', 'a', 'l', 't', 'h', 'y', -'I', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\022', '[', '\n', '\027', 'u', 'n', 'h', 'e', 'a', 'l', 't', 'h', 'y', '_', 'e', 'd', 'g', -'e', '_', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\030', '\017', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', -'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\252', '\001', -'\002', '*', '\000', 'R', '\025', 'u', 'n', 'h', 'e', 'a', 'l', 't', 'h', 'y', 'E', 'd', 'g', 'e', 'I', 'n', 't', 'e', 'r', 'v', 'a', -'l', '\022', 'W', '\n', '\025', 'h', 'e', 'a', 'l', 't', 'h', 'y', '_', 'e', 'd', 'g', 'e', '_', 'i', 'n', 't', 'e', 'r', 'v', 'a', -'l', '\030', '\020', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', -'.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\252', '\001', '\002', '*', '\000', 'R', '\023', 'h', 'e', 'a', 'l', -'t', 'h', 'y', 'E', 'd', 'g', 'e', 'I', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\022', '$', '\n', '\016', 'e', 'v', 'e', 'n', 't', '_', -'l', 'o', 'g', '_', 'p', 'a', 't', 'h', '\030', '\021', ' ', '\001', '(', '\t', 'R', '\014', 'e', 'v', 'e', 'n', 't', 'L', 'o', 'g', 'P', -'a', 't', 'h', '\022', 'M', '\n', '\r', 'e', 'v', 'e', 'n', 't', '_', 's', 'e', 'r', 'v', 'i', 'c', 'e', '\030', '\026', ' ', '\001', '(', -'\013', '2', '(', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', -'E', 'v', 'e', 'n', 't', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\014', 'e', 'v', 'e', 'n', 't', -'S', 'e', 'r', 'v', 'i', 'c', 'e', '\022', 'F', '\n', ' ', 'a', 'l', 'w', 'a', 'y', 's', '_', 'l', 'o', 'g', '_', 'h', 'e', 'a', -'l', 't', 'h', '_', 'c', 'h', 'e', 'c', 'k', '_', 'f', 'a', 'i', 'l', 'u', 'r', 'e', 's', '\030', '\023', ' ', '\001', '(', '\010', 'R', -'\034', 'a', 'l', 'w', 'a', 'y', 's', 'L', 'o', 'g', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', 'F', 'a', 'i', 'l', -'u', 'r', 'e', 's', '\022', 'M', '\n', '\013', 't', 'l', 's', '_', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\025', ' ', '\001', '(', '\013', -'2', ',', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', -'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '.', 'T', 'l', 's', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\n', 't', 'l', -'s', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '^', '\n', '\037', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', -'k', 'e', 't', '_', 'm', 'a', 't', 'c', 'h', '_', 'c', 'r', 'i', 't', 'e', 'r', 'i', 'a', '\030', '\027', ' ', '\001', '(', '\013', '2', -'\027', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 't', 'r', 'u', 'c', 't', 'R', -'\034', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', 'S', 'o', 'c', 'k', 'e', 't', 'M', 'a', 't', 'c', 'h', 'C', 'r', 'i', 't', -'e', 'r', 'i', 'a', '\032', '\200', '\001', '\n', '\007', 'P', 'a', 'y', 'l', 'o', 'a', 'd', '\022', '\035', '\n', '\004', 't', 'e', 'x', 't', '\030', -'\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'H', '\000', 'R', '\004', 't', 'e', 'x', 't', '\022', '\030', '\n', -'\006', 'b', 'i', 'n', 'a', 'r', 'y', '\030', '\002', ' ', '\001', '(', '\014', 'H', '\000', 'R', '\006', 'b', 'i', 'n', 'a', 'r', 'y', ':', ',', -'\232', '\305', '\210', '\036', '\'', '\n', '%', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', -'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '.', 'P', 'a', 'y', 'l', 'o', 'a', 'd', 'B', '\016', '\n', '\007', 'p', 'a', -'y', 'l', 'o', 'a', 'd', '\022', '\003', '\370', 'B', '\001', '\032', '\340', '\005', '\n', '\017', 'H', 't', 't', 'p', 'H', 'e', 'a', 'l', 't', 'h', -'C', 'h', 'e', 'c', 'k', '\022', '\037', '\n', '\004', 'h', 'o', 's', 't', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\013', '\372', 'B', '\010', 'r', -'\006', '\300', '\001', '\002', '\310', '\001', '\000', 'R', '\004', 'h', 'o', 's', 't', '\022', '!', '\n', '\004', 'p', 'a', 't', 'h', '\030', '\002', ' ', '\001', -'(', '\t', 'B', '\r', '\372', 'B', '\n', 'r', '\010', '\020', '\001', '\300', '\001', '\002', '\310', '\001', '\000', 'R', '\004', 'p', 'a', 't', 'h', '\022', '=', -'\n', '\004', 's', 'e', 'n', 'd', '\030', '\003', ' ', '\001', '(', '\013', '2', ')', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', -'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '.', 'P', 'a', -'y', 'l', 'o', 'a', 'd', 'R', '\004', 's', 'e', 'n', 'd', '\022', 'C', '\n', '\007', 'r', 'e', 'c', 'e', 'i', 'v', 'e', '\030', '\004', ' ', -'\001', '(', '\013', '2', ')', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', -'3', '.', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '.', 'P', 'a', 'y', 'l', 'o', 'a', 'd', 'R', '\007', 'r', 'e', -'c', 'e', 'i', 'v', 'e', '\022', 'g', '\n', '\026', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '_', -'t', 'o', '_', 'a', 'd', 'd', '\030', '\006', ' ', '\003', '(', '\013', '2', '\'', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', -'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'O', 'p', 't', -'i', 'o', 'n', 'B', '\t', '\372', 'B', '\006', '\222', '\001', '\003', '\020', '\350', '\007', 'R', '\023', 'r', 'e', 'q', 'u', 'e', 's', 't', 'H', 'e', -'a', 'd', 'e', 'r', 's', 'T', 'o', 'A', 'd', 'd', '\022', 'K', '\n', '\031', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'h', 'e', 'a', -'d', 'e', 'r', 's', '_', 't', 'o', '_', 'r', 'e', 'm', 'o', 'v', 'e', '\030', '\010', ' ', '\003', '(', '\t', 'B', '\020', '\372', 'B', '\r', -'\222', '\001', '\n', '\"', '\010', 'r', '\006', '\300', '\001', '\001', '\310', '\001', '\000', 'R', '\026', 'r', 'e', 'q', 'u', 'e', 's', 't', 'H', 'e', 'a', -'d', 'e', 'r', 's', 'T', 'o', 'R', 'e', 'm', 'o', 'v', 'e', '\022', 'F', '\n', '\021', 'e', 'x', 'p', 'e', 'c', 't', 'e', 'd', '_', -'s', 't', 'a', 't', 'u', 's', 'e', 's', '\030', '\t', ' ', '\003', '(', '\013', '2', '\031', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', -'p', 'e', '.', 'v', '3', '.', 'I', 'n', 't', '6', '4', 'R', 'a', 'n', 'g', 'e', 'R', '\020', 'e', 'x', 'p', 'e', 'c', 't', 'e', -'d', 'S', 't', 'a', 't', 'u', 's', 'e', 's', '\022', 'T', '\n', '\021', 'c', 'o', 'd', 'e', 'c', '_', 'c', 'l', 'i', 'e', 'n', 't', -'_', 't', 'y', 'p', 'e', '\030', '\n', ' ', '\001', '(', '\016', '2', '\036', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', -'v', '3', '.', 'C', 'o', 'd', 'e', 'c', 'C', 'l', 'i', 'e', 'n', 't', 'T', 'y', 'p', 'e', 'B', '\010', '\372', 'B', '\005', '\202', '\001', -'\002', '\020', '\001', 'R', '\017', 'c', 'o', 'd', 'e', 'c', 'C', 'l', 'i', 'e', 'n', 't', 'T', 'y', 'p', 'e', '\022', 'V', '\n', '\024', 's', -'e', 'r', 'v', 'i', 'c', 'e', '_', 'n', 'a', 'm', 'e', '_', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\030', '\013', ' ', '\001', '(', '\013', -'2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', -'S', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'R', '\022', 's', 'e', 'r', 'v', 'i', 'c', 'e', 'N', 'a', 'm', -'e', 'M', 'a', 't', 'c', 'h', 'e', 'r', ':', '4', '\232', '\305', '\210', '\036', '/', '\n', '-', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', -'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '.', 'H', 't', 't', -'p', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', 'J', '\004', '\010', '\005', '\020', '\006', 'J', '\004', '\010', '\007', '\020', '\010', 'R', -'\014', 's', 'e', 'r', 'v', 'i', 'c', 'e', '_', 'n', 'a', 'm', 'e', 'R', '\t', 'u', 's', 'e', '_', 'h', 't', 't', 'p', '2', '\032', -'\311', '\001', '\n', '\016', 'T', 'c', 'p', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '\022', '=', '\n', '\004', 's', 'e', 'n', -'d', '\030', '\001', ' ', '\001', '(', '\013', '2', ')', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', -'r', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '.', 'P', 'a', 'y', 'l', 'o', 'a', 'd', -'R', '\004', 's', 'e', 'n', 'd', '\022', 'C', '\n', '\007', 'r', 'e', 'c', 'e', 'i', 'v', 'e', '\030', '\002', ' ', '\003', '(', '\013', '2', ')', -'.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', -'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '.', 'P', 'a', 'y', 'l', 'o', 'a', 'd', 'R', '\007', 'r', 'e', 'c', 'e', 'i', 'v', 'e', -':', '3', '\232', '\305', '\210', '\036', '.', '\n', ',', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', -'e', '.', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '.', 'T', 'c', 'p', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', -'e', 'c', 'k', '\032', '[', '\n', '\020', 'R', 'e', 'd', 'i', 's', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '\022', '\020', -'\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\003', 'k', 'e', 'y', ':', '5', '\232', '\305', '\210', '\036', '0', '\n', '.', -'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'H', 'e', 'a', 'l', 't', 'h', 'C', -'h', 'e', 'c', 'k', '.', 'R', 'e', 'd', 'i', 's', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '\032', '\225', '\001', '\n', -'\017', 'G', 'r', 'p', 'c', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '\022', '!', '\n', '\014', 's', 'e', 'r', 'v', 'i', -'c', 'e', '_', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\013', 's', 'e', 'r', 'v', 'i', 'c', 'e', 'N', 'a', 'm', -'e', '\022', ')', '\n', '\t', 'a', 'u', 't', 'h', 'o', 'r', 'i', 't', 'y', '\030', '\002', ' ', '\001', '(', '\t', 'B', '\013', '\372', 'B', '\010', -'r', '\006', '\300', '\001', '\002', '\310', '\001', '\000', 'R', '\t', 'a', 'u', 't', 'h', 'o', 'r', 'i', 't', 'y', ':', '4', '\232', '\305', '\210', '\036', -'/', '\n', '-', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'H', 'e', 'a', 'l', -'t', 'h', 'C', 'h', 'e', 'c', 'k', '.', 'G', 'r', 'p', 'c', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '\032', '\300', -'\001', '\n', '\021', 'C', 'u', 's', 't', 'o', 'm', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '\022', '\033', '\n', '\004', 'n', -'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', 'm', 'e', '\022', -'9', '\n', '\014', 't', 'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\003', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', -'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'H', '\000', 'R', '\013', 't', 'y', 'p', -'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', ':', '6', '\232', '\305', '\210', '\036', '1', '\n', '/', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', -'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '.', 'C', 'u', 's', -'t', 'o', 'm', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', 'B', '\r', '\n', '\013', 'c', 'o', 'n', 'f', 'i', 'g', '_', -'t', 'y', 'p', 'e', 'J', '\004', '\010', '\002', '\020', '\003', 'R', '\006', 'c', 'o', 'n', 'f', 'i', 'g', '\032', 'd', '\n', '\n', 'T', 'l', 's', -'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '%', '\n', '\016', 'a', 'l', 'p', 'n', '_', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', 's', -'\030', '\001', ' ', '\003', '(', '\t', 'R', '\r', 'a', 'l', 'p', 'n', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 's', ':', '/', '\232', '\305', -'\210', '\036', '*', '\n', '(', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'H', 'e', -'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '.', 'T', 'l', 's', 'O', 'p', 't', 'i', 'o', 'n', 's', ':', '$', '\232', '\305', '\210', -'\036', '\037', '\n', '\035', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'H', 'e', 'a', -'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', 'B', '\025', '\n', '\016', 'h', 'e', 'a', 'l', 't', 'h', '_', 'c', 'h', 'e', 'c', 'k', 'e', -'r', '\022', '\003', '\370', 'B', '\001', 'J', '\004', '\010', '\n', '\020', '\013', '*', '`', '\n', '\014', 'H', 'e', 'a', 'l', 't', 'h', 'S', 't', 'a', -'t', 'u', 's', '\022', '\013', '\n', '\007', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\013', '\n', '\007', 'H', 'E', 'A', 'L', 'T', -'H', 'Y', '\020', '\001', '\022', '\r', '\n', '\t', 'U', 'N', 'H', 'E', 'A', 'L', 'T', 'H', 'Y', '\020', '\002', '\022', '\014', '\n', '\010', 'D', 'R', -'A', 'I', 'N', 'I', 'N', 'G', '\020', '\003', '\022', '\013', '\n', '\007', 'T', 'I', 'M', 'E', 'O', 'U', 'T', '\020', '\004', '\022', '\014', '\n', '\010', -'D', 'E', 'G', 'R', 'A', 'D', 'E', 'D', '\020', '\005', 'B', '@', '\n', '\"', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', -'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', 'B', '\020', -'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', 'P', 'r', 'o', 't', 'o', 'P', '\001', '\272', '\200', '\310', '\321', '\006', '\002', '\020', -'\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +'k', '.', 'P', 'a', 'y', 'l', 'o', 'a', 'd', 'R', '\007', 'r', 'e', 'c', 'e', 'i', 'v', 'e', '\022', 'g', '\n', '\026', 'r', 'e', 'q', +'u', 'e', 's', 't', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '_', 't', 'o', '_', 'a', 'd', 'd', '\030', '\006', ' ', '\003', '(', '\013', +'2', '\'', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', +'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'O', 'p', 't', 'i', 'o', 'n', 'B', '\t', '\372', 'B', '\006', '\222', '\001', '\003', '\020', +'\350', '\007', 'R', '\023', 'r', 'e', 'q', 'u', 'e', 's', 't', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'T', 'o', 'A', 'd', 'd', '\022', 'K', +'\n', '\031', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '_', 't', 'o', '_', 'r', 'e', 'm', 'o', +'v', 'e', '\030', '\010', ' ', '\003', '(', '\t', 'B', '\020', '\372', 'B', '\r', '\222', '\001', '\n', '\"', '\010', 'r', '\006', '\300', '\001', '\001', '\310', '\001', +'\000', 'R', '\026', 'r', 'e', 'q', 'u', 'e', 's', 't', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'T', 'o', 'R', 'e', 'm', 'o', 'v', 'e', +'\022', 'F', '\n', '\021', 'e', 'x', 'p', 'e', 'c', 't', 'e', 'd', '_', 's', 't', 'a', 't', 'u', 's', 'e', 's', '\030', '\t', ' ', '\003', +'(', '\013', '2', '\031', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'I', 'n', 't', '6', '4', 'R', +'a', 'n', 'g', 'e', 'R', '\020', 'e', 'x', 'p', 'e', 'c', 't', 'e', 'd', 'S', 't', 'a', 't', 'u', 's', 'e', 's', '\022', 'T', '\n', +'\021', 'c', 'o', 'd', 'e', 'c', '_', 'c', 'l', 'i', 'e', 'n', 't', '_', 't', 'y', 'p', 'e', '\030', '\n', ' ', '\001', '(', '\016', '2', +'\036', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'C', 'o', 'd', 'e', 'c', 'C', 'l', 'i', 'e', +'n', 't', 'T', 'y', 'p', 'e', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\017', 'c', 'o', 'd', 'e', 'c', 'C', 'l', +'i', 'e', 'n', 't', 'T', 'y', 'p', 'e', '\022', 'V', '\n', '\024', 's', 'e', 'r', 'v', 'i', 'c', 'e', '_', 'n', 'a', 'm', 'e', '_', +'m', 'a', 't', 'c', 'h', 'e', 'r', '\030', '\013', ' ', '\001', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', +'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'S', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', 'e', +'r', 'R', '\022', 's', 'e', 'r', 'v', 'i', 'c', 'e', 'N', 'a', 'm', 'e', 'M', 'a', 't', 'c', 'h', 'e', 'r', ':', '4', '\232', '\305', +'\210', '\036', '/', '\n', '-', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'H', 'e', +'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '.', 'H', 't', 't', 'p', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', +'J', '\004', '\010', '\005', '\020', '\006', 'J', '\004', '\010', '\007', '\020', '\010', 'R', '\014', 's', 'e', 'r', 'v', 'i', 'c', 'e', '_', 'n', 'a', 'm', +'e', 'R', '\t', 'u', 's', 'e', '_', 'h', 't', 't', 'p', '2', '\032', '\311', '\001', '\n', '\016', 'T', 'c', 'p', 'H', 'e', 'a', 'l', 't', +'h', 'C', 'h', 'e', 'c', 'k', '\022', '=', '\n', '\004', 's', 'e', 'n', 'd', '\030', '\001', ' ', '\001', '(', '\013', '2', ')', '.', 'e', 'n', +'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'l', 't', 'h', +'C', 'h', 'e', 'c', 'k', '.', 'P', 'a', 'y', 'l', 'o', 'a', 'd', 'R', '\004', 's', 'e', 'n', 'd', '\022', 'C', '\n', '\007', 'r', 'e', +'c', 'e', 'i', 'v', 'e', '\030', '\002', ' ', '\003', '(', '\013', '2', ')', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', +'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '.', 'P', 'a', 'y', +'l', 'o', 'a', 'd', 'R', '\007', 'r', 'e', 'c', 'e', 'i', 'v', 'e', ':', '3', '\232', '\305', '\210', '\036', '.', '\n', ',', 'e', 'n', 'v', +'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', +'k', '.', 'T', 'c', 'p', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '\032', '[', '\n', '\020', 'R', 'e', 'd', 'i', 's', +'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '\022', '\020', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'R', +'\003', 'k', 'e', 'y', ':', '5', '\232', '\305', '\210', '\036', '0', '\n', '.', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', +'.', 'c', 'o', 'r', 'e', '.', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '.', 'R', 'e', 'd', 'i', 's', 'H', 'e', +'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '\032', '\225', '\001', '\n', '\017', 'G', 'r', 'p', 'c', 'H', 'e', 'a', 'l', 't', 'h', 'C', +'h', 'e', 'c', 'k', '\022', '!', '\n', '\014', 's', 'e', 'r', 'v', 'i', 'c', 'e', '_', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', +'\t', 'R', '\013', 's', 'e', 'r', 'v', 'i', 'c', 'e', 'N', 'a', 'm', 'e', '\022', ')', '\n', '\t', 'a', 'u', 't', 'h', 'o', 'r', 'i', +'t', 'y', '\030', '\002', ' ', '\001', '(', '\t', 'B', '\013', '\372', 'B', '\010', 'r', '\006', '\300', '\001', '\002', '\310', '\001', '\000', 'R', '\t', 'a', 'u', +'t', 'h', 'o', 'r', 'i', 't', 'y', ':', '4', '\232', '\305', '\210', '\036', '/', '\n', '-', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', +'.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '.', 'G', 'r', 'p', 'c', +'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '\032', '\300', '\001', '\n', '\021', 'C', 'u', 's', 't', 'o', 'm', 'H', 'e', 'a', +'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', +'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '9', '\n', '\014', 't', 'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', +'f', 'i', 'g', '\030', '\003', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', +'u', 'f', '.', 'A', 'n', 'y', 'H', '\000', 'R', '\013', 't', 'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', ':', '6', '\232', '\305', +'\210', '\036', '1', '\n', '/', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'H', 'e', +'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '.', 'C', 'u', 's', 't', 'o', 'm', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', +'c', 'k', 'B', '\r', '\n', '\013', 'c', 'o', 'n', 'f', 'i', 'g', '_', 't', 'y', 'p', 'e', 'J', '\004', '\010', '\002', '\020', '\003', 'R', '\006', +'c', 'o', 'n', 'f', 'i', 'g', '\032', 'd', '\n', '\n', 'T', 'l', 's', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '%', '\n', '\016', 'a', +'l', 'p', 'n', '_', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', 's', '\030', '\001', ' ', '\003', '(', '\t', 'R', '\r', 'a', 'l', 'p', 'n', +'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 's', ':', '/', '\232', '\305', '\210', '\036', '*', '\n', '(', 'e', 'n', 'v', 'o', 'y', '.', 'a', +'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', '.', 'T', 'l', +'s', 'O', 'p', 't', 'i', 'o', 'n', 's', ':', '$', '\232', '\305', '\210', '\036', '\037', '\n', '\035', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', +'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', 'B', '\025', '\n', '\016', +'h', 'e', 'a', 'l', 't', 'h', '_', 'c', 'h', 'e', 'c', 'k', 'e', 'r', '\022', '\003', '\370', 'B', '\001', 'J', '\004', '\010', '\n', '\020', '\013', +'*', '`', '\n', '\014', 'H', 'e', 'a', 'l', 't', 'h', 'S', 't', 'a', 't', 'u', 's', '\022', '\013', '\n', '\007', 'U', 'N', 'K', 'N', 'O', +'W', 'N', '\020', '\000', '\022', '\013', '\n', '\007', 'H', 'E', 'A', 'L', 'T', 'H', 'Y', '\020', '\001', '\022', '\r', '\n', '\t', 'U', 'N', 'H', 'E', +'A', 'L', 'T', 'H', 'Y', '\020', '\002', '\022', '\014', '\n', '\010', 'D', 'R', 'A', 'I', 'N', 'I', 'N', 'G', '\020', '\003', '\022', '\013', '\n', '\007', +'T', 'I', 'M', 'E', 'O', 'U', 'T', '\020', '\004', '\022', '\014', '\n', '\010', 'D', 'E', 'G', 'R', 'A', 'D', 'E', 'D', '\020', '\005', 'B', '@', +'\n', '\"', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', +'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', 'B', '\020', 'H', 'e', 'a', 'l', 't', 'h', 'C', 'h', 'e', 'c', 'k', 'P', +'r', 'o', 't', 'o', 'P', '\001', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; -static upb_def_init *deps[14] = { +static upb_def_init *deps[13] = { &envoy_config_core_v3_base_proto_upbdefinit, &envoy_config_core_v3_event_service_config_proto_upbdefinit, &envoy_type_matcher_v3_string_proto_upbdefinit, @@ -218,7 +219,6 @@ static upb_def_init *deps[14] = { &google_protobuf_duration_proto_upbdefinit, &google_protobuf_struct_proto_upbdefinit, &google_protobuf_wrappers_proto_upbdefinit, - &envoy_annotations_deprecation_proto_upbdefinit, &udpa_annotations_status_proto_upbdefinit, &udpa_annotations_versioning_proto_upbdefinit, &validate_validate_proto_upbdefinit, @@ -229,5 +229,5 @@ upb_def_init envoy_config_core_v3_health_check_proto_upbdefinit = { deps, layouts, "envoy/config/core/v3/health_check.proto", - UPB_STRVIEW_INIT(descriptor, 4084) + UPB_STRVIEW_INIT(descriptor, 4147) }; diff --git a/grpc/src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.c b/grpc/src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.c index 0a3b829f..0f1096b5 100644 --- a/grpc/src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.c +++ b/grpc/src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.c @@ -25,8 +25,9 @@ extern const upb_msglayout envoy_config_core_v3_KeepaliveSettings_msginit; extern const upb_msglayout envoy_config_core_v3_Http2ProtocolOptions_msginit; extern const upb_msglayout envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_msginit; extern const upb_msglayout envoy_config_core_v3_GrpcProtocolOptions_msginit; +extern const upb_msglayout envoy_config_core_v3_Http3ProtocolOptions_msginit; -static const upb_msglayout *layouts[10] = { +static const upb_msglayout *layouts[11] = { &envoy_config_core_v3_TcpProtocolOptions_msginit, &envoy_config_core_v3_UpstreamHttpProtocolOptions_msginit, &envoy_config_core_v3_HttpProtocolOptions_msginit, @@ -37,9 +38,10 @@ static const upb_msglayout *layouts[10] = { &envoy_config_core_v3_Http2ProtocolOptions_msginit, &envoy_config_core_v3_Http2ProtocolOptions_SettingsParameter_msginit, &envoy_config_core_v3_GrpcProtocolOptions_msginit, + &envoy_config_core_v3_Http3ProtocolOptions_msginit, }; -static const char descriptor[4205] = {'\n', '#', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'p', 'r', +static const char descriptor[4229] = {'\n', '#', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '.', 'p', 'r', 'o', 't', 'o', '\022', '\024', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '\032', '\033', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'v', '3', '/', 'p', 'e', 'r', 'c', 'e', 'n', 't', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', @@ -204,10 +206,11 @@ static const char descriptor[4205] = {'\n', '#', 'e', 'n', 'v', 'o', 'y', '/', ' '2', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\024', 'h', 't', 't', 'p', '2', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', ':', ',', '\232', '\305', '\210', '\036', '\'', '\n', '%', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'c', 'o', 'r', 'e', '.', 'G', 'r', 'p', 'c', 'P', 'r', 'o', 't', 'o', 'c', -'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', 'B', '=', '\n', '\"', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', -'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', 'B', '\r', 'P', -'r', 'o', 't', 'o', 'c', 'o', 'l', 'P', 'r', 'o', 't', 'o', 'P', '\001', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', -'r', 'o', 't', 'o', '3', +'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '\"', '\026', '\n', '\024', 'H', 't', 't', 'p', '3', 'P', 'r', 'o', 't', 'o', 'c', 'o', +'l', 'O', 'p', 't', 'i', 'o', 'n', 's', 'B', '=', '\n', '\"', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', +'.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', 'B', '\r', 'P', 'r', +'o', 't', 'o', 'c', 'o', 'l', 'P', 'r', 'o', 't', 'o', 'P', '\001', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', +'o', 't', 'o', '3', }; static upb_def_init *deps[7] = { @@ -224,5 +227,5 @@ upb_def_init envoy_config_core_v3_protocol_proto_upbdefinit = { deps, layouts, "envoy/config/core/v3/protocol.proto", - UPB_STRVIEW_INIT(descriptor, 4205) + UPB_STRVIEW_INIT(descriptor, 4229) }; diff --git a/grpc/src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.h b/grpc/src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.h index 61be0ed4..ddc54578 100644 --- a/grpc/src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.h +++ b/grpc/src/core/ext/upbdefs-generated/envoy/config/core/v3/protocol.upbdefs.h @@ -71,6 +71,11 @@ UPB_INLINE const upb_msgdef *envoy_config_core_v3_GrpcProtocolOptions_getmsgdef( return upb_symtab_lookupmsg(s, "envoy.config.core.v3.GrpcProtocolOptions"); } +UPB_INLINE const upb_msgdef *envoy_config_core_v3_Http3ProtocolOptions_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_config_core_v3_protocol_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.config.core.v3.Http3ProtocolOptions"); +} + #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/grpc/src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.c b/grpc/src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.c index 72d27a82..f1c19dc7 100644 --- a/grpc/src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.c +++ b/grpc/src/core/ext/upbdefs-generated/envoy/config/core/v3/proxy_protocol.upbdefs.c @@ -10,18 +10,16 @@ #include "envoy/config/core/v3/proxy_protocol.upbdefs.h" extern upb_def_init udpa_annotations_status_proto_upbdefinit; -extern upb_def_init validate_validate_proto_upbdefinit; extern const upb_msglayout envoy_config_core_v3_ProxyProtocolConfig_msginit; static const upb_msglayout *layouts[1] = { &envoy_config_core_v3_ProxyProtocolConfig_msginit, }; -static const char descriptor[324] = {'\n', ')', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'p', 'r', +static const char descriptor[299] = {'\n', ')', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'p', 'r', 'o', 'x', 'y', '_', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '.', 'p', 'r', 'o', 't', 'o', '\022', '\024', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', -'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', -'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '}', '\n', '\023', +'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\"', '}', '\n', '\023', 'P', 'r', 'o', 'x', 'y', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'K', '\n', '\007', 'v', 'e', 'r', 's', 'i', 'o', 'n', '\030', '\001', ' ', '\001', '(', '\016', '2', '1', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'P', 'r', 'o', 'x', 'y', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'C', 'o', @@ -32,9 +30,8 @@ static const char descriptor[324] = {'\n', ')', 'e', 'n', 'v', 'o', 'y', '/', 'c 'l', 'P', 'r', 'o', 't', 'o', 'P', '\001', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; -static upb_def_init *deps[3] = { +static upb_def_init *deps[2] = { &udpa_annotations_status_proto_upbdefinit, - &validate_validate_proto_upbdefinit, NULL }; @@ -42,5 +39,5 @@ upb_def_init envoy_config_core_v3_proxy_protocol_proto_upbdefinit = { deps, layouts, "envoy/config/core/v3/proxy_protocol.proto", - UPB_STRVIEW_INIT(descriptor, 324) + UPB_STRVIEW_INIT(descriptor, 299) }; diff --git a/grpc/src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.c b/grpc/src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.c index 3d4a59a5..82062b66 100644 --- a/grpc/src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.c +++ b/grpc/src/core/ext/upbdefs-generated/envoy/config/core/v3/substitution_format_string.upbdefs.c @@ -9,6 +9,8 @@ #include "upb/def.h" #include "envoy/config/core/v3/substitution_format_string.upbdefs.h" +extern upb_def_init envoy_config_core_v3_base_proto_upbdefinit; +extern upb_def_init envoy_config_core_v3_extension_proto_upbdefinit; extern upb_def_init google_protobuf_struct_proto_upbdefinit; extern upb_def_init udpa_annotations_status_proto_upbdefinit; extern upb_def_init validate_validate_proto_upbdefinit; @@ -18,29 +20,40 @@ static const upb_msglayout *layouts[1] = { &envoy_config_core_v3_SubstitutionFormatString_msginit, }; -static const char descriptor[487] = {'\n', '5', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 's', 'u', +static const char descriptor[711] = {'\n', '5', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 's', 'u', 'b', 's', 't', 'i', 't', 'u', 't', 'i', 'o', 'n', '_', 'f', 'o', 'r', 'm', 'a', 't', '_', 's', 't', 'r', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\022', '\024', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', -'v', '3', '\032', '\034', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 's', 't', 'r', 'u', 'c', -'t', '.', 'p', 'r', 'o', 't', 'o', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', -'/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', 'v', -'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '\352', '\001', '\n', '\030', 'S', 'u', 'b', 's', 't', 'i', 't', -'u', 't', 'i', 'o', 'n', 'F', 'o', 'r', 'm', 'a', 't', 'S', 't', 'r', 'i', 'n', 'g', '\022', '*', '\n', '\013', 't', 'e', 'x', 't', -'_', 'f', 'o', 'r', 'm', 'a', 't', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'H', '\000', 'R', -'\n', 't', 'e', 'x', 't', 'F', 'o', 'r', 'm', 'a', 't', '\022', 'D', '\n', '\013', 'j', 's', 'o', 'n', '_', 'f', 'o', 'r', 'm', 'a', -'t', '\030', '\002', ' ', '\001', '(', '\013', '2', '\027', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', -'.', 'S', 't', 'r', 'u', 'c', 't', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'H', '\000', 'R', '\n', 'j', 's', 'o', 'n', -'F', 'o', 'r', 'm', 'a', 't', '\022', '*', '\n', '\021', 'o', 'm', 'i', 't', '_', 'e', 'm', 'p', 't', 'y', '_', 'v', 'a', 'l', 'u', -'e', 's', '\030', '\003', ' ', '\001', '(', '\010', 'R', '\017', 'o', 'm', 'i', 't', 'E', 'm', 'p', 't', 'y', 'V', 'a', 'l', 'u', 'e', 's', -'\022', '!', '\n', '\014', 'c', 'o', 'n', 't', 'e', 'n', 't', '_', 't', 'y', 'p', 'e', '\030', '\004', ' ', '\001', '(', '\t', 'R', '\013', 'c', -'o', 'n', 't', 'e', 'n', 't', 'T', 'y', 'p', 'e', 'B', '\r', '\n', '\006', 'f', 'o', 'r', 'm', 'a', 't', '\022', '\003', '\370', 'B', '\001', -'B', 'M', '\n', '\"', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', -'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', 'B', '\035', 'S', 'u', 'b', 's', 't', 'i', 't', 'u', 't', 'i', -'o', 'n', 'F', 'o', 'r', 'm', 'a', 't', 'S', 't', 'r', 'i', 'n', 'g', 'P', 'r', 'o', 't', 'o', 'P', '\001', '\272', '\200', '\310', '\321', -'\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +'v', '3', '\032', '\037', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', +'b', 'a', 's', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', '$', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', +'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\032', '\034', +'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 's', 't', 'r', 'u', 'c', 't', '.', 'p', 'r', +'o', 't', 'o', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', +'t', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', +'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '\203', '\003', '\n', '\030', 'S', 'u', 'b', 's', 't', 'i', 't', 'u', 't', 'i', 'o', +'n', 'F', 'o', 'r', 'm', 'a', 't', 'S', 't', 'r', 'i', 'n', 'g', '\022', '%', '\n', '\013', 't', 'e', 'x', 't', '_', 'f', 'o', 'r', +'m', 'a', 't', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\002', '\030', '\001', 'H', '\000', 'R', '\n', 't', 'e', 'x', 't', 'F', 'o', 'r', 'm', +'a', 't', '\022', 'D', '\n', '\013', 'j', 's', 'o', 'n', '_', 'f', 'o', 'r', 'm', 'a', 't', '\030', '\002', ' ', '\001', '(', '\013', '2', '\027', +'.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 't', 'r', 'u', 'c', 't', 'B', '\010', +'\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'H', '\000', 'R', '\n', 'j', 's', 'o', 'n', 'F', 'o', 'r', 'm', 'a', 't', '\022', 'P', '\n', +'\022', 't', 'e', 'x', 't', '_', 'f', 'o', 'r', 'm', 'a', 't', '_', 's', 'o', 'u', 'r', 'c', 'e', '\030', '\005', ' ', '\001', '(', '\013', +'2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'D', +'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', 'H', '\000', 'R', '\020', 't', 'e', 'x', 't', 'F', 'o', 'r', 'm', 'a', 't', 'S', 'o', +'u', 'r', 'c', 'e', '\022', '*', '\n', '\021', 'o', 'm', 'i', 't', '_', 'e', 'm', 'p', 't', 'y', '_', 'v', 'a', 'l', 'u', 'e', 's', +'\030', '\003', ' ', '\001', '(', '\010', 'R', '\017', 'o', 'm', 'i', 't', 'E', 'm', 'p', 't', 'y', 'V', 'a', 'l', 'u', 'e', 's', '\022', '!', +'\n', '\014', 'c', 'o', 'n', 't', 'e', 'n', 't', '_', 't', 'y', 'p', 'e', '\030', '\004', ' ', '\001', '(', '\t', 'R', '\013', 'c', 'o', 'n', +'t', 'e', 'n', 't', 'T', 'y', 'p', 'e', '\022', 'J', '\n', '\n', 'f', 'o', 'r', 'm', 'a', 't', 't', 'e', 'r', 's', '\030', '\006', ' ', +'\003', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', +'3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\n', 'f', +'o', 'r', 'm', 'a', 't', 't', 'e', 'r', 's', 'B', '\r', '\n', '\006', 'f', 'o', 'r', 'm', 'a', 't', '\022', '\003', '\370', 'B', '\001', 'B', +'M', '\n', '\"', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', +'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', 'B', '\035', 'S', 'u', 'b', 's', 't', 'i', 't', 'u', 't', 'i', 'o', +'n', 'F', 'o', 'r', 'm', 'a', 't', 'S', 't', 'r', 'i', 'n', 'g', 'P', 'r', 'o', 't', 'o', 'P', '\001', '\272', '\200', '\310', '\321', '\006', +'\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; -static upb_def_init *deps[4] = { +static upb_def_init *deps[6] = { + &envoy_config_core_v3_base_proto_upbdefinit, + &envoy_config_core_v3_extension_proto_upbdefinit, &google_protobuf_struct_proto_upbdefinit, &udpa_annotations_status_proto_upbdefinit, &validate_validate_proto_upbdefinit, @@ -51,5 +64,5 @@ upb_def_init envoy_config_core_v3_substitution_format_string_proto_upbdefinit = deps, layouts, "envoy/config/core/v3/substitution_format_string.proto", - UPB_STRVIEW_INIT(descriptor, 487) + UPB_STRVIEW_INIT(descriptor, 711) }; diff --git a/grpc/src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.c b/grpc/src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.c index 9c1247c8..a140da45 100644 --- a/grpc/src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.c +++ b/grpc/src/core/ext/upbdefs-generated/envoy/config/endpoint/v3/endpoint.upbdefs.c @@ -11,7 +11,6 @@ extern upb_def_init envoy_config_endpoint_v3_endpoint_components_proto_upbdefinit; extern upb_def_init envoy_type_v3_percent_proto_upbdefinit; -extern upb_def_init google_api_annotations_proto_upbdefinit; extern upb_def_init google_protobuf_duration_proto_upbdefinit; extern upb_def_init google_protobuf_wrappers_proto_upbdefinit; extern upb_def_init udpa_annotations_status_proto_upbdefinit; @@ -29,71 +28,69 @@ static const upb_msglayout *layouts[4] = { &envoy_config_endpoint_v3_ClusterLoadAssignment_NamedEndpointsEntry_msginit, }; -static const char descriptor[1473] = {'\n', '\'', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '/', 'v', +static const char descriptor[1443] = {'\n', '\'', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '/', 'v', '3', '/', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', 'p', 'r', 'o', 't', 'o', '\022', '\030', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', 'v', '3', '\032', '2', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '/', 'v', '3', '/', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '_', 'c', 'o', 'm', 'p', 'o', 'n', 'e', 'n', 't', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '\033', 'e', 'n', 'v', 'o', -'y', '/', 't', 'y', 'p', 'e', '/', 'v', '3', '/', 'p', 'e', 'r', 'c', 'e', 'n', 't', '.', 'p', 'r', 'o', 't', 'o', '\032', '\034', -'g', 'o', 'o', 'g', 'l', 'e', '/', 'a', 'p', 'i', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '.', 'p', 'r', -'o', 't', 'o', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'u', 'r', 'a', -'t', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', -'u', 'f', '/', 'w', 'r', 'a', 'p', 'p', 'e', 'r', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', -'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '!', -'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', -'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', -'t', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '\246', '\010', '\n', '\025', 'C', 'l', 'u', 's', 't', 'e', 'r', 'L', 'o', 'a', 'd', 'A', -'s', 's', 'i', 'g', 'n', 'm', 'e', 'n', 't', '\022', '*', '\n', '\014', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 'n', 'a', 'm', 'e', -'\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\013', 'c', 'l', 'u', 's', 't', 'e', 'r', 'N', -'a', 'm', 'e', '\022', 'K', '\n', '\t', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', 's', '\030', '\002', ' ', '\003', '(', '\013', '2', '-', '.', -'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', 'v', '3', '.', -'L', 'o', 'c', 'a', 'l', 'i', 't', 'y', 'L', 'b', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 's', 'R', '\t', 'e', 'n', 'd', 'p', -'o', 'i', 'n', 't', 's', '\022', 'l', '\n', '\017', 'n', 'a', 'm', 'e', 'd', '_', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', 's', '\030', -'\005', ' ', '\003', '(', '\013', '2', 'C', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'e', 'n', 'd', 'p', -'o', 'i', 'n', 't', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', 'L', 'o', 'a', 'd', 'A', 's', 's', 'i', 'g', 'n', -'m', 'e', 'n', 't', '.', 'N', 'a', 'm', 'e', 'd', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 's', 'E', 'n', 't', 'r', 'y', 'R', -'\016', 'n', 'a', 'm', 'e', 'd', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 's', '\022', 'N', '\n', '\006', 'p', 'o', 'l', 'i', 'c', 'y', -'\030', '\004', ' ', '\001', '(', '\013', '2', '6', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'e', 'n', 'd', -'p', 'o', 'i', 'n', 't', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', 'L', 'o', 'a', 'd', 'A', 's', 's', 'i', 'g', -'n', 'm', 'e', 'n', 't', '.', 'P', 'o', 'l', 'i', 'c', 'y', 'R', '\006', 'p', 'o', 'l', 'i', 'c', 'y', '\032', '\303', '\004', '\n', '\006', -'P', 'o', 'l', 'i', 'c', 'y', '\022', 'j', '\n', '\016', 'd', 'r', 'o', 'p', '_', 'o', 'v', 'e', 'r', 'l', 'o', 'a', 'd', 's', '\030', -'\002', ' ', '\003', '(', '\013', '2', 'C', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'e', 'n', 'd', 'p', -'o', 'i', 'n', 't', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', 'L', 'o', 'a', 'd', 'A', 's', 's', 'i', 'g', 'n', -'m', 'e', 'n', 't', '.', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'D', 'r', 'o', 'p', 'O', 'v', 'e', 'r', 'l', 'o', 'a', 'd', 'R', -'\r', 'd', 'r', 'o', 'p', 'O', 'v', 'e', 'r', 'l', 'o', 'a', 'd', 's', '\022', '^', '\n', '\027', 'o', 'v', 'e', 'r', 'p', 'r', 'o', -'v', 'i', 's', 'i', 'o', 'n', 'i', 'n', 'g', '_', 'f', 'a', 'c', 't', 'o', 'r', '\030', '\003', ' ', '\001', '(', '\013', '2', '\034', '.', -'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', -'u', 'e', 'B', '\007', '\372', 'B', '\004', '*', '\002', ' ', '\000', 'R', '\026', 'o', 'v', 'e', 'r', 'p', 'r', 'o', 'v', 'i', 's', 'i', 'o', -'n', 'i', 'n', 'g', 'F', 'a', 'c', 't', 'o', 'r', '\022', 'U', '\n', '\024', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '_', 's', 't', -'a', 'l', 'e', '_', 'a', 'f', 't', 'e', 'r', '\030', '\004', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', -'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\252', '\001', '\002', -'*', '\000', 'R', '\022', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', 'S', 't', 'a', 'l', 'e', 'A', 'f', 't', 'e', 'r', '\032', '\275', '\001', -'\n', '\014', 'D', 'r', 'o', 'p', 'O', 'v', 'e', 'r', 'l', 'o', 'a', 'd', '\022', '#', '\n', '\010', 'c', 'a', 't', 'e', 'g', 'o', 'r', -'y', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\010', 'c', 'a', 't', 'e', 'g', 'o', 'r', -'y', '\022', 'I', '\n', '\017', 'd', 'r', 'o', 'p', '_', 'p', 'e', 'r', 'c', 'e', 'n', 't', 'a', 'g', 'e', '\030', '\002', ' ', '\001', '(', -'\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'F', 'r', 'a', 'c', 't', 'i', 'o', -'n', 'a', 'l', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', '\016', 'd', 'r', 'o', 'p', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'a', 'g', -'e', ':', '=', '\232', '\305', '\210', '\036', '8', '\n', '6', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', -'u', 's', 't', 'e', 'r', 'L', 'o', 'a', 'd', 'A', 's', 's', 'i', 'g', 'n', 'm', 'e', 'n', 't', '.', 'P', 'o', 'l', 'i', 'c', -'y', '.', 'D', 'r', 'o', 'p', 'O', 'v', 'e', 'r', 'l', 'o', 'a', 'd', ':', '0', '\232', '\305', '\210', '\036', '+', '\n', ')', 'e', 'n', -'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', 'L', 'o', 'a', 'd', 'A', 's', 's', -'i', 'g', 'n', 'm', 'e', 'n', 't', '.', 'P', 'o', 'l', 'i', 'c', 'y', 'J', '\004', '\010', '\001', '\020', '\002', 'J', '\004', '\010', '\005', '\020', -'\006', 'R', '\030', 'd', 'i', 's', 'a', 'b', 'l', 'e', '_', 'o', 'v', 'e', 'r', 'p', 'r', 'o', 'v', 'i', 's', 'i', 'o', 'n', 'i', -'n', 'g', '\032', 'e', '\n', '\023', 'N', 'a', 'm', 'e', 'd', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 's', 'E', 'n', 't', 'r', 'y', -'\022', '\020', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\003', 'k', 'e', 'y', '\022', '8', '\n', '\005', 'v', 'a', 'l', -'u', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'e', -'n', 'd', 'p', 'o', 'i', 'n', 't', '.', 'v', '3', '.', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 'R', '\005', 'v', 'a', 'l', 'u', -'e', ':', '\002', '8', '\001', ':', ')', '\232', '\305', '\210', '\036', '$', '\n', '\"', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', -'2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', 'L', 'o', 'a', 'd', 'A', 's', 's', 'i', 'g', 'n', 'm', 'e', 'n', 't', 'B', 'A', -'\n', '&', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', -'f', 'i', 'g', '.', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', 'v', '3', 'B', '\r', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', -'P', 'r', 'o', 't', 'o', 'P', '\001', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +'y', '/', 't', 'y', 'p', 'e', '/', 'v', '3', '/', 'p', 'e', 'r', 'c', 'e', 'n', 't', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', +'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', '.', +'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'w', 'r', +'a', 'p', 'p', 'e', 'r', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', +'t', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '!', 'u', 'd', 'p', 'a', '/', +'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', +'o', 't', 'o', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', +'o', 't', 'o', '\"', '\246', '\010', '\n', '\025', 'C', 'l', 'u', 's', 't', 'e', 'r', 'L', 'o', 'a', 'd', 'A', 's', 's', 'i', 'g', 'n', +'m', 'e', 'n', 't', '\022', '*', '\n', '\014', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', +'\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\013', 'c', 'l', 'u', 's', 't', 'e', 'r', 'N', 'a', 'm', 'e', '\022', 'K', +'\n', '\t', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', 's', '\030', '\002', ' ', '\003', '(', '\013', '2', '-', '.', 'e', 'n', 'v', 'o', 'y', +'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', 'v', '3', '.', 'L', 'o', 'c', 'a', 'l', +'i', 't', 'y', 'L', 'b', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 's', 'R', '\t', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', 's', +'\022', 'l', '\n', '\017', 'n', 'a', 'm', 'e', 'd', '_', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', 's', '\030', '\005', ' ', '\003', '(', '\013', +'2', 'C', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', +'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', 'L', 'o', 'a', 'd', 'A', 's', 's', 'i', 'g', 'n', 'm', 'e', 'n', 't', '.', +'N', 'a', 'm', 'e', 'd', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 's', 'E', 'n', 't', 'r', 'y', 'R', '\016', 'n', 'a', 'm', 'e', +'d', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 's', '\022', 'N', '\n', '\006', 'p', 'o', 'l', 'i', 'c', 'y', '\030', '\004', ' ', '\001', '(', +'\013', '2', '6', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', +'.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', 'L', 'o', 'a', 'd', 'A', 's', 's', 'i', 'g', 'n', 'm', 'e', 'n', 't', +'.', 'P', 'o', 'l', 'i', 'c', 'y', 'R', '\006', 'p', 'o', 'l', 'i', 'c', 'y', '\032', '\303', '\004', '\n', '\006', 'P', 'o', 'l', 'i', 'c', +'y', '\022', 'j', '\n', '\016', 'd', 'r', 'o', 'p', '_', 'o', 'v', 'e', 'r', 'l', 'o', 'a', 'd', 's', '\030', '\002', ' ', '\003', '(', '\013', +'2', 'C', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', +'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', 'L', 'o', 'a', 'd', 'A', 's', 's', 'i', 'g', 'n', 'm', 'e', 'n', 't', '.', +'P', 'o', 'l', 'i', 'c', 'y', '.', 'D', 'r', 'o', 'p', 'O', 'v', 'e', 'r', 'l', 'o', 'a', 'd', 'R', '\r', 'd', 'r', 'o', 'p', +'O', 'v', 'e', 'r', 'l', 'o', 'a', 'd', 's', '\022', '^', '\n', '\027', 'o', 'v', 'e', 'r', 'p', 'r', 'o', 'v', 'i', 's', 'i', 'o', +'n', 'i', 'n', 'g', '_', 'f', 'a', 'c', 't', 'o', 'r', '\030', '\003', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', +'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\007', '\372', +'B', '\004', '*', '\002', ' ', '\000', 'R', '\026', 'o', 'v', 'e', 'r', 'p', 'r', 'o', 'v', 'i', 's', 'i', 'o', 'n', 'i', 'n', 'g', 'F', +'a', 'c', 't', 'o', 'r', '\022', 'U', '\n', '\024', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '_', 's', 't', 'a', 'l', 'e', '_', 'a', +'f', 't', 'e', 'r', '\030', '\004', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', +'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\252', '\001', '\002', '*', '\000', 'R', '\022', 'e', +'n', 'd', 'p', 'o', 'i', 'n', 't', 'S', 't', 'a', 'l', 'e', 'A', 'f', 't', 'e', 'r', '\032', '\275', '\001', '\n', '\014', 'D', 'r', 'o', +'p', 'O', 'v', 'e', 'r', 'l', 'o', 'a', 'd', '\022', '#', '\n', '\010', 'c', 'a', 't', 'e', 'g', 'o', 'r', 'y', '\030', '\001', ' ', '\001', +'(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\010', 'c', 'a', 't', 'e', 'g', 'o', 'r', 'y', '\022', 'I', '\n', '\017', +'d', 'r', 'o', 'p', '_', 'p', 'e', 'r', 'c', 'e', 'n', 't', 'a', 'g', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', +'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'F', 'r', 'a', 'c', 't', 'i', 'o', 'n', 'a', 'l', 'P', 'e', +'r', 'c', 'e', 'n', 't', 'R', '\016', 'd', 'r', 'o', 'p', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'a', 'g', 'e', ':', '=', '\232', '\305', +'\210', '\036', '8', '\n', '6', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', +'L', 'o', 'a', 'd', 'A', 's', 's', 'i', 'g', 'n', 'm', 'e', 'n', 't', '.', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'D', 'r', 'o', +'p', 'O', 'v', 'e', 'r', 'l', 'o', 'a', 'd', ':', '0', '\232', '\305', '\210', '\036', '+', '\n', ')', 'e', 'n', 'v', 'o', 'y', '.', 'a', +'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', 'L', 'o', 'a', 'd', 'A', 's', 's', 'i', 'g', 'n', 'm', 'e', +'n', 't', '.', 'P', 'o', 'l', 'i', 'c', 'y', 'J', '\004', '\010', '\001', '\020', '\002', 'J', '\004', '\010', '\005', '\020', '\006', 'R', '\030', 'd', 'i', +'s', 'a', 'b', 'l', 'e', '_', 'o', 'v', 'e', 'r', 'p', 'r', 'o', 'v', 'i', 's', 'i', 'o', 'n', 'i', 'n', 'g', '\032', 'e', '\n', +'\023', 'N', 'a', 'm', 'e', 'd', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 's', 'E', 'n', 't', 'r', 'y', '\022', '\020', '\n', '\003', 'k', +'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\003', 'k', 'e', 'y', '\022', '8', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', +'\001', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'e', 'n', 'd', 'p', 'o', 'i', +'n', 't', '.', 'v', '3', '.', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 'R', '\005', 'v', 'a', 'l', 'u', 'e', ':', '\002', '8', '\001', +':', ')', '\232', '\305', '\210', '\036', '$', '\n', '\"', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'C', 'l', 'u', +'s', 't', 'e', 'r', 'L', 'o', 'a', 'd', 'A', 's', 's', 'i', 'g', 'n', 'm', 'e', 'n', 't', 'B', 'A', '\n', '&', 'i', 'o', '.', +'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'e', +'n', 'd', 'p', 'o', 'i', 'n', 't', '.', 'v', '3', 'B', '\r', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 'P', 'r', 'o', 't', 'o', +'P', '\001', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; -static upb_def_init *deps[9] = { +static upb_def_init *deps[8] = { &envoy_config_endpoint_v3_endpoint_components_proto_upbdefinit, &envoy_type_v3_percent_proto_upbdefinit, - &google_api_annotations_proto_upbdefinit, &google_protobuf_duration_proto_upbdefinit, &google_protobuf_wrappers_proto_upbdefinit, &udpa_annotations_status_proto_upbdefinit, @@ -106,5 +103,5 @@ upb_def_init envoy_config_endpoint_v3_endpoint_proto_upbdefinit = { deps, layouts, "envoy/config/endpoint/v3/endpoint.proto", - UPB_STRVIEW_INIT(descriptor, 1473) + UPB_STRVIEW_INIT(descriptor, 1443) }; diff --git a/grpc/src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.c b/grpc/src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.c index 9ab5e14b..f1d684a8 100644 --- a/grpc/src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.c +++ b/grpc/src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener.upbdefs.c @@ -17,10 +17,9 @@ extern upb_def_init envoy_config_core_v3_socket_option_proto_upbdefinit; extern upb_def_init envoy_config_listener_v3_api_listener_proto_upbdefinit; extern upb_def_init envoy_config_listener_v3_listener_components_proto_upbdefinit; extern upb_def_init envoy_config_listener_v3_udp_listener_config_proto_upbdefinit; -extern upb_def_init google_api_annotations_proto_upbdefinit; extern upb_def_init google_protobuf_duration_proto_upbdefinit; extern upb_def_init google_protobuf_wrappers_proto_upbdefinit; -extern upb_def_init udpa_core_v1_collection_entry_proto_upbdefinit; +extern upb_def_init xds_core_v3_collection_entry_proto_upbdefinit; extern upb_def_init udpa_annotations_security_proto_upbdefinit; extern upb_def_init udpa_annotations_status_proto_upbdefinit; extern upb_def_init udpa_annotations_versioning_proto_upbdefinit; @@ -39,7 +38,7 @@ static const upb_msglayout *layouts[5] = { &envoy_config_listener_v3_Listener_ConnectionBalanceConfig_ExactBalance_msginit, }; -static const char descriptor[3016] = {'\n', '\'', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '/', 'v', +static const char descriptor[3185] = {'\n', '\'', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '/', 'v', '3', '/', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'p', 'r', 'o', 't', 'o', '\022', '\030', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'v', '3', '\032', ')', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '/', 'v', '3', '/', 'a', 'c', 'c', 'e', 's', @@ -55,114 +54,121 @@ static const char descriptor[3016] = {'\n', '\'', 'e', 'n', 'v', 'o', 'y', '/', 'e', 'r', '/', 'v', '3', '/', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '_', 'c', 'o', 'm', 'p', 'o', 'n', 'e', 'n', 't', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '2', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '/', 'v', '3', '/', 'u', 'd', 'p', '_', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '_', 'c', 'o', 'n', 'f', -'i', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\034', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'a', 'p', 'i', '/', 'a', 'n', 'n', 'o', -'t', 'a', 't', 'i', 'o', 'n', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', -'t', 'o', 'b', 'u', 'f', '/', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', 'o', -'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'w', 'r', 'a', 'p', 'p', 'e', 'r', 's', '.', 'p', 'r', 'o', -'t', 'o', '\032', '#', 'u', 'd', 'p', 'a', '/', 'c', 'o', 'r', 'e', '/', 'v', '1', '/', 'c', 'o', 'l', 'l', 'e', 'c', 't', 'i', -'o', 'n', '_', 'e', 'n', 't', 'r', 'y', '.', 'p', 'r', 'o', 't', 'o', '\032', '\037', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', -'t', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 'e', 'c', 'u', 'r', 'i', 't', 'y', '.', 'p', 'r', 'o', 't', 'o', '\032', '\035', 'u', -'d', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', -'o', 't', 'o', '\032', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', -'s', 'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', 'v', -'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', 'M', '\n', '\022', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', -'C', 'o', 'l', 'l', 'e', 'c', 't', 'i', 'o', 'n', '\022', '7', '\n', '\007', 'e', 'n', 't', 'r', 'i', 'e', 's', '\030', '\001', ' ', '\003', -'(', '\013', '2', '\035', '.', 'u', 'd', 'p', 'a', '.', 'c', 'o', 'r', 'e', '.', 'v', '1', '.', 'C', 'o', 'l', 'l', 'e', 'c', 't', -'i', 'o', 'n', 'E', 'n', 't', 'r', 'y', 'R', '\007', 'e', 'n', 't', 'r', 'i', 'e', 's', '\"', '\224', '\021', '\n', '\010', 'L', 'i', 's', -'t', 'e', 'n', 'e', 'r', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', -'\022', 'A', '\n', '\007', 'a', 'd', 'd', 'r', 'e', 's', 's', '\030', '\002', ' ', '\001', '(', '\013', '2', '\035', '.', 'e', 'n', 'v', 'o', 'y', -'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'A', 'd', 'd', 'r', 'e', 's', 's', 'B', '\010', -'\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\007', 'a', 'd', 'd', 'r', 'e', 's', 's', '\022', 'J', '\n', '\r', 'f', 'i', 'l', 't', -'e', 'r', '_', 'c', 'h', 'a', 'i', 'n', 's', '\030', '\003', ' ', '\003', '(', '\013', '2', '%', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', -'o', 'n', 'f', 'i', 'g', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'v', '3', '.', 'F', 'i', 'l', 't', 'e', 'r', 'C', -'h', 'a', 'i', 'n', 'R', '\014', 'f', 'i', 'l', 't', 'e', 'r', 'C', 'h', 'a', 'i', 'n', 's', '\022', 'o', '\n', '!', 'p', 'e', 'r', -'_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'b', 'u', 'f', 'f', 'e', 'r', '_', 'l', 'i', 'm', 'i', 't', '_', -'b', 'y', 't', 'e', 's', '\030', '\005', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', -'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\007', '\212', '\223', '\267', '*', '\002', '\010', '\001', -'R', '\035', 'p', 'e', 'r', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'B', 'u', 'f', 'f', 'e', 'r', 'L', 'i', 'm', 'i', -'t', 'B', 'y', 't', 'e', 's', '\022', ':', '\n', '\010', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '\030', '\006', ' ', '\001', '(', '\013', '2', -'\036', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'M', 'e', -'t', 'a', 'd', 'a', 't', 'a', 'R', '\010', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '\022', 'T', '\n', '\r', 'd', 'e', 'p', 'r', 'e', -'c', 'a', 't', 'e', 'd', '_', 'v', '1', '\030', '\007', ' ', '\001', '(', '\013', '2', '/', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', -'n', 'f', 'i', 'g', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'v', '3', '.', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', -'.', 'D', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', 'V', '1', 'R', '\014', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', -'V', '1', '\022', 'K', '\n', '\n', 'd', 'r', 'a', 'i', 'n', '_', 't', 'y', 'p', 'e', '\030', '\010', ' ', '\001', '(', '\016', '2', ',', '.', -'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'v', '3', '.', -'L', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'D', 'r', 'a', 'i', 'n', 'T', 'y', 'p', 'e', 'R', '\t', 'd', 'r', 'a', 'i', 'n', -'T', 'y', 'p', 'e', '\022', 'S', '\n', '\020', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '_', 'f', 'i', 'l', 't', 'e', 'r', 's', '\030', -'\t', ' ', '\003', '(', '\013', '2', '(', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'l', 'i', 's', 't', -'e', 'n', 'e', 'r', '.', 'v', '3', '.', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 'F', 'i', 'l', 't', 'e', 'r', 'R', '\017', 'l', -'i', 's', 't', 'e', 'n', 'e', 'r', 'F', 'i', 'l', 't', 'e', 'r', 's', '\022', 'S', '\n', '\030', 'l', 'i', 's', 't', 'e', 'n', 'e', -'r', '_', 'f', 'i', 'l', 't', 'e', 'r', 's', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\017', ' ', '\001', '(', '\013', '2', '\031', -'.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', -'R', '\026', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', 'F', 'i', 'l', 't', 'e', 'r', 's', 'T', 'i', 'm', 'e', 'o', 'u', 't', '\022', -'N', '\n', '$', 'c', 'o', 'n', 't', 'i', 'n', 'u', 'e', '_', 'o', 'n', '_', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '_', 'f', -'i', 'l', 't', 'e', 'r', 's', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\021', ' ', '\001', '(', '\010', 'R', ' ', 'c', 'o', 'n', -'t', 'i', 'n', 'u', 'e', 'O', 'n', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 'F', 'i', 'l', 't', 'e', 'r', 's', 'T', 'i', 'm', -'e', 'o', 'u', 't', '\022', '<', '\n', '\013', 't', 'r', 'a', 'n', 's', 'p', 'a', 'r', 'e', 'n', 't', '\030', '\n', ' ', '\001', '(', '\013', -'2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', -'l', 'u', 'e', 'R', '\013', 't', 'r', 'a', 'n', 's', 'p', 'a', 'r', 'e', 'n', 't', '\022', '6', '\n', '\010', 'f', 'r', 'e', 'e', 'b', -'i', 'n', 'd', '\030', '\013', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', -'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\010', 'f', 'r', 'e', 'e', 'b', 'i', 'n', 'd', '\022', 'I', '\n', -'\016', 's', 'o', 'c', 'k', 'e', 't', '_', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\r', ' ', '\003', '(', '\013', '2', '\"', '.', 'e', -'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'S', 'o', 'c', 'k', 'e', -'t', 'O', 'p', 't', 'i', 'o', 'n', 'R', '\r', 's', 'o', 'c', 'k', 'e', 't', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', 'X', '\n', -'\032', 't', 'c', 'p', '_', 'f', 'a', 's', 't', '_', 'o', 'p', 'e', 'n', '_', 'q', 'u', 'e', 'u', 'e', '_', 'l', 'e', 'n', 'g', -'t', 'h', '\030', '\014', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', -'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\026', 't', 'c', 'p', 'F', 'a', 's', 't', 'O', 'p', 'e', -'n', 'Q', 'u', 'e', 'u', 'e', 'L', 'e', 'n', 'g', 't', 'h', '\022', 'S', '\n', '\021', 't', 'r', 'a', 'f', 'f', 'i', 'c', '_', 'd', -'i', 'r', 'e', 'c', 't', 'i', 'o', 'n', '\030', '\020', ' ', '\001', '(', '\016', '2', '&', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', -'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'r', 'a', 'f', 'f', 'i', 'c', 'D', 'i', 'r', 'e', 'c', -'t', 'i', 'o', 'n', 'R', '\020', 't', 'r', 'a', 'f', 'f', 'i', 'c', 'D', 'i', 'r', 'e', 'c', 't', 'i', 'o', 'n', '\022', '[', '\n', -'\023', 'u', 'd', 'p', '_', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\022', ' ', '\001', '(', -'\013', '2', '+', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', -'.', 'v', '3', '.', 'U', 'd', 'p', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\021', 'u', 'd', -'p', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'H', '\n', '\014', 'a', 'p', 'i', '_', 'l', 'i', -'s', 't', 'e', 'n', 'e', 'r', '\030', '\023', ' ', '\001', '(', '\013', '2', '%', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', -'i', 'g', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'v', '3', '.', 'A', 'p', 'i', 'L', 'i', 's', 't', 'e', 'n', 'e', -'r', 'R', '\013', 'a', 'p', 'i', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', '\022', 'v', '\n', '\031', 'c', 'o', 'n', 'n', 'e', 'c', 't', -'i', 'o', 'n', '_', 'b', 'a', 'l', 'a', 'n', 'c', 'e', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\024', ' ', '\001', '(', '\013', '2', -':', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'v', -'3', '.', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'B', 'a', 'l', 'a', -'n', 'c', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\027', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'B', 'a', 'l', 'a', -'n', 'c', 'e', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '\035', '\n', '\n', 'r', 'e', 'u', 's', 'e', '_', 'p', 'o', 'r', 't', '\030', '\025', -' ', '\001', '(', '\010', 'R', '\t', 'r', 'e', 'u', 's', 'e', 'P', 'o', 'r', 't', '\022', 'C', '\n', '\n', 'a', 'c', 'c', 'e', 's', 's', -'_', 'l', 'o', 'g', '\030', '\026', ' ', '\003', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', -'.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'A', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 'R', '\t', -'a', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', '\022', 'V', '\n', '\021', 'u', 'd', 'p', '_', 'w', 'r', 'i', 't', 'e', 'r', '_', 'c', -'o', 'n', 'f', 'i', 'g', '\030', '\027', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', -'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', -'o', 'n', 'f', 'i', 'g', 'R', '\017', 'u', 'd', 'p', 'W', 'r', 'i', 't', 'e', 'r', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'F', '\n', -'\020', 't', 'c', 'p', '_', 'b', 'a', 'c', 'k', 'l', 'o', 'g', '_', 's', 'i', 'z', 'e', '\030', '\030', ' ', '\001', '(', '\013', '2', '\034', -'.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', -'l', 'u', 'e', 'R', '\016', 't', 'c', 'p', 'B', 'a', 'c', 'k', 'l', 'o', 'g', 'S', 'i', 'z', 'e', '\032', 'w', '\n', '\014', 'D', 'e', -'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', 'V', '1', '\022', '<', '\n', '\014', 'b', 'i', 'n', 'd', '_', 't', 'o', '_', 'p', 'o', 'r', -'t', '\030', '\001', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', -'.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\n', 'b', 'i', 'n', 'd', 'T', 'o', 'P', 'o', 'r', 't', ':', ')', '\232', -'\305', '\210', '\036', '$', '\n', '\"', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'L', 'i', 's', 't', 'e', 'n', -'e', 'r', '.', 'D', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', 'V', '1', '\032', '\247', '\002', '\n', '\027', 'C', 'o', 'n', 'n', 'e', -'c', 't', 'i', 'o', 'n', 'B', 'a', 'l', 'a', 'n', 'c', 'e', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'n', '\n', '\r', 'e', 'x', 'a', -'c', 't', '_', 'b', 'a', 'l', 'a', 'n', 'c', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', 'G', '.', 'e', 'n', 'v', 'o', 'y', '.', +'i', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', +'/', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', +'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'w', 'r', 'a', 'p', 'p', 'e', 'r', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '\"', 'x', +'d', 's', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'c', 'o', 'l', 'l', 'e', 'c', 't', 'i', 'o', 'n', '_', 'e', 'n', 't', +'r', 'y', '.', 'p', 'r', 'o', 't', 'o', '\032', '\037', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', +'s', '/', 's', 'e', 'c', 'u', 'r', 'i', 't', 'y', '.', 'p', 'r', 'o', 't', 'o', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', +'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '!', 'u', +'d', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', +'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', +'e', '.', 'p', 'r', 'o', 't', 'o', '\"', 'L', '\n', '\022', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 'C', 'o', 'l', 'l', 'e', 'c', +'t', 'i', 'o', 'n', '\022', '6', '\n', '\007', 'e', 'n', 't', 'r', 'i', 'e', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '\034', '.', 'x', +'d', 's', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'C', 'o', 'l', 'l', 'e', 'c', 't', 'i', 'o', 'n', 'E', 'n', 't', 'r', +'y', 'R', '\007', 'e', 'n', 't', 'r', 'i', 'e', 's', '\"', '\335', '\022', '\n', '\010', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', '\022', '\022', +'\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', 'A', '\n', '\007', 'a', 'd', 'd', +'r', 'e', 's', 's', '\030', '\002', ' ', '\001', '(', '\013', '2', '\035', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', +'.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'A', 'd', 'd', 'r', 'e', 's', 's', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', +'\001', 'R', '\007', 'a', 'd', 'd', 'r', 'e', 's', 's', '\022', 'J', '\n', '\r', 'f', 'i', 'l', 't', 'e', 'r', '_', 'c', 'h', 'a', 'i', +'n', 's', '\030', '\003', ' ', '\003', '(', '\013', '2', '%', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'l', +'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'v', '3', '.', 'F', 'i', 'l', 't', 'e', 'r', 'C', 'h', 'a', 'i', 'n', 'R', '\014', 'f', +'i', 'l', 't', 'e', 'r', 'C', 'h', 'a', 'i', 'n', 's', '\022', 'D', '\n', '\020', 'u', 's', 'e', '_', 'o', 'r', 'i', 'g', 'i', 'n', +'a', 'l', '_', 'd', 's', 't', '\030', '\004', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', +'t', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\016', 'u', 's', 'e', 'O', 'r', 'i', 'g', 'i', +'n', 'a', 'l', 'D', 's', 't', '\022', 'W', '\n', '\024', 'd', 'e', 'f', 'a', 'u', 'l', 't', '_', 'f', 'i', 'l', 't', 'e', 'r', '_', +'c', 'h', 'a', 'i', 'n', '\030', '\031', ' ', '\001', '(', '\013', '2', '%', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', +'g', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'v', '3', '.', 'F', 'i', 'l', 't', 'e', 'r', 'C', 'h', 'a', 'i', 'n', +'R', '\022', 'd', 'e', 'f', 'a', 'u', 'l', 't', 'F', 'i', 'l', 't', 'e', 'r', 'C', 'h', 'a', 'i', 'n', '\022', 'o', '\n', '!', 'p', +'e', 'r', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'b', 'u', 'f', 'f', 'e', 'r', '_', 'l', 'i', 'm', 'i', +'t', '_', 'b', 'y', 't', 'e', 's', '\030', '\005', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', +'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\007', '\212', '\223', '\267', '*', '\002', +'\010', '\001', 'R', '\035', 'p', 'e', 'r', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'B', 'u', 'f', 'f', 'e', 'r', 'L', 'i', +'m', 'i', 't', 'B', 'y', 't', 'e', 's', '\022', ':', '\n', '\010', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '\030', '\006', ' ', '\001', '(', +'\013', '2', '\036', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', +'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'R', '\010', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '\022', 'X', '\n', '\r', 'd', 'e', 'p', +'r', 'e', 'c', 'a', 't', 'e', 'd', '_', 'v', '1', '\030', '\007', ' ', '\001', '(', '\013', '2', '/', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'v', '3', '.', 'L', 'i', 's', 't', 'e', 'n', -'e', 'r', '.', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'B', 'a', 'l', 'a', 'n', 'c', 'e', 'C', 'o', 'n', 'f', 'i', -'g', '.', 'E', 'x', 'a', 'c', 't', 'B', 'a', 'l', 'a', 'n', 'c', 'e', 'H', '\000', 'R', '\014', 'e', 'x', 'a', 'c', 't', 'B', 'a', -'l', 'a', 'n', 'c', 'e', '\032', 'Q', '\n', '\014', 'E', 'x', 'a', 'c', 't', 'B', 'a', 'l', 'a', 'n', 'c', 'e', ':', 'A', '\232', '\305', -'\210', '\036', '<', '\n', ':', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'L', 'i', 's', 't', 'e', 'n', 'e', -'r', '.', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'B', 'a', 'l', 'a', 'n', 'c', 'e', 'C', 'o', 'n', 'f', 'i', 'g', -'.', 'E', 'x', 'a', 'c', 't', 'B', 'a', 'l', 'a', 'n', 'c', 'e', ':', '4', '\232', '\305', '\210', '\036', '/', '\n', '-', 'e', 'n', 'v', -'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'C', 'o', 'n', 'n', 'e', 'c', -'t', 'i', 'o', 'n', 'B', 'a', 'l', 'a', 'n', 'c', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 'B', '\023', '\n', '\014', 'b', 'a', 'l', 'a', -'n', 'c', 'e', '_', 't', 'y', 'p', 'e', '\022', '\003', '\370', 'B', '\001', '\"', ')', '\n', '\t', 'D', 'r', 'a', 'i', 'n', 'T', 'y', 'p', -'e', '\022', '\013', '\n', '\007', 'D', 'E', 'F', 'A', 'U', 'L', 'T', '\020', '\000', '\022', '\017', '\n', '\013', 'M', 'O', 'D', 'I', 'F', 'Y', '_', -'O', 'N', 'L', 'Y', '\020', '\001', ':', '\034', '\232', '\305', '\210', '\036', '\027', '\n', '\025', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', -'v', '2', '.', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 'J', '\004', '\010', '\016', '\020', '\017', 'J', '\004', '\010', '\004', '\020', '\005', 'R', '\020', -'u', 's', 'e', '_', 'o', 'r', 'i', 'g', 'i', 'n', 'a', 'l', '_', 'd', 's', 't', 'B', 'A', '\n', '&', 'i', 'o', '.', 'e', 'n', -'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'l', 'i', 's', -'t', 'e', 'n', 'e', 'r', '.', 'v', '3', 'B', '\r', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 'P', 'r', 'o', 't', 'o', 'P', '\001', -'\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +'e', 'r', '.', 'D', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', 'V', '1', 'B', '\002', '\030', '\001', 'R', '\014', 'd', 'e', 'p', 'r', +'e', 'c', 'a', 't', 'e', 'd', 'V', '1', '\022', 'K', '\n', '\n', 'd', 'r', 'a', 'i', 'n', '_', 't', 'y', 'p', 'e', '\030', '\010', ' ', +'\001', '(', '\016', '2', ',', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'l', 'i', 's', 't', 'e', 'n', +'e', 'r', '.', 'v', '3', '.', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'D', 'r', 'a', 'i', 'n', 'T', 'y', 'p', 'e', 'R', +'\t', 'd', 'r', 'a', 'i', 'n', 'T', 'y', 'p', 'e', '\022', 'S', '\n', '\020', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '_', 'f', 'i', +'l', 't', 'e', 'r', 's', '\030', '\t', ' ', '\003', '(', '\013', '2', '(', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', +'g', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'v', '3', '.', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 'F', 'i', 'l', +'t', 'e', 'r', 'R', '\017', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', 'F', 'i', 'l', 't', 'e', 'r', 's', '\022', 'S', '\n', '\030', 'l', +'i', 's', 't', 'e', 'n', 'e', 'r', '_', 'f', 'i', 'l', 't', 'e', 'r', 's', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\017', +' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', +'r', 'a', 't', 'i', 'o', 'n', 'R', '\026', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', 'F', 'i', 'l', 't', 'e', 'r', 's', 'T', 'i', +'m', 'e', 'o', 'u', 't', '\022', 'N', '\n', '$', 'c', 'o', 'n', 't', 'i', 'n', 'u', 'e', '_', 'o', 'n', '_', 'l', 'i', 's', 't', +'e', 'n', 'e', 'r', '_', 'f', 'i', 'l', 't', 'e', 'r', 's', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\021', ' ', '\001', '(', +'\010', 'R', ' ', 'c', 'o', 'n', 't', 'i', 'n', 'u', 'e', 'O', 'n', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 'F', 'i', 'l', 't', +'e', 'r', 's', 'T', 'i', 'm', 'e', 'o', 'u', 't', '\022', '<', '\n', '\013', 't', 'r', 'a', 'n', 's', 'p', 'a', 'r', 'e', 'n', 't', +'\030', '\n', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', +'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\013', 't', 'r', 'a', 'n', 's', 'p', 'a', 'r', 'e', 'n', 't', '\022', '6', '\n', +'\010', 'f', 'r', 'e', 'e', 'b', 'i', 'n', 'd', '\030', '\013', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', +'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\010', 'f', 'r', 'e', 'e', 'b', +'i', 'n', 'd', '\022', 'I', '\n', '\016', 's', 'o', 'c', 'k', 'e', 't', '_', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\r', ' ', '\003', +'(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', +'.', 'S', 'o', 'c', 'k', 'e', 't', 'O', 'p', 't', 'i', 'o', 'n', 'R', '\r', 's', 'o', 'c', 'k', 'e', 't', 'O', 'p', 't', 'i', +'o', 'n', 's', '\022', 'X', '\n', '\032', 't', 'c', 'p', '_', 'f', 'a', 's', 't', '_', 'o', 'p', 'e', 'n', '_', 'q', 'u', 'e', 'u', +'e', '_', 'l', 'e', 'n', 'g', 't', 'h', '\030', '\014', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', +'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\026', 't', 'c', 'p', 'F', +'a', 's', 't', 'O', 'p', 'e', 'n', 'Q', 'u', 'e', 'u', 'e', 'L', 'e', 'n', 'g', 't', 'h', '\022', 'S', '\n', '\021', 't', 'r', 'a', +'f', 'f', 'i', 'c', '_', 'd', 'i', 'r', 'e', 'c', 't', 'i', 'o', 'n', '\030', '\020', ' ', '\001', '(', '\016', '2', '&', '.', 'e', 'n', +'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'r', 'a', 'f', 'f', 'i', +'c', 'D', 'i', 'r', 'e', 'c', 't', 'i', 'o', 'n', 'R', '\020', 't', 'r', 'a', 'f', 'f', 'i', 'c', 'D', 'i', 'r', 'e', 'c', 't', +'i', 'o', 'n', '\022', '[', '\n', '\023', 'u', 'd', 'p', '_', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '_', 'c', 'o', 'n', 'f', 'i', +'g', '\030', '\022', ' ', '\001', '(', '\013', '2', '+', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'l', 'i', +'s', 't', 'e', 'n', 'e', 'r', '.', 'v', '3', '.', 'U', 'd', 'p', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 'C', 'o', 'n', 'f', +'i', 'g', 'R', '\021', 'u', 'd', 'p', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'H', '\n', '\014', +'a', 'p', 'i', '_', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '\030', '\023', ' ', '\001', '(', '\013', '2', '%', '.', 'e', 'n', 'v', 'o', +'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'v', '3', '.', 'A', 'p', 'i', 'L', +'i', 's', 't', 'e', 'n', 'e', 'r', 'R', '\013', 'a', 'p', 'i', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', '\022', 'v', '\n', '\031', 'c', +'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'b', 'a', 'l', 'a', 'n', 'c', 'e', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', +'\024', ' ', '\001', '(', '\013', '2', ':', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'l', 'i', 's', 't', +'e', 'n', 'e', 'r', '.', 'v', '3', '.', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', +'o', 'n', 'B', 'a', 'l', 'a', 'n', 'c', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\027', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', +'o', 'n', 'B', 'a', 'l', 'a', 'n', 'c', 'e', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '\035', '\n', '\n', 'r', 'e', 'u', 's', 'e', '_', +'p', 'o', 'r', 't', '\030', '\025', ' ', '\001', '(', '\010', 'R', '\t', 'r', 'e', 'u', 's', 'e', 'P', 'o', 'r', 't', '\022', 'C', '\n', '\n', +'a', 'c', 'c', 'e', 's', 's', '_', 'l', 'o', 'g', '\030', '\026', ' ', '\003', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', +'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'A', 'c', 'c', 'e', 's', +'s', 'L', 'o', 'g', 'R', '\t', 'a', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', '\022', 'V', '\n', '\021', 'u', 'd', 'p', '_', 'w', 'r', +'i', 't', 'e', 'r', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\027', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', +'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', +'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\017', 'u', 'd', 'p', 'W', 'r', 'i', 't', 'e', 'r', 'C', 'o', 'n', +'f', 'i', 'g', '\022', 'F', '\n', '\020', 't', 'c', 'p', '_', 'b', 'a', 'c', 'k', 'l', 'o', 'g', '_', 's', 'i', 'z', 'e', '\030', '\030', +' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', +'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\016', 't', 'c', 'p', 'B', 'a', 'c', 'k', 'l', 'o', 'g', 'S', 'i', 'z', 'e', +'\022', '<', '\n', '\014', 'b', 'i', 'n', 'd', '_', 't', 'o', '_', 'p', 'o', 'r', 't', '\030', '\032', ' ', '\001', '(', '\013', '2', '\032', '.', +'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', +'R', '\n', 'b', 'i', 'n', 'd', 'T', 'o', 'P', 'o', 'r', 't', '\032', 'w', '\n', '\014', 'D', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', +'d', 'V', '1', '\022', '<', '\n', '\014', 'b', 'i', 'n', 'd', '_', 't', 'o', '_', 'p', 'o', 'r', 't', '\030', '\001', ' ', '\001', '(', '\013', +'2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', +'l', 'u', 'e', 'R', '\n', 'b', 'i', 'n', 'd', 'T', 'o', 'P', 'o', 'r', 't', ':', ')', '\232', '\305', '\210', '\036', '$', '\n', '\"', 'e', +'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'D', 'e', 'p', 'r', +'e', 'c', 'a', 't', 'e', 'd', 'V', '1', '\032', '\247', '\002', '\n', '\027', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'B', 'a', +'l', 'a', 'n', 'c', 'e', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'n', '\n', '\r', 'e', 'x', 'a', 'c', 't', '_', 'b', 'a', 'l', 'a', +'n', 'c', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', 'G', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', +'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'v', '3', '.', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'C', 'o', 'n', 'n', +'e', 'c', 't', 'i', 'o', 'n', 'B', 'a', 'l', 'a', 'n', 'c', 'e', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'E', 'x', 'a', 'c', 't', +'B', 'a', 'l', 'a', 'n', 'c', 'e', 'H', '\000', 'R', '\014', 'e', 'x', 'a', 'c', 't', 'B', 'a', 'l', 'a', 'n', 'c', 'e', '\032', 'Q', +'\n', '\014', 'E', 'x', 'a', 'c', 't', 'B', 'a', 'l', 'a', 'n', 'c', 'e', ':', 'A', '\232', '\305', '\210', '\036', '<', '\n', ':', 'e', 'n', +'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'C', 'o', 'n', 'n', 'e', +'c', 't', 'i', 'o', 'n', 'B', 'a', 'l', 'a', 'n', 'c', 'e', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'E', 'x', 'a', 'c', 't', 'B', +'a', 'l', 'a', 'n', 'c', 'e', ':', '4', '\232', '\305', '\210', '\036', '/', '\n', '-', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', +'v', '2', '.', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'B', 'a', 'l', +'a', 'n', 'c', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 'B', '\023', '\n', '\014', 'b', 'a', 'l', 'a', 'n', 'c', 'e', '_', 't', 'y', 'p', +'e', '\022', '\003', '\370', 'B', '\001', '\"', ')', '\n', '\t', 'D', 'r', 'a', 'i', 'n', 'T', 'y', 'p', 'e', '\022', '\013', '\n', '\007', 'D', 'E', +'F', 'A', 'U', 'L', 'T', '\020', '\000', '\022', '\017', '\n', '\013', 'M', 'O', 'D', 'I', 'F', 'Y', '_', 'O', 'N', 'L', 'Y', '\020', '\001', ':', +'\034', '\232', '\305', '\210', '\036', '\027', '\n', '\025', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'L', 'i', 's', 't', +'e', 'n', 'e', 'r', 'J', '\004', '\010', '\016', '\020', '\017', 'B', 'A', '\n', '&', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', +'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', +'v', '3', 'B', '\r', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 'P', 'r', 'o', 't', 'o', 'P', '\001', '\272', '\200', '\310', '\321', '\006', '\002', +'\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; -static upb_def_init *deps[17] = { +static upb_def_init *deps[16] = { &envoy_config_accesslog_v3_accesslog_proto_upbdefinit, &envoy_config_core_v3_address_proto_upbdefinit, &envoy_config_core_v3_base_proto_upbdefinit, @@ -171,10 +177,9 @@ static upb_def_init *deps[17] = { &envoy_config_listener_v3_api_listener_proto_upbdefinit, &envoy_config_listener_v3_listener_components_proto_upbdefinit, &envoy_config_listener_v3_udp_listener_config_proto_upbdefinit, - &google_api_annotations_proto_upbdefinit, &google_protobuf_duration_proto_upbdefinit, &google_protobuf_wrappers_proto_upbdefinit, - &udpa_core_v1_collection_entry_proto_upbdefinit, + &xds_core_v3_collection_entry_proto_upbdefinit, &udpa_annotations_security_proto_upbdefinit, &udpa_annotations_status_proto_upbdefinit, &udpa_annotations_versioning_proto_upbdefinit, @@ -186,5 +191,5 @@ upb_def_init envoy_config_listener_v3_listener_proto_upbdefinit = { deps, layouts, "envoy/config/listener/v3/listener.proto", - UPB_STRVIEW_INIT(descriptor, 3016) + UPB_STRVIEW_INIT(descriptor, 3185) }; diff --git a/grpc/src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.c b/grpc/src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.c index 2ec7304e..ffe22ce9 100644 --- a/grpc/src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.c +++ b/grpc/src/core/ext/upbdefs-generated/envoy/config/listener/v3/listener_components.upbdefs.c @@ -11,10 +11,10 @@ extern upb_def_init envoy_config_core_v3_address_proto_upbdefinit; extern upb_def_init envoy_config_core_v3_base_proto_upbdefinit; +extern upb_def_init envoy_config_core_v3_extension_proto_upbdefinit; extern upb_def_init envoy_type_v3_range_proto_upbdefinit; extern upb_def_init google_protobuf_any_proto_upbdefinit; extern upb_def_init google_protobuf_duration_proto_upbdefinit; -extern upb_def_init google_protobuf_struct_proto_upbdefinit; extern upb_def_init google_protobuf_wrappers_proto_upbdefinit; extern upb_def_init udpa_annotations_status_proto_upbdefinit; extern upb_def_init udpa_annotations_versioning_proto_upbdefinit; @@ -37,139 +37,147 @@ static const upb_msglayout *layouts[7] = { &envoy_config_listener_v3_ListenerFilter_msginit, }; -static const char descriptor[3082] = {'\n', '2', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '/', 'v', +static const char descriptor[3284] = {'\n', '2', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '/', 'v', '3', '/', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '_', 'c', 'o', 'm', 'p', 'o', 'n', 'e', 'n', 't', 's', '.', 'p', 'r', 'o', 't', 'o', '\022', '\030', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'v', '3', '\032', '\"', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'a', 'd', 'd', 'r', 'e', 's', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '\037', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', -'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'b', 'a', 's', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', '\031', 'e', -'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'v', '3', '/', 'r', 'a', 'n', 'g', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', -'\031', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'a', 'n', 'y', '.', 'p', 'r', 'o', 't', -'o', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'u', 'r', 'a', 't', 'i', -'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\032', '\034', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', -'/', 's', 't', 'r', 'u', 'c', 't', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', -'t', 'o', 'b', 'u', 'f', '/', 'w', 'r', 'a', 'p', 'p', 'e', 'r', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '\035', 'u', 'd', 'p', -'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', -'o', '\032', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', -'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', -'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '\250', '\001', '\n', '\006', 'F', 'i', 'l', 't', 'e', 'r', '\022', '\033', '\n', -'\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', 'm', -'e', '\022', '9', '\n', '\014', 't', 'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\004', ' ', '\001', '(', '\013', '2', '\024', -'.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'H', '\000', 'R', '\013', 't', -'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', ':', '#', '\232', '\305', '\210', '\036', '\036', '\n', '\034', 'e', 'n', 'v', 'o', 'y', '.', -'a', 'p', 'i', '.', 'v', '2', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'F', 'i', 'l', 't', 'e', 'r', 'B', '\r', '\n', -'\013', 'c', 'o', 'n', 'f', 'i', 'g', '_', 't', 'y', 'p', 'e', 'J', '\004', '\010', '\003', '\020', '\004', 'J', '\004', '\010', '\002', '\020', '\003', 'R', -'\006', 'c', 'o', 'n', 'f', 'i', 'g', '\"', '\212', '\006', '\n', '\020', 'F', 'i', 'l', 't', 'e', 'r', 'C', 'h', 'a', 'i', 'n', 'M', 'a', -'t', 'c', 'h', '\022', 'T', '\n', '\020', 'd', 'e', 's', 't', 'i', 'n', 'a', 't', 'i', 'o', 'n', '_', 'p', 'o', 'r', 't', '\030', '\010', -' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', -'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\013', '\372', 'B', '\010', '*', '\006', '\030', '\377', '\377', '\003', '(', '\001', 'R', '\017', 'd', -'e', 's', 't', 'i', 'n', 'a', 't', 'i', 'o', 'n', 'P', 'o', 'r', 't', '\022', 'D', '\n', '\r', 'p', 'r', 'e', 'f', 'i', 'x', '_', -'r', 'a', 'n', 'g', 'e', 's', '\030', '\003', ' ', '\003', '(', '\013', '2', '\037', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', -'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'C', 'i', 'd', 'r', 'R', 'a', 'n', 'g', 'e', 'R', '\014', 'p', 'r', 'e', -'f', 'i', 'x', 'R', 'a', 'n', 'g', 'e', 's', '\022', '%', '\n', '\016', 'a', 'd', 'd', 'r', 'e', 's', 's', '_', 's', 'u', 'f', 'f', -'i', 'x', '\030', '\004', ' ', '\001', '(', '\t', 'R', '\r', 'a', 'd', 'd', 'r', 'e', 's', 's', 'S', 'u', 'f', 'f', 'i', 'x', '\022', ';', -'\n', '\n', 's', 'u', 'f', 'f', 'i', 'x', '_', 'l', 'e', 'n', '\030', '\005', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', -'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\t', -'s', 'u', 'f', 'f', 'i', 'x', 'L', 'e', 'n', '\022', 'j', '\n', '\013', 's', 'o', 'u', 'r', 'c', 'e', '_', 't', 'y', 'p', 'e', '\030', -'\014', ' ', '\001', '(', '\016', '2', '?', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'l', 'i', 's', 't', -'e', 'n', 'e', 'r', '.', 'v', '3', '.', 'F', 'i', 'l', 't', 'e', 'r', 'C', 'h', 'a', 'i', 'n', 'M', 'a', 't', 'c', 'h', '.', -'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'S', 'o', 'u', 'r', 'c', 'e', 'T', 'y', 'p', 'e', 'B', '\010', '\372', 'B', '\005', -'\202', '\001', '\002', '\020', '\001', 'R', '\n', 's', 'o', 'u', 'r', 'c', 'e', 'T', 'y', 'p', 'e', '\022', 'Q', '\n', '\024', 's', 'o', 'u', 'r', -'c', 'e', '_', 'p', 'r', 'e', 'f', 'i', 'x', '_', 'r', 'a', 'n', 'g', 'e', 's', '\030', '\006', ' ', '\003', '(', '\013', '2', '\037', '.', -'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'C', 'i', 'd', 'r', -'R', 'a', 'n', 'g', 'e', 'R', '\022', 's', 'o', 'u', 'r', 'c', 'e', 'P', 'r', 'e', 'f', 'i', 'x', 'R', 'a', 'n', 'g', 'e', 's', -'\022', '3', '\n', '\014', 's', 'o', 'u', 'r', 'c', 'e', '_', 'p', 'o', 'r', 't', 's', '\030', '\007', ' ', '\003', '(', '\r', 'B', '\020', '\372', -'B', '\r', '\222', '\001', '\n', '\"', '\010', '*', '\006', '\030', '\377', '\377', '\003', '(', '\001', 'R', '\013', 's', 'o', 'u', 'r', 'c', 'e', 'P', 'o', -'r', 't', 's', '\022', '!', '\n', '\014', 's', 'e', 'r', 'v', 'e', 'r', '_', 'n', 'a', 'm', 'e', 's', '\030', '\013', ' ', '\003', '(', '\t', -'R', '\013', 's', 'e', 'r', 'v', 'e', 'r', 'N', 'a', 'm', 'e', 's', '\022', '-', '\n', '\022', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', -'t', '_', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '\030', '\t', ' ', '\001', '(', '\t', 'R', '\021', 't', 'r', 'a', 'n', 's', 'p', 'o', -'r', 't', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', '\022', '3', '\n', '\025', 'a', 'p', 'p', 'l', 'i', 'c', 'a', 't', 'i', 'o', 'n', -'_', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', 's', '\030', '\n', ' ', '\003', '(', '\t', 'R', '\024', 'a', 'p', 'p', 'l', 'i', 'c', 'a', -'t', 'i', 'o', 'n', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 's', '\"', 'F', '\n', '\024', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', -'o', 'n', 'S', 'o', 'u', 'r', 'c', 'e', 'T', 'y', 'p', 'e', '\022', '\007', '\n', '\003', 'A', 'N', 'Y', '\020', '\000', '\022', '\027', '\n', '\023', -'S', 'A', 'M', 'E', '_', 'I', 'P', '_', 'O', 'R', '_', 'L', 'O', 'O', 'P', 'B', 'A', 'C', 'K', '\020', '\001', '\022', '\014', '\n', '\010', -'E', 'X', 'T', 'E', 'R', 'N', 'A', 'L', '\020', '\002', ':', '-', '\232', '\305', '\210', '\036', '(', '\n', '&', 'e', 'n', 'v', 'o', 'y', '.', -'a', 'p', 'i', '.', 'v', '2', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'F', 'i', 'l', 't', 'e', 'r', 'C', 'h', 'a', -'i', 'n', 'M', 'a', 't', 'c', 'h', 'J', '\004', '\010', '\001', '\020', '\002', '\"', '\230', '\005', '\n', '\013', 'F', 'i', 'l', 't', 'e', 'r', 'C', -'h', 'a', 'i', 'n', '\022', 'X', '\n', '\022', 'f', 'i', 'l', 't', 'e', 'r', '_', 'c', 'h', 'a', 'i', 'n', '_', 'm', 'a', 't', 'c', -'h', '\030', '\001', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'l', 'i', -'s', 't', 'e', 'n', 'e', 'r', '.', 'v', '3', '.', 'F', 'i', 'l', 't', 'e', 'r', 'C', 'h', 'a', 'i', 'n', 'M', 'a', 't', 'c', -'h', 'R', '\020', 'f', 'i', 'l', 't', 'e', 'r', 'C', 'h', 'a', 'i', 'n', 'M', 'a', 't', 'c', 'h', '\022', ':', '\n', '\007', 'f', 'i', -'l', 't', 'e', 'r', 's', '\030', '\003', ' ', '\003', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', -'g', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'v', '3', '.', 'F', 'i', 'l', 't', 'e', 'r', 'R', '\007', 'f', 'i', 'l', -'t', 'e', 'r', 's', '\022', 'B', '\n', '\017', 'u', 's', 'e', '_', 'p', 'r', 'o', 'x', 'y', '_', 'p', 'r', 'o', 't', 'o', '\030', '\004', -' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', -'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\r', 'u', 's', 'e', 'P', 'r', 'o', 'x', 'y', 'P', 'r', 'o', 't', 'o', '\022', ':', '\n', -'\010', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '\030', '\005', ' ', '\001', '(', '\013', '2', '\036', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', -'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'R', '\010', 'm', -'e', 't', 'a', 'd', 'a', 't', 'a', '\022', 'P', '\n', '\020', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', -'e', 't', '\030', '\006', ' ', '\001', '(', '\013', '2', '%', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', -'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', 'S', 'o', 'c', 'k', 'e', 't', 'R', '\017', 't', -'r', 'a', 'n', 's', 'p', 'o', 'r', 't', 'S', 'o', 'c', 'k', 'e', 't', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\007', ' ', -'\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', 's', '\n', '\027', 'o', 'n', '_', 'd', 'e', 'm', 'a', 'n', 'd', '_', 'c', 'o', -'n', 'f', 'i', 'g', 'u', 'r', 'a', 't', 'i', 'o', 'n', '\030', '\010', ' ', '\001', '(', '\013', '2', ';', '.', 'e', 'n', 'v', 'o', 'y', -'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'v', '3', '.', 'F', 'i', 'l', 't', 'e', -'r', 'C', 'h', 'a', 'i', 'n', '.', 'O', 'n', 'D', 'e', 'm', 'a', 'n', 'd', 'C', 'o', 'n', 'f', 'i', 'g', 'u', 'r', 'a', 't', -'i', 'o', 'n', 'R', '\025', 'o', 'n', 'D', 'e', 'm', 'a', 'n', 'd', 'C', 'o', 'n', 'f', 'i', 'g', 'u', 'r', 'a', 't', 'i', 'o', -'n', '\032', '[', '\n', '\025', 'O', 'n', 'D', 'e', 'm', 'a', 'n', 'd', 'C', 'o', 'n', 'f', 'i', 'g', 'u', 'r', 'a', 't', 'i', 'o', -'n', '\022', 'B', '\n', '\017', 'r', 'e', 'b', 'u', 'i', 'l', 'd', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\001', ' ', '\001', '(', -'\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', -'i', 'o', 'n', 'R', '\016', 'r', 'e', 'b', 'u', 'i', 'l', 'd', 'T', 'i', 'm', 'e', 'o', 'u', 't', ':', '(', '\232', '\305', '\210', '\036', -'#', '\n', '!', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', -'F', 'i', 'l', 't', 'e', 'r', 'C', 'h', 'a', 'i', 'n', 'J', '\004', '\010', '\002', '\020', '\003', 'R', '\013', 't', 'l', 's', '_', 'c', 'o', -'n', 't', 'e', 'x', 't', '\"', '\302', '\005', '\n', '!', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 'F', 'i', 'l', 't', 'e', 'r', 'C', -'h', 'a', 'i', 'n', 'M', 'a', 't', 'c', 'h', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', '\022', 'a', '\n', '\010', 'o', 'r', '_', -'m', 'a', 't', 'c', 'h', '\030', '\001', ' ', '\001', '(', '\013', '2', 'D', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', -'g', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'v', '3', '.', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 'F', 'i', 'l', -'t', 'e', 'r', 'C', 'h', 'a', 'i', 'n', 'M', 'a', 't', 'c', 'h', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', '.', 'M', 'a', -'t', 'c', 'h', 'S', 'e', 't', 'H', '\000', 'R', '\007', 'o', 'r', 'M', 'a', 't', 'c', 'h', '\022', 'c', '\n', '\t', 'a', 'n', 'd', '_', -'m', 'a', 't', 'c', 'h', '\030', '\002', ' ', '\001', '(', '\013', '2', 'D', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', -'g', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'v', '3', '.', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 'F', 'i', 'l', -'t', 'e', 'r', 'C', 'h', 'a', 'i', 'n', 'M', 'a', 't', 'c', 'h', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', '.', 'M', 'a', -'t', 'c', 'h', 'S', 'e', 't', 'H', '\000', 'R', '\010', 'a', 'n', 'd', 'M', 'a', 't', 'c', 'h', '\022', 'Z', '\n', '\t', 'n', 'o', 't', -'_', 'm', 'a', 't', 'c', 'h', '\030', '\003', ' ', '\001', '(', '\013', '2', ';', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', -'i', 'g', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'v', '3', '.', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 'F', 'i', -'l', 't', 'e', 'r', 'C', 'h', 'a', 'i', 'n', 'M', 'a', 't', 'c', 'h', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 'H', '\000', -'R', '\010', 'n', 'o', 't', 'M', 'a', 't', 'c', 'h', '\022', '&', '\n', '\t', 'a', 'n', 'y', '_', 'm', 'a', 't', 'c', 'h', '\030', '\004', -' ', '\001', '(', '\010', 'B', '\007', '\372', 'B', '\004', 'j', '\002', '\010', '\001', 'H', '\000', 'R', '\010', 'a', 'n', 'y', 'M', 'a', 't', 'c', 'h', -'\022', 'Q', '\n', '\026', 'd', 'e', 's', 't', 'i', 'n', 'a', 't', 'i', 'o', 'n', '_', 'p', 'o', 'r', 't', '_', 'r', 'a', 'n', 'g', -'e', '\030', '\005', ' ', '\001', '(', '\013', '2', '\031', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'I', -'n', 't', '3', '2', 'R', 'a', 'n', 'g', 'e', 'H', '\000', 'R', '\024', 'd', 'e', 's', 't', 'i', 'n', 'a', 't', 'i', 'o', 'n', 'P', -'o', 'r', 't', 'R', 'a', 'n', 'g', 'e', '\032', '\260', '\001', '\n', '\010', 'M', 'a', 't', 'c', 'h', 'S', 'e', 't', '\022', '[', '\n', '\005', -'r', 'u', 'l', 'e', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', ';', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', -'g', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'v', '3', '.', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 'F', 'i', 'l', -'t', 'e', 'r', 'C', 'h', 'a', 'i', 'n', 'M', 'a', 't', 'c', 'h', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 'B', '\010', '\372', -'B', '\005', '\222', '\001', '\002', '\010', '\002', 'R', '\005', 'r', 'u', 'l', 'e', 's', ':', 'G', '\232', '\305', '\210', '\036', 'B', '\n', '@', 'e', 'n', +'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'b', 'a', 's', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', '$', 'e', +'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'e', 'x', 't', 'e', 'n', +'s', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\032', '\031', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'v', '3', +'/', 'r', 'a', 'n', 'g', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', '\031', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', +'o', 'b', 'u', 'f', '/', 'a', 'n', 'y', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', +'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', +'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'w', 'r', 'a', 'p', 'p', 'e', 'r', 's', '.', 'p', 'r', +'o', 't', 'o', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', +'t', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', +'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', 'l', 'i', +'d', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '\202', '\002', '\n', '\006', 'F', +'i', 'l', 't', 'e', 'r', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', +'\002', '\020', '\001', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '9', '\n', '\014', 't', 'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', +'\030', '\004', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', +'A', 'n', 'y', 'H', '\000', 'R', '\013', 't', 'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'X', '\n', '\020', 'c', 'o', 'n', +'f', 'i', 'g', '_', 'd', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', '\030', '\005', ' ', '\001', '(', '\013', '2', '+', '.', 'e', 'n', 'v', +'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'E', 'x', 't', 'e', 'n', 's', 'i', +'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', 'H', '\000', 'R', '\017', 'c', 'o', 'n', 'f', 'i', 'g', 'D', +'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', ':', '#', '\232', '\305', '\210', '\036', '\036', '\n', '\034', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', +'i', '.', 'v', '2', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'F', 'i', 'l', 't', 'e', 'r', 'B', '\r', '\n', '\013', 'c', +'o', 'n', 'f', 'i', 'g', '_', 't', 'y', 'p', 'e', 'J', '\004', '\010', '\003', '\020', '\004', 'J', '\004', '\010', '\002', '\020', '\003', 'R', '\006', 'c', +'o', 'n', 'f', 'i', 'g', '\"', '\212', '\006', '\n', '\020', 'F', 'i', 'l', 't', 'e', 'r', 'C', 'h', 'a', 'i', 'n', 'M', 'a', 't', 'c', +'h', '\022', 'T', '\n', '\020', 'd', 'e', 's', 't', 'i', 'n', 'a', 't', 'i', 'o', 'n', '_', 'p', 'o', 'r', 't', '\030', '\010', ' ', '\001', +'(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', +'3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\013', '\372', 'B', '\010', '*', '\006', '\030', '\377', '\377', '\003', '(', '\001', 'R', '\017', 'd', 'e', 's', +'t', 'i', 'n', 'a', 't', 'i', 'o', 'n', 'P', 'o', 'r', 't', '\022', 'D', '\n', '\r', 'p', 'r', 'e', 'f', 'i', 'x', '_', 'r', 'a', +'n', 'g', 'e', 's', '\030', '\003', ' ', '\003', '(', '\013', '2', '\037', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', +'.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'C', 'i', 'd', 'r', 'R', 'a', 'n', 'g', 'e', 'R', '\014', 'p', 'r', 'e', 'f', 'i', +'x', 'R', 'a', 'n', 'g', 'e', 's', '\022', '%', '\n', '\016', 'a', 'd', 'd', 'r', 'e', 's', 's', '_', 's', 'u', 'f', 'f', 'i', 'x', +'\030', '\004', ' ', '\001', '(', '\t', 'R', '\r', 'a', 'd', 'd', 'r', 'e', 's', 's', 'S', 'u', 'f', 'f', 'i', 'x', '\022', ';', '\n', '\n', +'s', 'u', 'f', 'f', 'i', 'x', '_', 'l', 'e', 'n', '\030', '\005', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', +'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\t', 's', 'u', +'f', 'f', 'i', 'x', 'L', 'e', 'n', '\022', 'j', '\n', '\013', 's', 'o', 'u', 'r', 'c', 'e', '_', 't', 'y', 'p', 'e', '\030', '\014', ' ', +'\001', '(', '\016', '2', '?', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'l', 'i', 's', 't', 'e', 'n', +'e', 'r', '.', 'v', '3', '.', 'F', 'i', 'l', 't', 'e', 'r', 'C', 'h', 'a', 'i', 'n', 'M', 'a', 't', 'c', 'h', '.', 'C', 'o', +'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'S', 'o', 'u', 'r', 'c', 'e', 'T', 'y', 'p', 'e', 'B', '\010', '\372', 'B', '\005', '\202', '\001', +'\002', '\020', '\001', 'R', '\n', 's', 'o', 'u', 'r', 'c', 'e', 'T', 'y', 'p', 'e', '\022', 'Q', '\n', '\024', 's', 'o', 'u', 'r', 'c', 'e', +'_', 'p', 'r', 'e', 'f', 'i', 'x', '_', 'r', 'a', 'n', 'g', 'e', 's', '\030', '\006', ' ', '\003', '(', '\013', '2', '\037', '.', 'e', 'n', +'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'C', 'i', 'd', 'r', 'R', 'a', +'n', 'g', 'e', 'R', '\022', 's', 'o', 'u', 'r', 'c', 'e', 'P', 'r', 'e', 'f', 'i', 'x', 'R', 'a', 'n', 'g', 'e', 's', '\022', '3', +'\n', '\014', 's', 'o', 'u', 'r', 'c', 'e', '_', 'p', 'o', 'r', 't', 's', '\030', '\007', ' ', '\003', '(', '\r', 'B', '\020', '\372', 'B', '\r', +'\222', '\001', '\n', '\"', '\010', '*', '\006', '\030', '\377', '\377', '\003', '(', '\001', 'R', '\013', 's', 'o', 'u', 'r', 'c', 'e', 'P', 'o', 'r', 't', +'s', '\022', '!', '\n', '\014', 's', 'e', 'r', 'v', 'e', 'r', '_', 'n', 'a', 'm', 'e', 's', '\030', '\013', ' ', '\003', '(', '\t', 'R', '\013', +'s', 'e', 'r', 'v', 'e', 'r', 'N', 'a', 'm', 'e', 's', '\022', '-', '\n', '\022', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', +'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '\030', '\t', ' ', '\001', '(', '\t', 'R', '\021', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', +'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', '\022', '3', '\n', '\025', 'a', 'p', 'p', 'l', 'i', 'c', 'a', 't', 'i', 'o', 'n', '_', 'p', +'r', 'o', 't', 'o', 'c', 'o', 'l', 's', '\030', '\n', ' ', '\003', '(', '\t', 'R', '\024', 'a', 'p', 'p', 'l', 'i', 'c', 'a', 't', 'i', +'o', 'n', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 's', '\"', 'F', '\n', '\024', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', +'S', 'o', 'u', 'r', 'c', 'e', 'T', 'y', 'p', 'e', '\022', '\007', '\n', '\003', 'A', 'N', 'Y', '\020', '\000', '\022', '\027', '\n', '\023', 'S', 'A', +'M', 'E', '_', 'I', 'P', '_', 'O', 'R', '_', 'L', 'O', 'O', 'P', 'B', 'A', 'C', 'K', '\020', '\001', '\022', '\014', '\n', '\010', 'E', 'X', +'T', 'E', 'R', 'N', 'A', 'L', '\020', '\002', ':', '-', '\232', '\305', '\210', '\036', '(', '\n', '&', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', +'i', '.', 'v', '2', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'F', 'i', 'l', 't', 'e', 'r', 'C', 'h', 'a', 'i', 'n', +'M', 'a', 't', 'c', 'h', 'J', '\004', '\010', '\001', '\020', '\002', '\"', '\200', '\006', '\n', '\013', 'F', 'i', 'l', 't', 'e', 'r', 'C', 'h', 'a', +'i', 'n', '\022', 'X', '\n', '\022', 'f', 'i', 'l', 't', 'e', 'r', '_', 'c', 'h', 'a', 'i', 'n', '_', 'm', 'a', 't', 'c', 'h', '\030', +'\001', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'l', 'i', 's', 't', +'e', 'n', 'e', 'r', '.', 'v', '3', '.', 'F', 'i', 'l', 't', 'e', 'r', 'C', 'h', 'a', 'i', 'n', 'M', 'a', 't', 'c', 'h', 'R', +'\020', 'f', 'i', 'l', 't', 'e', 'r', 'C', 'h', 'a', 'i', 'n', 'M', 'a', 't', 'c', 'h', '\022', ':', '\n', '\007', 'f', 'i', 'l', 't', +'e', 'r', 's', '\030', '\003', ' ', '\003', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', +'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'v', '3', '.', 'F', 'i', 'l', 't', 'e', 'r', 'R', '\007', 'f', 'i', 'l', 't', 'e', +'r', 's', '\022', 'F', '\n', '\017', 'u', 's', 'e', '_', 'p', 'r', 'o', 'x', 'y', '_', 'p', 'r', 'o', 't', 'o', '\030', '\004', ' ', '\001', +'(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', +'V', 'a', 'l', 'u', 'e', 'B', '\002', '\030', '\001', 'R', '\r', 'u', 's', 'e', 'P', 'r', 'o', 'x', 'y', 'P', 'r', 'o', 't', 'o', '\022', +':', '\n', '\010', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '\030', '\005', ' ', '\001', '(', '\013', '2', '\036', '.', 'e', 'n', 'v', 'o', 'y', +'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'R', +'\010', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '\022', 'P', '\n', '\020', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', +'c', 'k', 'e', 't', '\030', '\006', ' ', '\001', '(', '\013', '2', '%', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', +'.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', 'S', 'o', 'c', 'k', 'e', 't', 'R', +'\017', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', 'S', 'o', 'c', 'k', 'e', 't', '\022', 'b', '\n', ' ', 't', 'r', 'a', 'n', 's', +'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', '_', 't', 'i', 'm', 'e', 'o', +'u', 't', '\030', '\t', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', +'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\035', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', 'S', 'o', 'c', 'k', +'e', 't', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'T', 'i', 'm', 'e', 'o', 'u', 't', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', +'\007', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', 's', '\n', '\027', 'o', 'n', '_', 'd', 'e', 'm', 'a', 'n', 'd', '_', +'c', 'o', 'n', 'f', 'i', 'g', 'u', 'r', 'a', 't', 'i', 'o', 'n', '\030', '\010', ' ', '\001', '(', '\013', '2', ';', '.', 'e', 'n', 'v', +'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'v', '3', '.', 'F', 'i', 'l', +'t', 'e', 'r', 'C', 'h', 'a', 'i', 'n', '.', 'O', 'n', 'D', 'e', 'm', 'a', 'n', 'd', 'C', 'o', 'n', 'f', 'i', 'g', 'u', 'r', +'a', 't', 'i', 'o', 'n', 'R', '\025', 'o', 'n', 'D', 'e', 'm', 'a', 'n', 'd', 'C', 'o', 'n', 'f', 'i', 'g', 'u', 'r', 'a', 't', +'i', 'o', 'n', '\032', '[', '\n', '\025', 'O', 'n', 'D', 'e', 'm', 'a', 'n', 'd', 'C', 'o', 'n', 'f', 'i', 'g', 'u', 'r', 'a', 't', +'i', 'o', 'n', '\022', 'B', '\n', '\017', 'r', 'e', 'b', 'u', 'i', 'l', 'd', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\001', ' ', +'\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', +'a', 't', 'i', 'o', 'n', 'R', '\016', 'r', 'e', 'b', 'u', 'i', 'l', 'd', 'T', 'i', 'm', 'e', 'o', 'u', 't', ':', '(', '\232', '\305', +'\210', '\036', '#', '\n', '!', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', +'r', '.', 'F', 'i', 'l', 't', 'e', 'r', 'C', 'h', 'a', 'i', 'n', 'J', '\004', '\010', '\002', '\020', '\003', 'R', '\013', 't', 'l', 's', '_', +'c', 'o', 'n', 't', 'e', 'x', 't', '\"', '\302', '\005', '\n', '!', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 'F', 'i', 'l', 't', 'e', +'r', 'C', 'h', 'a', 'i', 'n', 'M', 'a', 't', 'c', 'h', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', '\022', 'a', '\n', '\010', 'o', +'r', '_', 'm', 'a', 't', 'c', 'h', '\030', '\001', ' ', '\001', '(', '\013', '2', 'D', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', +'f', 'i', 'g', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'v', '3', '.', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 'F', +'i', 'l', 't', 'e', 'r', 'C', 'h', 'a', 'i', 'n', 'M', 'a', 't', 'c', 'h', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', '.', +'M', 'a', 't', 'c', 'h', 'S', 'e', 't', 'H', '\000', 'R', '\007', 'o', 'r', 'M', 'a', 't', 'c', 'h', '\022', 'c', '\n', '\t', 'a', 'n', +'d', '_', 'm', 'a', 't', 'c', 'h', '\030', '\002', ' ', '\001', '(', '\013', '2', 'D', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', +'f', 'i', 'g', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'v', '3', '.', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 'F', +'i', 'l', 't', 'e', 'r', 'C', 'h', 'a', 'i', 'n', 'M', 'a', 't', 'c', 'h', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', '.', +'M', 'a', 't', 'c', 'h', 'S', 'e', 't', 'H', '\000', 'R', '\010', 'a', 'n', 'd', 'M', 'a', 't', 'c', 'h', '\022', 'Z', '\n', '\t', 'n', +'o', 't', '_', 'm', 'a', 't', 'c', 'h', '\030', '\003', ' ', '\001', '(', '\013', '2', ';', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', +'n', 'f', 'i', 'g', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'v', '3', '.', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', +'F', 'i', 'l', 't', 'e', 'r', 'C', 'h', 'a', 'i', 'n', 'M', 'a', 't', 'c', 'h', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', +'H', '\000', 'R', '\010', 'n', 'o', 't', 'M', 'a', 't', 'c', 'h', '\022', '&', '\n', '\t', 'a', 'n', 'y', '_', 'm', 'a', 't', 'c', 'h', +'\030', '\004', ' ', '\001', '(', '\010', 'B', '\007', '\372', 'B', '\004', 'j', '\002', '\010', '\001', 'H', '\000', 'R', '\010', 'a', 'n', 'y', 'M', 'a', 't', +'c', 'h', '\022', 'Q', '\n', '\026', 'd', 'e', 's', 't', 'i', 'n', 'a', 't', 'i', 'o', 'n', '_', 'p', 'o', 'r', 't', '_', 'r', 'a', +'n', 'g', 'e', '\030', '\005', ' ', '\001', '(', '\013', '2', '\031', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', +'.', 'I', 'n', 't', '3', '2', 'R', 'a', 'n', 'g', 'e', 'H', '\000', 'R', '\024', 'd', 'e', 's', 't', 'i', 'n', 'a', 't', 'i', 'o', +'n', 'P', 'o', 'r', 't', 'R', 'a', 'n', 'g', 'e', '\032', '\260', '\001', '\n', '\010', 'M', 'a', 't', 'c', 'h', 'S', 'e', 't', '\022', '[', +'\n', '\005', 'r', 'u', 'l', 'e', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', ';', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', +'f', 'i', 'g', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'v', '3', '.', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 'F', +'i', 'l', 't', 'e', 'r', 'C', 'h', 'a', 'i', 'n', 'M', 'a', 't', 'c', 'h', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 'B', +'\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\002', 'R', '\005', 'r', 'u', 'l', 'e', 's', ':', 'G', '\232', '\305', '\210', '\036', 'B', '\n', '@', +'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'L', 'i', 's', +'t', 'e', 'n', 'e', 'r', 'F', 'i', 'l', 't', 'e', 'r', 'C', 'h', 'a', 'i', 'n', 'M', 'a', 't', 'c', 'h', 'P', 'r', 'e', 'd', +'i', 'c', 'a', 't', 'e', '.', 'M', 'a', 't', 'c', 'h', 'S', 'e', 't', ':', '>', '\232', '\305', '\210', '\036', '9', '\n', '7', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 'F', 'i', 'l', 't', 'e', 'r', 'C', 'h', 'a', 'i', 'n', 'M', 'a', 't', 'c', 'h', 'P', 'r', 'e', 'd', 'i', 'c', -'a', 't', 'e', '.', 'M', 'a', 't', 'c', 'h', 'S', 'e', 't', ':', '>', '\232', '\305', '\210', '\036', '9', '\n', '7', 'e', 'n', 'v', 'o', -'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'L', 'i', 's', 't', 'e', 'n', 'e', -'r', 'F', 'i', 'l', 't', 'e', 'r', 'C', 'h', 'a', 'i', 'n', 'M', 'a', 't', 'c', 'h', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', -'e', 'B', '\013', '\n', '\004', 'r', 'u', 'l', 'e', '\022', '\003', '\370', 'B', '\001', '\"', '\230', '\002', '\n', '\016', 'L', 'i', 's', 't', 'e', 'n', -'e', 'r', 'F', 'i', 'l', 't', 'e', 'r', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', -'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '9', '\n', '\014', 't', 'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', -'f', 'i', 'g', '\030', '\003', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', -'u', 'f', '.', 'A', 'n', 'y', 'H', '\000', 'R', '\013', 't', 'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'd', '\n', '\017', -'f', 'i', 'l', 't', 'e', 'r', '_', 'd', 'i', 's', 'a', 'b', 'l', 'e', 'd', '\030', '\004', ' ', '\001', '(', '\013', '2', ';', '.', 'e', -'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'v', '3', '.', 'L', -'i', 's', 't', 'e', 'n', 'e', 'r', 'F', 'i', 'l', 't', 'e', 'r', 'C', 'h', 'a', 'i', 'n', 'M', 'a', 't', 'c', 'h', 'P', 'r', -'e', 'd', 'i', 'c', 'a', 't', 'e', 'R', '\016', 'f', 'i', 'l', 't', 'e', 'r', 'D', 'i', 's', 'a', 'b', 'l', 'e', 'd', ':', '+', -'\232', '\305', '\210', '\036', '&', '\n', '$', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'l', 'i', 's', 't', 'e', -'n', 'e', 'r', '.', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 'F', 'i', 'l', 't', 'e', 'r', 'B', '\r', '\n', '\013', 'c', 'o', 'n', -'f', 'i', 'g', '_', 't', 'y', 'p', 'e', 'J', '\004', '\010', '\002', '\020', '\003', 'R', '\006', 'c', 'o', 'n', 'f', 'i', 'g', 'B', 'K', '\n', -'&', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', -'i', 'g', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'v', '3', 'B', '\027', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 'C', -'o', 'm', 'p', 'o', 'n', 'e', 'n', 't', 's', 'P', 'r', 'o', 't', 'o', 'P', '\001', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', -'\006', 'p', 'r', 'o', 't', 'o', '3', +'a', 't', 'e', 'B', '\013', '\n', '\004', 'r', 'u', 'l', 'e', '\022', '\003', '\370', 'B', '\001', '\"', '\230', '\002', '\n', '\016', 'L', 'i', 's', 't', +'e', 'n', 'e', 'r', 'F', 'i', 'l', 't', 'e', 'r', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', +'\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '9', '\n', '\014', 't', 'y', 'p', 'e', 'd', '_', 'c', +'o', 'n', 'f', 'i', 'g', '\030', '\003', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', +'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'H', '\000', 'R', '\013', 't', 'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'd', +'\n', '\017', 'f', 'i', 'l', 't', 'e', 'r', '_', 'd', 'i', 's', 'a', 'b', 'l', 'e', 'd', '\030', '\004', ' ', '\001', '(', '\013', '2', ';', +'.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'v', '3', +'.', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 'F', 'i', 'l', 't', 'e', 'r', 'C', 'h', 'a', 'i', 'n', 'M', 'a', 't', 'c', 'h', +'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 'R', '\016', 'f', 'i', 'l', 't', 'e', 'r', 'D', 'i', 's', 'a', 'b', 'l', 'e', 'd', +':', '+', '\232', '\305', '\210', '\036', '&', '\n', '$', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'l', 'i', 's', +'t', 'e', 'n', 'e', 'r', '.', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 'F', 'i', 'l', 't', 'e', 'r', 'B', '\r', '\n', '\013', 'c', +'o', 'n', 'f', 'i', 'g', '_', 't', 'y', 'p', 'e', 'J', '\004', '\010', '\002', '\020', '\003', 'R', '\006', 'c', 'o', 'n', 'f', 'i', 'g', 'B', +'K', '\n', '&', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', +'n', 'f', 'i', 'g', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'v', '3', 'B', '\027', 'L', 'i', 's', 't', 'e', 'n', 'e', +'r', 'C', 'o', 'm', 'p', 'o', 'n', 'e', 'n', 't', 's', 'P', 'r', 'o', 't', 'o', 'P', '\001', '\272', '\200', '\310', '\321', '\006', '\002', '\020', +'\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; static upb_def_init *deps[11] = { &envoy_config_core_v3_address_proto_upbdefinit, &envoy_config_core_v3_base_proto_upbdefinit, + &envoy_config_core_v3_extension_proto_upbdefinit, &envoy_type_v3_range_proto_upbdefinit, &google_protobuf_any_proto_upbdefinit, &google_protobuf_duration_proto_upbdefinit, - &google_protobuf_struct_proto_upbdefinit, &google_protobuf_wrappers_proto_upbdefinit, &udpa_annotations_status_proto_upbdefinit, &udpa_annotations_versioning_proto_upbdefinit, @@ -181,5 +189,5 @@ upb_def_init envoy_config_listener_v3_listener_components_proto_upbdefinit = { deps, layouts, "envoy/config/listener/v3/listener_components.proto", - UPB_STRVIEW_INIT(descriptor, 3082) + UPB_STRVIEW_INIT(descriptor, 3284) }; diff --git a/grpc/src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.c b/grpc/src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.c index 6d607cd4..525a38a5 100644 --- a/grpc/src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.c +++ b/grpc/src/core/ext/upbdefs-generated/envoy/config/listener/v3/udp_listener_config.upbdefs.c @@ -10,7 +10,6 @@ #include "envoy/config/listener/v3/udp_listener_config.upbdefs.h" extern upb_def_init google_protobuf_any_proto_upbdefinit; -extern upb_def_init google_protobuf_struct_proto_upbdefinit; extern upb_def_init udpa_annotations_status_proto_upbdefinit; extern upb_def_init udpa_annotations_versioning_proto_upbdefinit; extern const upb_msglayout envoy_config_listener_v3_UdpListenerConfig_msginit; @@ -21,34 +20,32 @@ static const upb_msglayout *layouts[2] = { &envoy_config_listener_v3_ActiveRawUdpListenerConfig_msginit, }; -static const char descriptor[574] = {'\n', '2', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '/', 'v', +static const char descriptor[544] = {'\n', '2', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '/', 'v', '3', '/', 'u', 'd', 'p', '_', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '_', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'p', 'r', 'o', 't', 'o', '\022', '\030', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'v', '3', '\032', '\031', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'a', 'n', 'y', '.', -'p', 'r', 'o', 't', 'o', '\032', '\034', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 's', 't', -'r', 'u', 'c', 't', '.', 'p', 'r', 'o', 't', 'o', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', -'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', -'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', -'o', '\"', '\307', '\001', '\n', '\021', 'U', 'd', 'p', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '*', -'\n', '\021', 'u', 'd', 'p', '_', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '_', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', -'R', '\017', 'u', 'd', 'p', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 'N', 'a', 'm', 'e', '\022', '9', '\n', '\014', 't', 'y', 'p', 'e', -'d', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\003', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', -'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'H', '\000', 'R', '\013', 't', 'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', 'i', -'g', ':', '.', '\232', '\305', '\210', '\036', ')', '\n', '\'', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'l', 'i', -'s', 't', 'e', 'n', 'e', 'r', '.', 'U', 'd', 'p', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 'C', 'o', 'n', 'f', 'i', 'g', 'B', -'\r', '\n', '\013', 'c', 'o', 'n', 'f', 'i', 'g', '_', 't', 'y', 'p', 'e', 'J', '\004', '\010', '\002', '\020', '\003', 'R', '\006', 'c', 'o', 'n', -'f', 'i', 'g', '\"', 'U', '\n', '\032', 'A', 'c', 't', 'i', 'v', 'e', 'R', 'a', 'w', 'U', 'd', 'p', 'L', 'i', 's', 't', 'e', 'n', -'e', 'r', 'C', 'o', 'n', 'f', 'i', 'g', ':', '7', '\232', '\305', '\210', '\036', '2', '\n', '0', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', -'i', '.', 'v', '2', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'A', 'c', 't', 'i', 'v', 'e', 'R', 'a', 'w', 'U', 'd', -'p', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 'C', 'o', 'n', 'f', 'i', 'g', 'B', 'J', '\n', '&', 'i', 'o', '.', 'e', 'n', 'v', -'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'l', 'i', 's', 't', -'e', 'n', 'e', 'r', '.', 'v', '3', 'B', '\026', 'U', 'd', 'p', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 'C', 'o', 'n', 'f', 'i', -'g', 'P', 'r', 'o', 't', 'o', 'P', '\001', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +'p', 'r', 'o', 't', 'o', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', +'t', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', +'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\"', '\307', '\001', '\n', +'\021', 'U', 'd', 'p', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '*', '\n', '\021', 'u', 'd', 'p', +'_', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '_', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\017', 'u', 'd', 'p', +'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 'N', 'a', 'm', 'e', '\022', '9', '\n', '\014', 't', 'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', +'f', 'i', 'g', '\030', '\003', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', +'u', 'f', '.', 'A', 'n', 'y', 'H', '\000', 'R', '\013', 't', 'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', ':', '.', '\232', '\305', +'\210', '\036', ')', '\n', '\'', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', +'r', '.', 'U', 'd', 'p', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 'C', 'o', 'n', 'f', 'i', 'g', 'B', '\r', '\n', '\013', 'c', 'o', +'n', 'f', 'i', 'g', '_', 't', 'y', 'p', 'e', 'J', '\004', '\010', '\002', '\020', '\003', 'R', '\006', 'c', 'o', 'n', 'f', 'i', 'g', '\"', 'U', +'\n', '\032', 'A', 'c', 't', 'i', 'v', 'e', 'R', 'a', 'w', 'U', 'd', 'p', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 'C', 'o', 'n', +'f', 'i', 'g', ':', '7', '\232', '\305', '\210', '\036', '2', '\n', '0', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', +'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'A', 'c', 't', 'i', 'v', 'e', 'R', 'a', 'w', 'U', 'd', 'p', 'L', 'i', 's', 't', +'e', 'n', 'e', 'r', 'C', 'o', 'n', 'f', 'i', 'g', 'B', 'J', '\n', '&', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', +'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', +'v', '3', 'B', '\026', 'U', 'd', 'p', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 'C', 'o', 'n', 'f', 'i', 'g', 'P', 'r', 'o', 't', +'o', 'P', '\001', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; -static upb_def_init *deps[5] = { +static upb_def_init *deps[4] = { &google_protobuf_any_proto_upbdefinit, - &google_protobuf_struct_proto_upbdefinit, &udpa_annotations_status_proto_upbdefinit, &udpa_annotations_versioning_proto_upbdefinit, NULL @@ -58,5 +55,5 @@ upb_def_init envoy_config_listener_v3_udp_listener_config_proto_upbdefinit = { deps, layouts, "envoy/config/listener/v3/udp_listener_config.proto", - UPB_STRVIEW_INIT(descriptor, 574) + UPB_STRVIEW_INIT(descriptor, 544) }; diff --git a/grpc/src/core/ext/upbdefs-generated/envoy/config/metrics/v3/stats.upbdefs.c b/grpc/src/core/ext/upbdefs-generated/envoy/config/metrics/v3/stats.upbdefs.c new file mode 100644 index 00000000..e49149aa --- /dev/null +++ b/grpc/src/core/ext/upbdefs-generated/envoy/config/metrics/v3/stats.upbdefs.c @@ -0,0 +1,141 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * envoy/config/metrics/v3/stats.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#include "upb/def.h" +#include "envoy/config/metrics/v3/stats.upbdefs.h" + +extern upb_def_init envoy_config_core_v3_address_proto_upbdefinit; +extern upb_def_init envoy_type_matcher_v3_string_proto_upbdefinit; +extern upb_def_init google_protobuf_any_proto_upbdefinit; +extern upb_def_init google_protobuf_wrappers_proto_upbdefinit; +extern upb_def_init udpa_annotations_status_proto_upbdefinit; +extern upb_def_init udpa_annotations_versioning_proto_upbdefinit; +extern upb_def_init validate_validate_proto_upbdefinit; +extern const upb_msglayout envoy_config_metrics_v3_StatsSink_msginit; +extern const upb_msglayout envoy_config_metrics_v3_StatsConfig_msginit; +extern const upb_msglayout envoy_config_metrics_v3_StatsMatcher_msginit; +extern const upb_msglayout envoy_config_metrics_v3_TagSpecifier_msginit; +extern const upb_msglayout envoy_config_metrics_v3_HistogramBucketSettings_msginit; +extern const upb_msglayout envoy_config_metrics_v3_StatsdSink_msginit; +extern const upb_msglayout envoy_config_metrics_v3_DogStatsdSink_msginit; +extern const upb_msglayout envoy_config_metrics_v3_HystrixSink_msginit; + +static const upb_msglayout *layouts[8] = { + &envoy_config_metrics_v3_StatsSink_msginit, + &envoy_config_metrics_v3_StatsConfig_msginit, + &envoy_config_metrics_v3_StatsMatcher_msginit, + &envoy_config_metrics_v3_TagSpecifier_msginit, + &envoy_config_metrics_v3_HistogramBucketSettings_msginit, + &envoy_config_metrics_v3_StatsdSink_msginit, + &envoy_config_metrics_v3_DogStatsdSink_msginit, + &envoy_config_metrics_v3_HystrixSink_msginit, +}; + +static const char descriptor[2091] = {'\n', '#', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'm', 'e', 't', 'r', 'i', 'c', 's', '/', 'v', '3', +'/', 's', 't', 'a', 't', 's', '.', 'p', 'r', 'o', 't', 'o', '\022', '\027', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', +'g', '.', 'm', 'e', 't', 'r', 'i', 'c', 's', '.', 'v', '3', '\032', '\"', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', +'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'a', 'd', 'd', 'r', 'e', 's', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '\"', +'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 's', 't', 'r', +'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\031', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', +'f', '/', 'a', 'n', 'y', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', +'b', 'u', 'f', '/', 'w', 'r', 'a', 'p', 'p', 'e', 'r', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '\035', 'u', 'd', 'p', 'a', '/', +'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', +'!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', +'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', +'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '\241', '\001', '\n', '\t', 'S', 't', 'a', 't', 's', 'S', 'i', 'n', 'k', '\022', '\022', +'\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '9', '\n', '\014', 't', 'y', 'p', +'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\003', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', +'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'H', '\000', 'R', '\013', 't', 'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', +'i', 'g', ':', '(', '\232', '\305', '\210', '\036', '#', '\n', '!', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'm', +'e', 't', 'r', 'i', 'c', 's', '.', 'v', '2', '.', 'S', 't', 'a', 't', 's', 'S', 'i', 'n', 'k', 'B', '\r', '\n', '\013', 'c', 'o', +'n', 'f', 'i', 'g', '_', 't', 'y', 'p', 'e', 'J', '\004', '\010', '\002', '\020', '\003', 'R', '\006', 'c', 'o', 'n', 'f', 'i', 'g', '\"', '\206', +'\003', '\n', '\013', 'S', 't', 'a', 't', 's', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'D', '\n', '\n', 's', 't', 'a', 't', 's', '_', 't', +'a', 'g', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '%', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', +'m', 'e', 't', 'r', 'i', 'c', 's', '.', 'v', '3', '.', 'T', 'a', 'g', 'S', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'R', '\t', +'s', 't', 'a', 't', 's', 'T', 'a', 'g', 's', '\022', 'K', '\n', '\024', 'u', 's', 'e', '_', 'a', 'l', 'l', '_', 'd', 'e', 'f', 'a', +'u', 'l', 't', '_', 't', 'a', 'g', 's', '\030', '\002', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', +'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\021', 'u', 's', 'e', 'A', 'l', 'l', +'D', 'e', 'f', 'a', 'u', 'l', 't', 'T', 'a', 'g', 's', '\022', 'J', '\n', '\r', 's', 't', 'a', 't', 's', '_', 'm', 'a', 't', 'c', +'h', 'e', 'r', '\030', '\003', ' ', '\001', '(', '\013', '2', '%', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', +'m', 'e', 't', 'r', 'i', 'c', 's', '.', 'v', '3', '.', 'S', 't', 'a', 't', 's', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'R', '\014', +'s', 't', 'a', 't', 's', 'M', 'a', 't', 'c', 'h', 'e', 'r', '\022', 'l', '\n', '\031', 'h', 'i', 's', 't', 'o', 'g', 'r', 'a', 'm', +'_', 'b', 'u', 'c', 'k', 'e', 't', '_', 's', 'e', 't', 't', 'i', 'n', 'g', 's', '\030', '\004', ' ', '\003', '(', '\013', '2', '0', '.', +'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'm', 'e', 't', 'r', 'i', 'c', 's', '.', 'v', '3', '.', 'H', +'i', 's', 't', 'o', 'g', 'r', 'a', 'm', 'B', 'u', 'c', 'k', 'e', 't', 'S', 'e', 't', 't', 'i', 'n', 'g', 's', 'R', '\027', 'h', +'i', 's', 't', 'o', 'g', 'r', 'a', 'm', 'B', 'u', 'c', 'k', 'e', 't', 'S', 'e', 't', 't', 'i', 'n', 'g', 's', ':', '*', '\232', +'\305', '\210', '\036', '%', '\n', '#', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'm', 'e', 't', 'r', 'i', 'c', +'s', '.', 'v', '2', '.', 'S', 't', 'a', 't', 's', 'C', 'o', 'n', 'f', 'i', 'g', '\"', '\230', '\002', '\n', '\014', 'S', 't', 'a', 't', +'s', 'M', 'a', 't', 'c', 'h', 'e', 'r', '\022', '\037', '\n', '\n', 'r', 'e', 'j', 'e', 'c', 't', '_', 'a', 'l', 'l', '\030', '\001', ' ', +'\001', '(', '\010', 'H', '\000', 'R', '\t', 'r', 'e', 'j', 'e', 'c', 't', 'A', 'l', 'l', '\022', 'Q', '\n', '\016', 'e', 'x', 'c', 'l', 'u', +'s', 'i', 'o', 'n', '_', 'l', 'i', 's', 't', '\030', '\002', ' ', '\001', '(', '\013', '2', '(', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', +'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'L', 'i', 's', 't', 'S', 't', 'r', 'i', 'n', 'g', +'M', 'a', 't', 'c', 'h', 'e', 'r', 'H', '\000', 'R', '\r', 'e', 'x', 'c', 'l', 'u', 's', 'i', 'o', 'n', 'L', 'i', 's', 't', '\022', +'Q', '\n', '\016', 'i', 'n', 'c', 'l', 'u', 's', 'i', 'o', 'n', '_', 'l', 'i', 's', 't', '\030', '\003', ' ', '\001', '(', '\013', '2', '(', +'.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'L', 'i', +'s', 't', 'S', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'H', '\000', 'R', '\r', 'i', 'n', 'c', 'l', 'u', 's', +'i', 'o', 'n', 'L', 'i', 's', 't', ':', '+', '\232', '\305', '\210', '\036', '&', '\n', '$', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', +'f', 'i', 'g', '.', 'm', 'e', 't', 'r', 'i', 'c', 's', '.', 'v', '2', '.', 'S', 't', 'a', 't', 's', 'M', 'a', 't', 'c', 'h', +'e', 'r', 'B', '\024', '\n', '\r', 's', 't', 'a', 't', 's', '_', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\022', '\003', '\370', 'B', '\001', '\"', +'\250', '\001', '\n', '\014', 'T', 'a', 'g', 'S', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\022', '\031', '\n', '\010', 't', 'a', 'g', '_', 'n', +'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\007', 't', 'a', 'g', 'N', 'a', 'm', 'e', '\022', ' ', '\n', '\005', 'r', 'e', 'g', +'e', 'x', '\030', '\002', ' ', '\001', '(', '\t', 'B', '\010', '\372', 'B', '\005', 'r', '\003', '(', '\200', '\010', 'H', '\000', 'R', '\005', 'r', 'e', 'g', +'e', 'x', '\022', '!', '\n', '\013', 'f', 'i', 'x', 'e', 'd', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\003', ' ', '\001', '(', '\t', 'H', '\000', +'R', '\n', 'f', 'i', 'x', 'e', 'd', 'V', 'a', 'l', 'u', 'e', ':', '+', '\232', '\305', '\210', '\036', '&', '\n', '$', 'e', 'n', 'v', 'o', +'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'm', 'e', 't', 'r', 'i', 'c', 's', '.', 'v', '2', '.', 'T', 'a', 'g', 'S', 'p', +'e', 'c', 'i', 'f', 'i', 'e', 'r', 'B', '\013', '\n', '\t', 't', 'a', 'g', '_', 'v', 'a', 'l', 'u', 'e', '\"', '\222', '\001', '\n', '\027', +'H', 'i', 's', 't', 'o', 'g', 'r', 'a', 'm', 'B', 'u', 'c', 'k', 'e', 't', 'S', 'e', 't', 't', 'i', 'n', 'g', 's', '\022', 'D', +'\n', '\005', 'm', 'a', 't', 'c', 'h', '\030', '\001', ' ', '\001', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', +'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'S', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', 'e', +'r', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\005', 'm', 'a', 't', 'c', 'h', '\022', '1', '\n', '\007', 'b', 'u', 'c', +'k', 'e', 't', 's', '\030', '\002', ' ', '\003', '(', '\001', 'B', '\027', '\372', 'B', '\024', '\222', '\001', '\021', '\010', '\001', '\030', '\001', '\"', '\013', '\022', +'\t', '!', '\000', '\000', '\000', '\000', '\000', '\000', '\000', '\000', 'R', '\007', 'b', 'u', 'c', 'k', 'e', 't', 's', '\"', '\317', '\001', '\n', '\n', 'S', +'t', 'a', 't', 's', 'd', 'S', 'i', 'n', 'k', '\022', '9', '\n', '\007', 'a', 'd', 'd', 'r', 'e', 's', 's', '\030', '\001', ' ', '\001', '(', +'\013', '2', '\035', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', +'A', 'd', 'd', 'r', 'e', 's', 's', 'H', '\000', 'R', '\007', 'a', 'd', 'd', 'r', 'e', 's', 's', '\022', '*', '\n', '\020', 't', 'c', 'p', +'_', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 'n', 'a', 'm', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'H', '\000', 'R', '\016', 't', 'c', +'p', 'C', 'l', 'u', 's', 't', 'e', 'r', 'N', 'a', 'm', 'e', '\022', '\026', '\n', '\006', 'p', 'r', 'e', 'f', 'i', 'x', '\030', '\003', ' ', +'\001', '(', '\t', 'R', '\006', 'p', 'r', 'e', 'f', 'i', 'x', ':', ')', '\232', '\305', '\210', '\036', '$', '\n', '\"', 'e', 'n', 'v', 'o', 'y', +'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'm', 'e', 't', 'r', 'i', 'c', 's', '.', 'v', '2', '.', 'S', 't', 'a', 't', 's', 'd', +'S', 'i', 'n', 'k', 'B', '\027', '\n', '\020', 's', 't', 'a', 't', 's', 'd', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\022', +'\003', '\370', 'B', '\001', '\"', '\217', '\002', '\n', '\r', 'D', 'o', 'g', 'S', 't', 'a', 't', 's', 'd', 'S', 'i', 'n', 'k', '\022', '9', '\n', +'\007', 'a', 'd', 'd', 'r', 'e', 's', 's', '\030', '\001', ' ', '\001', '(', '\013', '2', '\035', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', +'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'A', 'd', 'd', 'r', 'e', 's', 's', 'H', '\000', 'R', '\007', 'a', +'d', 'd', 'r', 'e', 's', 's', '\022', '\026', '\n', '\006', 'p', 'r', 'e', 'f', 'i', 'x', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\006', 'p', +'r', 'e', 'f', 'i', 'x', '\022', 'Z', '\n', '\026', 'm', 'a', 'x', '_', 'b', 'y', 't', 'e', 's', '_', 'p', 'e', 'r', '_', 'd', 'a', +'t', 'a', 'g', 'r', 'a', 'm', '\030', '\004', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', +'t', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '6', '4', 'V', 'a', 'l', 'u', 'e', 'B', '\007', '\372', 'B', '\004', '2', '\002', ' ', +'\000', 'R', '\023', 'm', 'a', 'x', 'B', 'y', 't', 'e', 's', 'P', 'e', 'r', 'D', 'a', 't', 'a', 'g', 'r', 'a', 'm', ':', ',', '\232', +'\305', '\210', '\036', '\'', '\n', '%', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'm', 'e', 't', 'r', 'i', 'c', +'s', '.', 'v', '2', '.', 'D', 'o', 'g', 'S', 't', 'a', 't', 's', 'd', 'S', 'i', 'n', 'k', 'B', '\033', '\n', '\024', 'd', 'o', 'g', +'_', 's', 't', 'a', 't', 's', 'd', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', '\001', 'J', '\004', '\010', +'\002', '\020', '\003', '\"', 'Z', '\n', '\013', 'H', 'y', 's', 't', 'r', 'i', 'x', 'S', 'i', 'n', 'k', '\022', '\037', '\n', '\013', 'n', 'u', 'm', +'_', 'b', 'u', 'c', 'k', 'e', 't', 's', '\030', '\001', ' ', '\001', '(', '\003', 'R', '\n', 'n', 'u', 'm', 'B', 'u', 'c', 'k', 'e', 't', +'s', ':', '*', '\232', '\305', '\210', '\036', '%', '\n', '#', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'm', 'e', +'t', 'r', 'i', 'c', 's', '.', 'v', '2', '.', 'H', 'y', 's', 't', 'r', 'i', 'x', 'S', 'i', 'n', 'k', 'B', '=', '\n', '%', 'i', +'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', +'.', 'm', 'e', 't', 'r', 'i', 'c', 's', '.', 'v', '3', 'B', '\n', 'S', 't', 'a', 't', 's', 'P', 'r', 'o', 't', 'o', 'P', '\001', +'\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +}; + +static upb_def_init *deps[8] = { + &envoy_config_core_v3_address_proto_upbdefinit, + &envoy_type_matcher_v3_string_proto_upbdefinit, + &google_protobuf_any_proto_upbdefinit, + &google_protobuf_wrappers_proto_upbdefinit, + &udpa_annotations_status_proto_upbdefinit, + &udpa_annotations_versioning_proto_upbdefinit, + &validate_validate_proto_upbdefinit, + NULL +}; + +upb_def_init envoy_config_metrics_v3_stats_proto_upbdefinit = { + deps, + layouts, + "envoy/config/metrics/v3/stats.proto", + UPB_STRVIEW_INIT(descriptor, 2091) +}; diff --git a/grpc/src/core/ext/upbdefs-generated/envoy/config/metrics/v3/stats.upbdefs.h b/grpc/src/core/ext/upbdefs-generated/envoy/config/metrics/v3/stats.upbdefs.h new file mode 100644 index 00000000..0432cfd1 --- /dev/null +++ b/grpc/src/core/ext/upbdefs-generated/envoy/config/metrics/v3/stats.upbdefs.h @@ -0,0 +1,70 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * envoy/config/metrics/v3/stats.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#ifndef ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPBDEFS_H_ +#define ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPBDEFS_H_ + +#include "upb/def.h" +#include "upb/port_def.inc" +#ifdef __cplusplus +extern "C" { +#endif + +#include "upb/def.h" + +#include "upb/port_def.inc" + +extern upb_def_init envoy_config_metrics_v3_stats_proto_upbdefinit; + +UPB_INLINE const upb_msgdef *envoy_config_metrics_v3_StatsSink_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_config_metrics_v3_stats_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.config.metrics.v3.StatsSink"); +} + +UPB_INLINE const upb_msgdef *envoy_config_metrics_v3_StatsConfig_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_config_metrics_v3_stats_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.config.metrics.v3.StatsConfig"); +} + +UPB_INLINE const upb_msgdef *envoy_config_metrics_v3_StatsMatcher_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_config_metrics_v3_stats_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.config.metrics.v3.StatsMatcher"); +} + +UPB_INLINE const upb_msgdef *envoy_config_metrics_v3_TagSpecifier_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_config_metrics_v3_stats_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.config.metrics.v3.TagSpecifier"); +} + +UPB_INLINE const upb_msgdef *envoy_config_metrics_v3_HistogramBucketSettings_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_config_metrics_v3_stats_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.config.metrics.v3.HistogramBucketSettings"); +} + +UPB_INLINE const upb_msgdef *envoy_config_metrics_v3_StatsdSink_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_config_metrics_v3_stats_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.config.metrics.v3.StatsdSink"); +} + +UPB_INLINE const upb_msgdef *envoy_config_metrics_v3_DogStatsdSink_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_config_metrics_v3_stats_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.config.metrics.v3.DogStatsdSink"); +} + +UPB_INLINE const upb_msgdef *envoy_config_metrics_v3_HystrixSink_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_config_metrics_v3_stats_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.config.metrics.v3.HystrixSink"); +} + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#include "upb/port_undef.inc" + +#endif /* ENVOY_CONFIG_METRICS_V3_STATS_PROTO_UPBDEFS_H_ */ diff --git a/grpc/src/core/ext/upbdefs-generated/envoy/config/overload/v3/overload.upbdefs.c b/grpc/src/core/ext/upbdefs-generated/envoy/config/overload/v3/overload.upbdefs.c new file mode 100644 index 00000000..e189d990 --- /dev/null +++ b/grpc/src/core/ext/upbdefs-generated/envoy/config/overload/v3/overload.upbdefs.c @@ -0,0 +1,141 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * envoy/config/overload/v3/overload.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#include "upb/def.h" +#include "envoy/config/overload/v3/overload.upbdefs.h" + +extern upb_def_init envoy_type_v3_percent_proto_upbdefinit; +extern upb_def_init google_protobuf_any_proto_upbdefinit; +extern upb_def_init google_protobuf_duration_proto_upbdefinit; +extern upb_def_init udpa_annotations_status_proto_upbdefinit; +extern upb_def_init udpa_annotations_versioning_proto_upbdefinit; +extern upb_def_init validate_validate_proto_upbdefinit; +extern const upb_msglayout envoy_config_overload_v3_ResourceMonitor_msginit; +extern const upb_msglayout envoy_config_overload_v3_ThresholdTrigger_msginit; +extern const upb_msglayout envoy_config_overload_v3_ScaledTrigger_msginit; +extern const upb_msglayout envoy_config_overload_v3_Trigger_msginit; +extern const upb_msglayout envoy_config_overload_v3_ScaleTimersOverloadActionConfig_msginit; +extern const upb_msglayout envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_msginit; +extern const upb_msglayout envoy_config_overload_v3_OverloadAction_msginit; +extern const upb_msglayout envoy_config_overload_v3_OverloadManager_msginit; + +static const upb_msglayout *layouts[8] = { + &envoy_config_overload_v3_ResourceMonitor_msginit, + &envoy_config_overload_v3_ThresholdTrigger_msginit, + &envoy_config_overload_v3_ScaledTrigger_msginit, + &envoy_config_overload_v3_Trigger_msginit, + &envoy_config_overload_v3_ScaleTimersOverloadActionConfig_msginit, + &envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_msginit, + &envoy_config_overload_v3_OverloadAction_msginit, + &envoy_config_overload_v3_OverloadManager_msginit, +}; + +static const char descriptor[2145] = {'\n', '\'', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'o', 'v', 'e', 'r', 'l', 'o', 'a', 'd', '/', 'v', +'3', '/', 'o', 'v', 'e', 'r', 'l', 'o', 'a', 'd', '.', 'p', 'r', 'o', 't', 'o', '\022', '\030', 'e', 'n', 'v', 'o', 'y', '.', 'c', +'o', 'n', 'f', 'i', 'g', '.', 'o', 'v', 'e', 'r', 'l', 'o', 'a', 'd', '.', 'v', '3', '\032', '\033', 'e', 'n', 'v', 'o', 'y', '/', +'t', 'y', 'p', 'e', '/', 'v', '3', '/', 'p', 'e', 'r', 'c', 'e', 'n', 't', '.', 'p', 'r', 'o', 't', 'o', '\032', '\031', 'g', 'o', +'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'a', 'n', 'y', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', +'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', '.', +'p', 'r', 'o', 't', 'o', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', +'t', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', +'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', +'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '\274', '\001', '\n', +'\017', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', 'M', 'o', 'n', 'i', 't', 'o', 'r', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', +'\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '9', '\n', '\014', 't', +'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\003', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', +'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'H', '\000', 'R', '\013', 't', 'y', 'p', 'e', 'd', 'C', 'o', +'n', 'f', 'i', 'g', ':', '4', '\232', '\305', '\210', '\036', '/', '\n', '-', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', +'.', 'o', 'v', 'e', 'r', 'l', 'o', 'a', 'd', '.', 'v', '2', 'a', 'l', 'p', 'h', 'a', '.', 'R', 'e', 's', 'o', 'u', 'r', 'c', +'e', 'M', 'o', 'n', 'i', 't', 'o', 'r', 'B', '\r', '\n', '\013', 'c', 'o', 'n', 'f', 'i', 'g', '_', 't', 'y', 'p', 'e', 'J', '\004', +'\010', '\002', '\020', '\003', 'R', '\006', 'c', 'o', 'n', 'f', 'i', 'g', '\"', 'x', '\n', '\020', 'T', 'h', 'r', 'e', 's', 'h', 'o', 'l', 'd', +'T', 'r', 'i', 'g', 'g', 'e', 'r', '\022', '-', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\001', ' ', '\001', '(', '\001', 'B', '\027', '\372', +'B', '\024', '\022', '\022', '\031', '\000', '\000', '\000', '\000', '\000', '\000', '\360', '?', ')', '\000', '\000', '\000', '\000', '\000', '\000', '\000', '\000', 'R', '\005', 'v', +'a', 'l', 'u', 'e', ':', '5', '\232', '\305', '\210', '\036', '0', '\n', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', +'.', 'o', 'v', 'e', 'r', 'l', 'o', 'a', 'd', '.', 'v', '2', 'a', 'l', 'p', 'h', 'a', '.', 'T', 'h', 'r', 'e', 's', 'h', 'o', +'l', 'd', 'T', 'r', 'i', 'g', 'g', 'e', 'r', '\"', '\241', '\001', '\n', '\r', 'S', 'c', 'a', 'l', 'e', 'd', 'T', 'r', 'i', 'g', 'g', +'e', 'r', '\022', 'D', '\n', '\021', 's', 'c', 'a', 'l', 'i', 'n', 'g', '_', 't', 'h', 'r', 'e', 's', 'h', 'o', 'l', 'd', '\030', '\001', +' ', '\001', '(', '\001', 'B', '\027', '\372', 'B', '\024', '\022', '\022', '\031', '\000', '\000', '\000', '\000', '\000', '\000', '\360', '?', ')', '\000', '\000', '\000', '\000', +'\000', '\000', '\000', '\000', 'R', '\020', 's', 'c', 'a', 'l', 'i', 'n', 'g', 'T', 'h', 'r', 'e', 's', 'h', 'o', 'l', 'd', '\022', 'J', '\n', +'\024', 's', 'a', 't', 'u', 'r', 'a', 't', 'i', 'o', 'n', '_', 't', 'h', 'r', 'e', 's', 'h', 'o', 'l', 'd', '\030', '\002', ' ', '\001', +'(', '\001', 'B', '\027', '\372', 'B', '\024', '\022', '\022', '\031', '\000', '\000', '\000', '\000', '\000', '\000', '\360', '?', ')', '\000', '\000', '\000', '\000', '\000', '\000', +'\000', '\000', 'R', '\023', 's', 'a', 't', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'T', 'h', 'r', 'e', 's', 'h', 'o', 'l', 'd', '\"', '\371', +'\001', '\n', '\007', 'T', 'r', 'i', 'g', 'g', 'e', 'r', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', +'\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', 'm', 'e', '\022', 'J', '\n', '\t', 't', 'h', 'r', 'e', 's', 'h', 'o', +'l', 'd', '\030', '\002', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'o', +'v', 'e', 'r', 'l', 'o', 'a', 'd', '.', 'v', '3', '.', 'T', 'h', 'r', 'e', 's', 'h', 'o', 'l', 'd', 'T', 'r', 'i', 'g', 'g', +'e', 'r', 'H', '\000', 'R', '\t', 't', 'h', 'r', 'e', 's', 'h', 'o', 'l', 'd', '\022', 'A', '\n', '\006', 's', 'c', 'a', 'l', 'e', 'd', +'\030', '\003', ' ', '\001', '(', '\013', '2', '\'', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'o', 'v', 'e', +'r', 'l', 'o', 'a', 'd', '.', 'v', '3', '.', 'S', 'c', 'a', 'l', 'e', 'd', 'T', 'r', 'i', 'g', 'g', 'e', 'r', 'H', '\000', 'R', +'\006', 's', 'c', 'a', 'l', 'e', 'd', ':', ',', '\232', '\305', '\210', '\036', '\'', '\n', '%', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', +'f', 'i', 'g', '.', 'o', 'v', 'e', 'r', 'l', 'o', 'a', 'd', '.', 'v', '2', 'a', 'l', 'p', 'h', 'a', '.', 'T', 'r', 'i', 'g', +'g', 'e', 'r', 'B', '\024', '\n', '\r', 't', 'r', 'i', 'g', 'g', 'e', 'r', '_', 'o', 'n', 'e', 'o', 'f', '\022', '\003', '\370', 'B', '\001', +'\"', '\247', '\004', '\n', '\037', 'S', 'c', 'a', 'l', 'e', 'T', 'i', 'm', 'e', 'r', 's', 'O', 'v', 'e', 'r', 'l', 'o', 'a', 'd', 'A', +'c', 't', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '~', '\n', '\023', 't', 'i', 'm', 'e', 'r', '_', 's', 'c', 'a', 'l', +'e', '_', 'f', 'a', 'c', 't', 'o', 'r', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', 'D', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', +'o', 'n', 'f', 'i', 'g', '.', 'o', 'v', 'e', 'r', 'l', 'o', 'a', 'd', '.', 'v', '3', '.', 'S', 'c', 'a', 'l', 'e', 'T', 'i', +'m', 'e', 'r', 's', 'O', 'v', 'e', 'r', 'l', 'o', 'a', 'd', 'A', 'c', 't', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', '.', +'S', 'c', 'a', 'l', 'e', 'T', 'i', 'm', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', 'R', '\021', 't', 'i', 'm', +'e', 'r', 'S', 'c', 'a', 'l', 'e', 'F', 'a', 'c', 't', 'o', 'r', 's', '\032', '\200', '\002', '\n', '\n', 'S', 'c', 'a', 'l', 'e', 'T', +'i', 'm', 'e', 'r', '\022', 'e', '\n', '\005', 't', 'i', 'm', 'e', 'r', '\030', '\001', ' ', '\001', '(', '\016', '2', 'C', '.', 'e', 'n', 'v', +'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'o', 'v', 'e', 'r', 'l', 'o', 'a', 'd', '.', 'v', '3', '.', 'S', 'c', 'a', +'l', 'e', 'T', 'i', 'm', 'e', 'r', 's', 'O', 'v', 'e', 'r', 'l', 'o', 'a', 'd', 'A', 'c', 't', 'i', 'o', 'n', 'C', 'o', 'n', +'f', 'i', 'g', '.', 'T', 'i', 'm', 'e', 'r', 'T', 'y', 'p', 'e', 'B', '\n', '\372', 'B', '\007', '\202', '\001', '\004', '\020', '\001', ' ', '\000', +'R', '\005', 't', 'i', 'm', 'e', 'r', '\022', '<', '\n', '\013', 'm', 'i', 'n', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\002', ' ', +'\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', +'a', 't', 'i', 'o', 'n', 'H', '\000', 'R', '\n', 'm', 'i', 'n', 'T', 'i', 'm', 'e', 'o', 'u', 't', '\022', '5', '\n', '\t', 'm', 'i', +'n', '_', 's', 'c', 'a', 'l', 'e', '\030', '\003', ' ', '\001', '(', '\013', '2', '\026', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', +'e', '.', 'v', '3', '.', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'H', '\000', 'R', '\010', 'm', 'i', 'n', 'S', 'c', 'a', 'l', 'e', 'B', +'\026', '\n', '\017', 'o', 'v', 'e', 'r', 'l', 'o', 'a', 'd', '_', 'a', 'd', 'j', 'u', 's', 't', '\022', '\003', '\370', 'B', '\001', '\"', '\200', +'\001', '\n', '\t', 'T', 'i', 'm', 'e', 'r', 'T', 'y', 'p', 'e', '\022', '\017', '\n', '\013', 'U', 'N', 'S', 'P', 'E', 'C', 'I', 'F', 'I', +'E', 'D', '\020', '\000', '\022', '#', '\n', '\037', 'H', 'T', 'T', 'P', '_', 'D', 'O', 'W', 'N', 'S', 'T', 'R', 'E', 'A', 'M', '_', 'C', +'O', 'N', 'N', 'E', 'C', 'T', 'I', 'O', 'N', '_', 'I', 'D', 'L', 'E', '\020', '\001', '\022', '\037', '\n', '\033', 'H', 'T', 'T', 'P', '_', +'D', 'O', 'W', 'N', 'S', 'T', 'R', 'E', 'A', 'M', '_', 'S', 'T', 'R', 'E', 'A', 'M', '_', 'I', 'D', 'L', 'E', '\020', '\002', '\022', +'\034', '\n', '\030', 'T', 'R', 'A', 'N', 'S', 'P', 'O', 'R', 'T', '_', 'S', 'O', 'C', 'K', 'E', 'T', '_', 'C', 'O', 'N', 'N', 'E', +'C', 'T', '\020', '\003', '\"', '\344', '\001', '\n', '\016', 'O', 'v', 'e', 'r', 'l', 'o', 'a', 'd', 'A', 'c', 't', 'i', 'o', 'n', '\022', '\033', +'\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', +'m', 'e', '\022', 'G', '\n', '\010', 't', 'r', 'i', 'g', 'g', 'e', 'r', 's', '\030', '\002', ' ', '\003', '(', '\013', '2', '!', '.', 'e', 'n', +'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'o', 'v', 'e', 'r', 'l', 'o', 'a', 'd', '.', 'v', '3', '.', 'T', 'r', +'i', 'g', 'g', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', 'R', '\010', 't', 'r', 'i', 'g', 'g', 'e', 'r', 's', +'\022', '7', '\n', '\014', 't', 'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\003', ' ', '\001', '(', '\013', '2', '\024', '.', +'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'R', '\013', 't', 'y', 'p', 'e', +'d', 'C', 'o', 'n', 'f', 'i', 'g', ':', '3', '\232', '\305', '\210', '\036', '.', '\n', ',', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', +'f', 'i', 'g', '.', 'o', 'v', 'e', 'r', 'l', 'o', 'a', 'd', '.', 'v', '2', 'a', 'l', 'p', 'h', 'a', '.', 'O', 'v', 'e', 'r', +'l', 'o', 'a', 'd', 'A', 'c', 't', 'i', 'o', 'n', '\"', '\263', '\002', '\n', '\017', 'O', 'v', 'e', 'r', 'l', 'o', 'a', 'd', 'M', 'a', +'n', 'a', 'g', 'e', 'r', '\022', 'D', '\n', '\020', 'r', 'e', 'f', 'r', 'e', 's', 'h', '_', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', +'\030', '\001', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', +'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\017', 'r', 'e', 'f', 'r', 'e', 's', 'h', 'I', 'n', 't', 'e', 'r', 'v', 'a', 'l', +'\022', '`', '\n', '\021', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', '_', 'm', 'o', 'n', 'i', 't', 'o', 'r', 's', '\030', '\002', ' ', '\003', +'(', '\013', '2', ')', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'o', 'v', 'e', 'r', 'l', 'o', 'a', +'d', '.', 'v', '3', '.', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', 'M', 'o', 'n', 'i', 't', 'o', 'r', 'B', '\010', '\372', 'B', '\005', +'\222', '\001', '\002', '\010', '\001', 'R', '\020', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', 'M', 'o', 'n', 'i', 't', 'o', 'r', 's', '\022', 'B', +'\n', '\007', 'a', 'c', 't', 'i', 'o', 'n', 's', '\030', '\003', ' ', '\003', '(', '\013', '2', '(', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', +'o', 'n', 'f', 'i', 'g', '.', 'o', 'v', 'e', 'r', 'l', 'o', 'a', 'd', '.', 'v', '3', '.', 'O', 'v', 'e', 'r', 'l', 'o', 'a', +'d', 'A', 'c', 't', 'i', 'o', 'n', 'R', '\007', 'a', 'c', 't', 'i', 'o', 'n', 's', ':', '4', '\232', '\305', '\210', '\036', '/', '\n', '-', +'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'o', 'v', 'e', 'r', 'l', 'o', 'a', 'd', '.', 'v', '2', 'a', +'l', 'p', 'h', 'a', '.', 'O', 'v', 'e', 'r', 'l', 'o', 'a', 'd', 'M', 'a', 'n', 'a', 'g', 'e', 'r', 'B', 'A', '\n', '&', 'i', +'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', +'.', 'o', 'v', 'e', 'r', 'l', 'o', 'a', 'd', '.', 'v', '3', 'B', '\r', 'O', 'v', 'e', 'r', 'l', 'o', 'a', 'd', 'P', 'r', 'o', +'t', 'o', 'P', '\001', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +}; + +static upb_def_init *deps[7] = { + &envoy_type_v3_percent_proto_upbdefinit, + &google_protobuf_any_proto_upbdefinit, + &google_protobuf_duration_proto_upbdefinit, + &udpa_annotations_status_proto_upbdefinit, + &udpa_annotations_versioning_proto_upbdefinit, + &validate_validate_proto_upbdefinit, + NULL +}; + +upb_def_init envoy_config_overload_v3_overload_proto_upbdefinit = { + deps, + layouts, + "envoy/config/overload/v3/overload.proto", + UPB_STRVIEW_INIT(descriptor, 2145) +}; diff --git a/grpc/src/core/ext/upbdefs-generated/envoy/config/overload/v3/overload.upbdefs.h b/grpc/src/core/ext/upbdefs-generated/envoy/config/overload/v3/overload.upbdefs.h new file mode 100644 index 00000000..ca1dc517 --- /dev/null +++ b/grpc/src/core/ext/upbdefs-generated/envoy/config/overload/v3/overload.upbdefs.h @@ -0,0 +1,70 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * envoy/config/overload/v3/overload.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#ifndef ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPBDEFS_H_ +#define ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPBDEFS_H_ + +#include "upb/def.h" +#include "upb/port_def.inc" +#ifdef __cplusplus +extern "C" { +#endif + +#include "upb/def.h" + +#include "upb/port_def.inc" + +extern upb_def_init envoy_config_overload_v3_overload_proto_upbdefinit; + +UPB_INLINE const upb_msgdef *envoy_config_overload_v3_ResourceMonitor_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_config_overload_v3_overload_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.config.overload.v3.ResourceMonitor"); +} + +UPB_INLINE const upb_msgdef *envoy_config_overload_v3_ThresholdTrigger_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_config_overload_v3_overload_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.config.overload.v3.ThresholdTrigger"); +} + +UPB_INLINE const upb_msgdef *envoy_config_overload_v3_ScaledTrigger_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_config_overload_v3_overload_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.config.overload.v3.ScaledTrigger"); +} + +UPB_INLINE const upb_msgdef *envoy_config_overload_v3_Trigger_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_config_overload_v3_overload_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.config.overload.v3.Trigger"); +} + +UPB_INLINE const upb_msgdef *envoy_config_overload_v3_ScaleTimersOverloadActionConfig_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_config_overload_v3_overload_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.config.overload.v3.ScaleTimersOverloadActionConfig"); +} + +UPB_INLINE const upb_msgdef *envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_config_overload_v3_overload_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.config.overload.v3.ScaleTimersOverloadActionConfig.ScaleTimer"); +} + +UPB_INLINE const upb_msgdef *envoy_config_overload_v3_OverloadAction_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_config_overload_v3_overload_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.config.overload.v3.OverloadAction"); +} + +UPB_INLINE const upb_msgdef *envoy_config_overload_v3_OverloadManager_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_config_overload_v3_overload_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.config.overload.v3.OverloadManager"); +} + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#include "upb/port_undef.inc" + +#endif /* ENVOY_CONFIG_OVERLOAD_V3_OVERLOAD_PROTO_UPBDEFS_H_ */ diff --git a/grpc/src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.c b/grpc/src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.c index 446ce00b..8e6490aa 100644 --- a/grpc/src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.c +++ b/grpc/src/core/ext/upbdefs-generated/envoy/config/route/v3/route.upbdefs.c @@ -24,7 +24,7 @@ static const upb_msglayout *layouts[2] = { &envoy_config_route_v3_Vhds_msginit, }; -static const char descriptor[1282] = {'\n', '!', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'r', 'o', 'u', 't', 'e', '/', 'v', '3', '/', 'r', +static const char descriptor[1389] = {'\n', '!', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'r', 'o', 'u', 't', 'e', '/', 'v', '3', '/', 'r', 'o', 'u', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\022', '\025', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '\032', '\037', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'b', 'a', 's', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', '(', 'e', 'n', 'v', 'o', 'y', '/', 'c', @@ -36,7 +36,7 @@ static const char descriptor[1282] = {'\n', '!', 'e', 'n', 'v', 'o', 'y', '/', ' 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', -'t', 'o', '\"', '\227', '\006', '\n', '\022', 'R', 'o', 'u', 't', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 'u', 'r', 'a', 't', 'i', 'o', 'n', +'t', 'o', '\"', '\202', '\007', '\n', '\022', 'R', 'o', 'u', 't', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 'u', 'r', 'a', 't', 'i', 'o', 'n', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', 'G', '\n', '\r', 'v', 'i', 'r', 't', 'u', 'a', 'l', '_', 'h', 'o', 's', 't', 's', '\030', '\002', ' ', '\003', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'V', 'i', 'r', 't', 'u', 'a', 'l', @@ -66,16 +66,20 @@ static const char descriptor[1282] = {'\n', '!', 'e', 'n', 'v', 'o', 'y', '/', ' 'i', 'o', 'n', 's', 'W', 'i', 'n', 's', '\022', 'G', '\n', '\021', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '_', 'c', 'l', 'u', 's', 't', 'e', 'r', 's', '\030', '\007', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\020', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', 'C', 'l', -'u', 's', 't', 'e', 'r', 's', ':', '&', '\232', '\305', '\210', '\036', '!', '\n', '\037', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', -'v', '2', '.', 'R', 'o', 'u', 't', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 'u', 'r', 'a', 't', 'i', 'o', 'n', '\"', 's', '\n', '\004', -'V', 'h', 'd', 's', '\022', 'Q', '\n', '\r', 'c', 'o', 'n', 'f', 'i', 'g', '_', 's', 'o', 'u', 'r', 'c', 'e', '\030', '\001', ' ', '\001', -'(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', -'.', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\014', -'c', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', ':', '\030', '\232', '\305', '\210', '\036', '\023', '\n', '\021', 'e', 'n', 'v', 'o', -'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'V', 'h', 'd', 's', 'B', ';', '\n', '#', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', -'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', -'v', '3', 'B', '\n', 'R', 'o', 'u', 't', 'e', 'P', 'r', 'o', 't', 'o', 'P', '\001', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', -'\006', 'p', 'r', 'o', 't', 'o', '3', +'u', 's', 't', 'e', 'r', 's', '\022', 'i', '\n', '#', 'm', 'a', 'x', '_', 'd', 'i', 'r', 'e', 'c', 't', '_', 'r', 'e', 's', 'p', +'o', 'n', 's', 'e', '_', 'b', 'o', 'd', 'y', '_', 's', 'i', 'z', 'e', '_', 'b', 'y', 't', 'e', 's', '\030', '\013', ' ', '\001', '(', +'\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', +'2', 'V', 'a', 'l', 'u', 'e', 'R', '\036', 'm', 'a', 'x', 'D', 'i', 'r', 'e', 'c', 't', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', +'B', 'o', 'd', 'y', 'S', 'i', 'z', 'e', 'B', 'y', 't', 'e', 's', ':', '&', '\232', '\305', '\210', '\036', '!', '\n', '\037', 'e', 'n', 'v', +'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'R', 'o', 'u', 't', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 'u', 'r', 'a', 't', +'i', 'o', 'n', '\"', 's', '\n', '\004', 'V', 'h', 'd', 's', '\022', 'Q', '\n', '\r', 'c', 'o', 'n', 'f', 'i', 'g', '_', 's', 'o', 'u', +'r', 'c', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', +'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', 'B', '\010', '\372', 'B', '\005', +'\212', '\001', '\002', '\020', '\001', 'R', '\014', 'c', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', ':', '\030', '\232', '\305', '\210', '\036', +'\023', '\n', '\021', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'V', 'h', 'd', 's', 'B', ';', '\n', '#', 'i', +'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', +'.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', 'B', '\n', 'R', 'o', 'u', 't', 'e', 'P', 'r', 'o', 't', 'o', 'P', '\001', '\272', '\200', +'\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; static upb_def_init *deps[8] = { @@ -93,5 +97,5 @@ upb_def_init envoy_config_route_v3_route_proto_upbdefinit = { deps, layouts, "envoy/config/route/v3/route.proto", - UPB_STRVIEW_INIT(descriptor, 1282) + UPB_STRVIEW_INIT(descriptor, 1389) }; diff --git a/grpc/src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.c b/grpc/src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.c index 72a74f29..b9e23161 100644 --- a/grpc/src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.c +++ b/grpc/src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.c @@ -20,7 +20,6 @@ extern upb_def_init envoy_type_v3_percent_proto_upbdefinit; extern upb_def_init envoy_type_v3_range_proto_upbdefinit; extern upb_def_init google_protobuf_any_proto_upbdefinit; extern upb_def_init google_protobuf_duration_proto_upbdefinit; -extern upb_def_init google_protobuf_struct_proto_upbdefinit; extern upb_def_init google_protobuf_wrappers_proto_upbdefinit; extern upb_def_init envoy_annotations_deprecation_proto_upbdefinit; extern upb_def_init udpa_annotations_migrate_proto_upbdefinit; @@ -72,13 +71,15 @@ extern const upb_msglayout envoy_config_route_v3_RateLimit_Action_RemoteAddress_ extern const upb_msglayout envoy_config_route_v3_RateLimit_Action_GenericKey_msginit; extern const upb_msglayout envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_msginit; extern const upb_msglayout envoy_config_route_v3_RateLimit_Action_DynamicMetaData_msginit; +extern const upb_msglayout envoy_config_route_v3_RateLimit_Action_MetaData_msginit; extern const upb_msglayout envoy_config_route_v3_RateLimit_Override_msginit; extern const upb_msglayout envoy_config_route_v3_RateLimit_Override_DynamicMetadata_msginit; extern const upb_msglayout envoy_config_route_v3_HeaderMatcher_msginit; extern const upb_msglayout envoy_config_route_v3_QueryParameterMatcher_msginit; extern const upb_msglayout envoy_config_route_v3_InternalRedirectPolicy_msginit; +extern const upb_msglayout envoy_config_route_v3_FilterConfig_msginit; -static const upb_msglayout *layouts[50] = { +static const upb_msglayout *layouts[52] = { &envoy_config_route_v3_VirtualHost_msginit, &envoy_config_route_v3_VirtualHost_TypedPerFilterConfigEntry_msginit, &envoy_config_route_v3_FilterAction_msginit, @@ -124,14 +125,16 @@ static const upb_msglayout *layouts[50] = { &envoy_config_route_v3_RateLimit_Action_GenericKey_msginit, &envoy_config_route_v3_RateLimit_Action_HeaderValueMatch_msginit, &envoy_config_route_v3_RateLimit_Action_DynamicMetaData_msginit, + &envoy_config_route_v3_RateLimit_Action_MetaData_msginit, &envoy_config_route_v3_RateLimit_Override_msginit, &envoy_config_route_v3_RateLimit_Override_DynamicMetadata_msginit, &envoy_config_route_v3_HeaderMatcher_msginit, &envoy_config_route_v3_QueryParameterMatcher_msginit, &envoy_config_route_v3_InternalRedirectPolicy_msginit, + &envoy_config_route_v3_FilterConfig_msginit, }; -static const char descriptor[18792] = {'\n', ',', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'r', 'o', 'u', 't', 'e', '/', 'v', '3', '/', 'r', +static const char descriptor[19463] = {'\n', ',', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'r', 'o', 'u', 't', 'e', '/', 'v', '3', '/', 'r', 'o', 'u', 't', 'e', '_', 'c', 'o', 'm', 'p', 'o', 'n', 'e', 'n', 't', 's', '.', 'p', 'r', 'o', 't', 'o', '\022', '\025', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '\032', '\037', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'b', 'a', 's', 'e', '.', 'p', 'r', 'o', @@ -148,744 +151,771 @@ static const char descriptor[18792] = {'\n', ',', 'e', 'n', 'v', 'o', 'y', '/', 'e', 'r', 'c', 'e', 'n', 't', '.', 'p', 'r', 'o', 't', 'o', '\032', '\031', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'v', '3', '/', 'r', 'a', 'n', 'g', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', '\031', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'a', 'n', 'y', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', -'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\032', '\034', -'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 's', 't', 'r', 'u', 'c', 't', '.', 'p', 'r', -'o', 't', 'o', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'w', 'r', 'a', 'p', -'p', 'e', 'r', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '#', 'e', 'n', 'v', 'o', 'y', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', -'i', 'o', 'n', 's', '/', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'u', -'d', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'm', 'i', 'g', 'r', 'a', 't', 'e', '.', 'p', -'r', 'o', 't', 'o', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', -'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', -'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', 'l', -'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '\324', '\014', '\n', '\013', -'V', 'i', 'r', 't', 'u', 'a', 'l', 'H', 'o', 's', 't', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', -'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', 'm', 'e', '\022', ',', '\n', '\007', 'd', 'o', 'm', 'a', 'i', 'n', -'s', '\030', '\002', ' ', '\003', '(', '\t', 'B', '\022', '\372', 'B', '\017', '\222', '\001', '\014', '\010', '\001', '\"', '\010', 'r', '\006', '\300', '\001', '\002', '\310', -'\001', '\000', 'R', '\007', 'd', 'o', 'm', 'a', 'i', 'n', 's', '\022', '4', '\n', '\006', 'r', 'o', 'u', 't', 'e', 's', '\030', '\003', ' ', '\003', -'(', '\013', '2', '\034', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', -'3', '.', 'R', 'o', 'u', 't', 'e', 'R', '\006', 'r', 'o', 'u', 't', 'e', 's', '\022', '`', '\n', '\013', 'r', 'e', 'q', 'u', 'i', 'r', -'e', '_', 't', 'l', 's', '\030', '\004', ' ', '\001', '(', '\016', '2', '5', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', -'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'V', 'i', 'r', 't', 'u', 'a', 'l', 'H', 'o', 's', 't', '.', 'T', 'l', -'s', 'R', 'e', 'q', 'u', 'i', 'r', 'e', 'm', 'e', 'n', 't', 'T', 'y', 'p', 'e', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', -'\001', 'R', '\n', 'r', 'e', 'q', 'u', 'i', 'r', 'e', 'T', 'l', 's', '\022', 'P', '\n', '\020', 'v', 'i', 'r', 't', 'u', 'a', 'l', '_', -'c', 'l', 'u', 's', 't', 'e', 'r', 's', '\030', '\005', ' ', '\003', '(', '\013', '2', '%', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', -'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'V', 'i', 'r', 't', 'u', 'a', 'l', 'C', 'l', 'u', 's', -'t', 'e', 'r', 'R', '\017', 'v', 'i', 'r', 't', 'u', 'a', 'l', 'C', 'l', 'u', 's', 't', 'e', 'r', 's', '\022', 'A', '\n', '\013', 'r', -'a', 't', 'e', '_', 'l', 'i', 'm', 'i', 't', 's', '\030', '\006', ' ', '\003', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', -'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', -'R', '\n', 'r', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', 's', '\022', 'g', '\n', '\026', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'h', -'e', 'a', 'd', 'e', 'r', 's', '_', 't', 'o', '_', 'a', 'd', 'd', '\030', '\007', ' ', '\003', '(', '\013', '2', '\'', '.', 'e', 'n', 'v', -'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'V', -'a', 'l', 'u', 'e', 'O', 'p', 't', 'i', 'o', 'n', 'B', '\t', '\372', 'B', '\006', '\222', '\001', '\003', '\020', '\350', '\007', 'R', '\023', 'r', 'e', -'q', 'u', 'e', 's', 't', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'T', 'o', 'A', 'd', 'd', '\022', 'M', '\n', '\031', 'r', 'e', 'q', 'u', -'e', 's', 't', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '_', 't', 'o', '_', 'r', 'e', 'm', 'o', 'v', 'e', '\030', '\r', ' ', '\003', -'(', '\t', 'B', '\022', '\372', 'B', '\017', '\222', '\001', '\014', '\"', '\n', 'r', '\010', '\020', '\001', '\300', '\001', '\001', '\310', '\001', '\000', 'R', '\026', 'r', -'e', 'q', 'u', 'e', 's', 't', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'T', 'o', 'R', 'e', 'm', 'o', 'v', 'e', '\022', 'i', '\n', '\027', -'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '_', 't', 'o', '_', 'a', 'd', 'd', '\030', '\n', -' ', '\003', '(', '\013', '2', '\'', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', -'v', '3', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'O', 'p', 't', 'i', 'o', 'n', 'B', '\t', '\372', 'B', '\006', -'\222', '\001', '\003', '\020', '\350', '\007', 'R', '\024', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'T', 'o', -'A', 'd', 'd', '\022', 'O', '\n', '\032', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '_', 't', -'o', '_', 'r', 'e', 'm', 'o', 'v', 'e', '\030', '\013', ' ', '\003', '(', '\t', 'B', '\022', '\372', 'B', '\017', '\222', '\001', '\014', '\"', '\n', 'r', -'\010', '\020', '\001', '\300', '\001', '\001', '\310', '\001', '\000', 'R', '\027', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', 'H', 'e', 'a', 'd', 'e', 'r', -'s', 'T', 'o', 'R', 'e', 'm', 'o', 'v', 'e', '\022', '5', '\n', '\004', 'c', 'o', 'r', 's', '\030', '\010', ' ', '\001', '(', '\013', '2', '!', -'.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'C', 'o', -'r', 's', 'P', 'o', 'l', 'i', 'c', 'y', 'R', '\004', 'c', 'o', 'r', 's', '\022', 's', '\n', '\027', 't', 'y', 'p', 'e', 'd', '_', 'p', -'e', 'r', '_', 'f', 'i', 'l', 't', 'e', 'r', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\017', ' ', '\003', '(', '\013', '2', '<', '.', -'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'V', 'i', 'r', -'t', 'u', 'a', 'l', 'H', 'o', 's', 't', '.', 'T', 'y', 'p', 'e', 'd', 'P', 'e', 'r', 'F', 'i', 'l', 't', 'e', 'r', 'C', 'o', -'n', 'f', 'i', 'g', 'E', 'n', 't', 'r', 'y', 'R', '\024', 't', 'y', 'p', 'e', 'd', 'P', 'e', 'r', 'F', 'i', 'l', 't', 'e', 'r', -'C', 'o', 'n', 'f', 'i', 'g', '\022', 'A', '\n', '\035', 'i', 'n', 'c', 'l', 'u', 'd', 'e', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', -'_', 'a', 't', 't', 'e', 'm', 'p', 't', '_', 'c', 'o', 'u', 'n', 't', '\030', '\016', ' ', '\001', '(', '\010', 'R', '\032', 'i', 'n', 'c', -'l', 'u', 'd', 'e', 'R', 'e', 'q', 'u', 'e', 's', 't', 'A', 't', 't', 'e', 'm', 'p', 't', 'C', 'o', 'u', 'n', 't', '\022', 'H', -'\n', '!', 'i', 'n', 'c', 'l', 'u', 'd', 'e', '_', 'a', 't', 't', 'e', 'm', 'p', 't', '_', 'c', 'o', 'u', 'n', 't', '_', 'i', -'n', '_', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '\030', '\023', ' ', '\001', '(', '\010', 'R', '\035', 'i', 'n', 'c', 'l', 'u', 'd', 'e', -'A', 't', 't', 'e', 'm', 'p', 't', 'C', 'o', 'u', 'n', 't', 'I', 'n', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', '\022', 'E', '\n', -'\014', 'r', 'e', 't', 'r', 'y', '_', 'p', 'o', 'l', 'i', 'c', 'y', '\030', '\020', ' ', '\001', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', -'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'e', 't', 'r', 'y', 'P', -'o', 'l', 'i', 'c', 'y', 'R', '\013', 'r', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', '\022', 'O', '\n', '\031', 'r', 'e', 't', -'r', 'y', '_', 'p', 'o', 'l', 'i', 'c', 'y', '_', 't', 'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\024', ' ', -'\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', -'R', '\026', 'r', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', 'T', 'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', '\022', -'E', '\n', '\014', 'h', 'e', 'd', 'g', 'e', '_', 'p', 'o', 'l', 'i', 'c', 'y', '\030', '\021', ' ', '\001', '(', '\013', '2', '\"', '.', 'e', -'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'H', 'e', 'd', 'g', -'e', 'P', 'o', 'l', 'i', 'c', 'y', 'R', '\013', 'h', 'e', 'd', 'g', 'e', 'P', 'o', 'l', 'i', 'c', 'y', '\022', '`', '\n', '\036', 'p', +'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', +'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'w', 'r', 'a', 'p', 'p', 'e', 'r', 's', '.', +'p', 'r', 'o', 't', 'o', '\032', '#', 'e', 'n', 'v', 'o', 'y', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', +'d', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'u', 'd', 'p', 'a', '/', 'a', +'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'm', 'i', 'g', 'r', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', +'\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', +'p', 'r', 'o', 't', 'o', '\032', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', +'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', +'/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '\324', '\014', '\n', '\013', 'V', 'i', 'r', 't', 'u', +'a', 'l', 'H', 'o', 's', 't', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', +'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', 'm', 'e', '\022', ',', '\n', '\007', 'd', 'o', 'm', 'a', 'i', 'n', 's', '\030', '\002', ' ', '\003', +'(', '\t', 'B', '\022', '\372', 'B', '\017', '\222', '\001', '\014', '\010', '\001', '\"', '\010', 'r', '\006', '\300', '\001', '\002', '\310', '\001', '\000', 'R', '\007', 'd', +'o', 'm', 'a', 'i', 'n', 's', '\022', '4', '\n', '\006', 'r', 'o', 'u', 't', 'e', 's', '\030', '\003', ' ', '\003', '(', '\013', '2', '\034', '.', +'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'o', 'u', +'t', 'e', 'R', '\006', 'r', 'o', 'u', 't', 'e', 's', '\022', '`', '\n', '\013', 'r', 'e', 'q', 'u', 'i', 'r', 'e', '_', 't', 'l', 's', +'\030', '\004', ' ', '\001', '(', '\016', '2', '5', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', +'t', 'e', '.', 'v', '3', '.', 'V', 'i', 'r', 't', 'u', 'a', 'l', 'H', 'o', 's', 't', '.', 'T', 'l', 's', 'R', 'e', 'q', 'u', +'i', 'r', 'e', 'm', 'e', 'n', 't', 'T', 'y', 'p', 'e', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\n', 'r', 'e', +'q', 'u', 'i', 'r', 'e', 'T', 'l', 's', '\022', 'P', '\n', '\020', 'v', 'i', 'r', 't', 'u', 'a', 'l', '_', 'c', 'l', 'u', 's', 't', +'e', 'r', 's', '\030', '\005', ' ', '\003', '(', '\013', '2', '%', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', +'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'V', 'i', 'r', 't', 'u', 'a', 'l', 'C', 'l', 'u', 's', 't', 'e', 'r', 'R', '\017', +'v', 'i', 'r', 't', 'u', 'a', 'l', 'C', 'l', 'u', 's', 't', 'e', 'r', 's', '\022', 'A', '\n', '\013', 'r', 'a', 't', 'e', '_', 'l', +'i', 'm', 'i', 't', 's', '\030', '\006', ' ', '\003', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', +'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', 'R', '\n', 'r', 'a', 't', +'e', 'L', 'i', 'm', 'i', 't', 's', '\022', 'g', '\n', '\026', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'h', 'e', 'a', 'd', 'e', 'r', +'s', '_', 't', 'o', '_', 'a', 'd', 'd', '\030', '\007', ' ', '\003', '(', '\013', '2', '\'', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', +'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'O', +'p', 't', 'i', 'o', 'n', 'B', '\t', '\372', 'B', '\006', '\222', '\001', '\003', '\020', '\350', '\007', 'R', '\023', 'r', 'e', 'q', 'u', 'e', 's', 't', +'H', 'e', 'a', 'd', 'e', 'r', 's', 'T', 'o', 'A', 'd', 'd', '\022', 'M', '\n', '\031', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'h', +'e', 'a', 'd', 'e', 'r', 's', '_', 't', 'o', '_', 'r', 'e', 'm', 'o', 'v', 'e', '\030', '\r', ' ', '\003', '(', '\t', 'B', '\022', '\372', +'B', '\017', '\222', '\001', '\014', '\"', '\n', 'r', '\010', '\020', '\001', '\300', '\001', '\001', '\310', '\001', '\000', 'R', '\026', 'r', 'e', 'q', 'u', 'e', 's', +'t', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'T', 'o', 'R', 'e', 'm', 'o', 'v', 'e', '\022', 'i', '\n', '\027', 'r', 'e', 's', 'p', 'o', +'n', 's', 'e', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '_', 't', 'o', '_', 'a', 'd', 'd', '\030', '\n', ' ', '\003', '(', '\013', '2', +'\'', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 'e', +'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'O', 'p', 't', 'i', 'o', 'n', 'B', '\t', '\372', 'B', '\006', '\222', '\001', '\003', '\020', '\350', +'\007', 'R', '\024', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'T', 'o', 'A', 'd', 'd', '\022', 'O', +'\n', '\032', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '_', 't', 'o', '_', 'r', 'e', 'm', +'o', 'v', 'e', '\030', '\013', ' ', '\003', '(', '\t', 'B', '\022', '\372', 'B', '\017', '\222', '\001', '\014', '\"', '\n', 'r', '\010', '\020', '\001', '\300', '\001', +'\001', '\310', '\001', '\000', 'R', '\027', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'T', 'o', 'R', 'e', +'m', 'o', 'v', 'e', '\022', '5', '\n', '\004', 'c', 'o', 'r', 's', '\030', '\010', ' ', '\001', '(', '\013', '2', '!', '.', 'e', 'n', 'v', 'o', +'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'C', 'o', 'r', 's', 'P', 'o', 'l', +'i', 'c', 'y', 'R', '\004', 'c', 'o', 'r', 's', '\022', 's', '\n', '\027', 't', 'y', 'p', 'e', 'd', '_', 'p', 'e', 'r', '_', 'f', 'i', +'l', 't', 'e', 'r', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\017', ' ', '\003', '(', '\013', '2', '<', '.', 'e', 'n', 'v', 'o', 'y', +'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'V', 'i', 'r', 't', 'u', 'a', 'l', 'H', +'o', 's', 't', '.', 'T', 'y', 'p', 'e', 'd', 'P', 'e', 'r', 'F', 'i', 'l', 't', 'e', 'r', 'C', 'o', 'n', 'f', 'i', 'g', 'E', +'n', 't', 'r', 'y', 'R', '\024', 't', 'y', 'p', 'e', 'd', 'P', 'e', 'r', 'F', 'i', 'l', 't', 'e', 'r', 'C', 'o', 'n', 'f', 'i', +'g', '\022', 'A', '\n', '\035', 'i', 'n', 'c', 'l', 'u', 'd', 'e', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'a', 't', 't', 'e', +'m', 'p', 't', '_', 'c', 'o', 'u', 'n', 't', '\030', '\016', ' ', '\001', '(', '\010', 'R', '\032', 'i', 'n', 'c', 'l', 'u', 'd', 'e', 'R', +'e', 'q', 'u', 'e', 's', 't', 'A', 't', 't', 'e', 'm', 'p', 't', 'C', 'o', 'u', 'n', 't', '\022', 'H', '\n', '!', 'i', 'n', 'c', +'l', 'u', 'd', 'e', '_', 'a', 't', 't', 'e', 'm', 'p', 't', '_', 'c', 'o', 'u', 'n', 't', '_', 'i', 'n', '_', 'r', 'e', 's', +'p', 'o', 'n', 's', 'e', '\030', '\023', ' ', '\001', '(', '\010', 'R', '\035', 'i', 'n', 'c', 'l', 'u', 'd', 'e', 'A', 't', 't', 'e', 'm', +'p', 't', 'C', 'o', 'u', 'n', 't', 'I', 'n', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', '\022', 'E', '\n', '\014', 'r', 'e', 't', 'r', +'y', '_', 'p', 'o', 'l', 'i', 'c', 'y', '\030', '\020', ' ', '\001', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', +'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', +'R', '\013', 'r', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', '\022', 'O', '\n', '\031', 'r', 'e', 't', 'r', 'y', '_', 'p', 'o', +'l', 'i', 'c', 'y', '_', 't', 'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\024', ' ', '\001', '(', '\013', '2', '\024', +'.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'R', '\026', 'r', 'e', 't', +'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', 'T', 'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'E', '\n', '\014', 'h', 'e', +'d', 'g', 'e', '_', 'p', 'o', 'l', 'i', 'c', 'y', '\030', '\021', ' ', '\001', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', +'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'H', 'e', 'd', 'g', 'e', 'P', 'o', 'l', 'i', +'c', 'y', 'R', '\013', 'h', 'e', 'd', 'g', 'e', 'P', 'o', 'l', 'i', 'c', 'y', '\022', '`', '\n', '\036', 'p', 'e', 'r', '_', 'r', 'e', +'q', 'u', 'e', 's', 't', '_', 'b', 'u', 'f', 'f', 'e', 'r', '_', 'l', 'i', 'm', 'i', 't', '_', 'b', 'y', 't', 'e', 's', '\030', +'\022', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', +'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\032', 'p', 'e', 'r', 'R', 'e', 'q', 'u', 'e', 's', 't', 'B', 'u', 'f', +'f', 'e', 'r', 'L', 'i', 'm', 'i', 't', 'B', 'y', 't', 'e', 's', '\032', ']', '\n', '\031', 'T', 'y', 'p', 'e', 'd', 'P', 'e', 'r', +'F', 'i', 'l', 't', 'e', 'r', 'C', 'o', 'n', 'f', 'i', 'g', 'E', 'n', 't', 'r', 'y', '\022', '\020', '\n', '\003', 'k', 'e', 'y', '\030', +'\001', ' ', '\001', '(', '\t', 'R', '\003', 'k', 'e', 'y', '\022', '*', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\013', +'2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'R', '\005', 'v', +'a', 'l', 'u', 'e', ':', '\002', '8', '\001', '\"', ':', '\n', '\022', 'T', 'l', 's', 'R', 'e', 'q', 'u', 'i', 'r', 'e', 'm', 'e', 'n', +'t', 'T', 'y', 'p', 'e', '\022', '\010', '\n', '\004', 'N', 'O', 'N', 'E', '\020', '\000', '\022', '\021', '\n', '\r', 'E', 'X', 'T', 'E', 'R', 'N', +'A', 'L', '_', 'O', 'N', 'L', 'Y', '\020', '\001', '\022', '\007', '\n', '\003', 'A', 'L', 'L', '\020', '\002', ':', '%', '\232', '\305', '\210', '\036', ' ', +'\n', '\036', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'V', 'i', 'r', 't', +'u', 'a', 'l', 'H', 'o', 's', 't', 'J', '\004', '\010', '\t', '\020', '\n', 'J', '\004', '\010', '\014', '\020', '\r', 'R', '\021', 'p', 'e', 'r', '_', +'f', 'i', 'l', 't', 'e', 'r', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\"', 'd', '\n', '\014', 'F', 'i', 'l', 't', 'e', 'r', 'A', 'c', +'t', 'i', 'o', 'n', '\022', ',', '\n', '\006', 'a', 'c', 't', 'i', 'o', 'n', '\030', '\001', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', +'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'R', '\006', 'a', 'c', 't', 'i', 'o', 'n', +':', '&', '\232', '\305', '\210', '\036', '!', '\n', '\037', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', +'t', 'e', '.', 'F', 'i', 'l', 't', 'e', 'r', 'A', 'c', 't', 'i', 'o', 'n', '\"', '\254', '\n', '\n', '\005', 'R', 'o', 'u', 't', 'e', +'\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\016', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', 'A', '\n', '\005', 'm', +'a', 't', 'c', 'h', '\030', '\001', ' ', '\001', '(', '\013', '2', '!', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', +'.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'o', 'u', 't', 'e', 'M', 'a', 't', 'c', 'h', 'B', '\010', '\372', 'B', '\005', +'\212', '\001', '\002', '\020', '\001', 'R', '\005', 'm', 'a', 't', 'c', 'h', '\022', ':', '\n', '\005', 'r', 'o', 'u', 't', 'e', '\030', '\002', ' ', '\001', +'(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', +'3', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', 'H', '\000', 'R', '\005', 'r', 'o', 'u', 't', 'e', '\022', 'C', '\n', +'\010', 'r', 'e', 'd', 'i', 'r', 'e', 'c', 't', '\030', '\003', ' ', '\001', '(', '\013', '2', '%', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', +'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'e', 'd', 'i', 'r', 'e', 'c', 't', 'A', 'c', +'t', 'i', 'o', 'n', 'H', '\000', 'R', '\010', 'r', 'e', 'd', 'i', 'r', 'e', 'c', 't', '\022', 'V', '\n', '\017', 'd', 'i', 'r', 'e', 'c', +'t', '_', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '\030', '\007', ' ', '\001', '(', '\013', '2', '+', '.', 'e', 'n', 'v', 'o', 'y', '.', +'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'D', 'i', 'r', 'e', 'c', 't', 'R', 'e', 's', +'p', 'o', 'n', 's', 'e', 'A', 'c', 't', 'i', 'o', 'n', 'H', '\000', 'R', '\016', 'd', 'i', 'r', 'e', 'c', 't', 'R', 'e', 's', 'p', +'o', 'n', 's', 'e', '\022', 'J', '\n', '\r', 'f', 'i', 'l', 't', 'e', 'r', '_', 'a', 'c', 't', 'i', 'o', 'n', '\030', '\021', ' ', '\001', +'(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', +'3', '.', 'F', 'i', 'l', 't', 'e', 'r', 'A', 'c', 't', 'i', 'o', 'n', 'H', '\000', 'R', '\014', 'f', 'i', 'l', 't', 'e', 'r', 'A', +'c', 't', 'i', 'o', 'n', '\022', ':', '\n', '\010', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '\030', '\004', ' ', '\001', '(', '\013', '2', '\036', +'.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'M', 'e', 't', +'a', 'd', 'a', 't', 'a', 'R', '\010', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '\022', '>', '\n', '\t', 'd', 'e', 'c', 'o', 'r', 'a', +'t', 'o', 'r', '\030', '\005', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', +'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'D', 'e', 'c', 'o', 'r', 'a', 't', 'o', 'r', 'R', '\t', 'd', 'e', 'c', 'o', 'r', +'a', 't', 'o', 'r', '\022', 'm', '\n', '\027', 't', 'y', 'p', 'e', 'd', '_', 'p', 'e', 'r', '_', 'f', 'i', 'l', 't', 'e', 'r', '_', +'c', 'o', 'n', 'f', 'i', 'g', '\030', '\r', ' ', '\003', '(', '\013', '2', '6', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', +'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'o', 'u', 't', 'e', '.', 'T', 'y', 'p', 'e', 'd', 'P', 'e', +'r', 'F', 'i', 'l', 't', 'e', 'r', 'C', 'o', 'n', 'f', 'i', 'g', 'E', 'n', 't', 'r', 'y', 'R', '\024', 't', 'y', 'p', 'e', 'd', +'P', 'e', 'r', 'F', 'i', 'l', 't', 'e', 'r', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'g', '\n', '\026', 'r', 'e', 'q', 'u', 'e', 's', +'t', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '_', 't', 'o', '_', 'a', 'd', 'd', '\030', '\t', ' ', '\003', '(', '\013', '2', '\'', '.', +'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'd', +'e', 'r', 'V', 'a', 'l', 'u', 'e', 'O', 'p', 't', 'i', 'o', 'n', 'B', '\t', '\372', 'B', '\006', '\222', '\001', '\003', '\020', '\350', '\007', 'R', +'\023', 'r', 'e', 'q', 'u', 'e', 's', 't', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'T', 'o', 'A', 'd', 'd', '\022', 'M', '\n', '\031', 'r', +'e', 'q', 'u', 'e', 's', 't', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '_', 't', 'o', '_', 'r', 'e', 'm', 'o', 'v', 'e', '\030', +'\014', ' ', '\003', '(', '\t', 'B', '\022', '\372', 'B', '\017', '\222', '\001', '\014', '\"', '\n', 'r', '\010', '\020', '\001', '\300', '\001', '\001', '\310', '\001', '\000', +'R', '\026', 'r', 'e', 'q', 'u', 'e', 's', 't', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'T', 'o', 'R', 'e', 'm', 'o', 'v', 'e', '\022', +'i', '\n', '\027', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '_', 't', 'o', '_', 'a', 'd', +'d', '\030', '\n', ' ', '\003', '(', '\013', '2', '\'', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', +'r', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'O', 'p', 't', 'i', 'o', 'n', 'B', '\t', +'\372', 'B', '\006', '\222', '\001', '\003', '\020', '\350', '\007', 'R', '\024', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', 'H', 'e', 'a', 'd', 'e', 'r', +'s', 'T', 'o', 'A', 'd', 'd', '\022', 'O', '\n', '\032', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 'h', 'e', 'a', 'd', 'e', 'r', +'s', '_', 't', 'o', '_', 'r', 'e', 'm', 'o', 'v', 'e', '\030', '\013', ' ', '\003', '(', '\t', 'B', '\022', '\372', 'B', '\017', '\222', '\001', '\014', +'\"', '\n', 'r', '\010', '\020', '\001', '\300', '\001', '\001', '\310', '\001', '\000', 'R', '\027', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', 'H', 'e', 'a', +'d', 'e', 'r', 's', 'T', 'o', 'R', 'e', 'm', 'o', 'v', 'e', '\022', '8', '\n', '\007', 't', 'r', 'a', 'c', 'i', 'n', 'g', '\030', '\017', +' ', '\001', '(', '\013', '2', '\036', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', +'.', 'v', '3', '.', 'T', 'r', 'a', 'c', 'i', 'n', 'g', 'R', '\007', 't', 'r', 'a', 'c', 'i', 'n', 'g', '\022', '`', '\n', '\036', 'p', 'e', 'r', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'b', 'u', 'f', 'f', 'e', 'r', '_', 'l', 'i', 'm', 'i', 't', '_', 'b', -'y', 't', 'e', 's', '\030', '\022', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', +'y', 't', 'e', 's', '\030', '\020', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\032', 'p', 'e', 'r', 'R', 'e', 'q', 'u', 'e', 's', 't', 'B', 'u', 'f', 'f', 'e', 'r', 'L', 'i', 'm', 'i', 't', 'B', 'y', 't', 'e', 's', '\032', ']', '\n', '\031', 'T', 'y', 'p', 'e', 'd', 'P', 'e', 'r', 'F', 'i', 'l', 't', 'e', 'r', 'C', 'o', 'n', 'f', 'i', 'g', 'E', 'n', 't', 'r', 'y', '\022', '\020', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\003', 'k', 'e', 'y', '\022', '*', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', -'n', 'y', 'R', '\005', 'v', 'a', 'l', 'u', 'e', ':', '\002', '8', '\001', '\"', ':', '\n', '\022', 'T', 'l', 's', 'R', 'e', 'q', 'u', 'i', -'r', 'e', 'm', 'e', 'n', 't', 'T', 'y', 'p', 'e', '\022', '\010', '\n', '\004', 'N', 'O', 'N', 'E', '\020', '\000', '\022', '\021', '\n', '\r', 'E', -'X', 'T', 'E', 'R', 'N', 'A', 'L', '_', 'O', 'N', 'L', 'Y', '\020', '\001', '\022', '\007', '\n', '\003', 'A', 'L', 'L', '\020', '\002', ':', '%', -'\232', '\305', '\210', '\036', ' ', '\n', '\036', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', -'.', 'V', 'i', 'r', 't', 'u', 'a', 'l', 'H', 'o', 's', 't', 'J', '\004', '\010', '\t', '\020', '\n', 'J', '\004', '\010', '\014', '\020', '\r', 'R', -'\021', 'p', 'e', 'r', '_', 'f', 'i', 'l', 't', 'e', 'r', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\"', 'd', '\n', '\014', 'F', 'i', 'l', -'t', 'e', 'r', 'A', 'c', 't', 'i', 'o', 'n', '\022', ',', '\n', '\006', 'a', 'c', 't', 'i', 'o', 'n', '\030', '\001', ' ', '\001', '(', '\013', -'2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'R', '\006', 'a', -'c', 't', 'i', 'o', 'n', ':', '&', '\232', '\305', '\210', '\036', '!', '\n', '\037', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', -'2', '.', 'r', 'o', 'u', 't', 'e', '.', 'F', 'i', 'l', 't', 'e', 'r', 'A', 'c', 't', 'i', 'o', 'n', '\"', '\254', '\n', '\n', '\005', -'R', 'o', 'u', 't', 'e', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\016', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', -'\022', 'A', '\n', '\005', 'm', 'a', 't', 'c', 'h', '\030', '\001', ' ', '\001', '(', '\013', '2', '!', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', -'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'o', 'u', 't', 'e', 'M', 'a', 't', 'c', 'h', -'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\005', 'm', 'a', 't', 'c', 'h', '\022', ':', '\n', '\005', 'r', 'o', 'u', 't', -'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', -'u', 't', 'e', '.', 'v', '3', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', 'H', '\000', 'R', '\005', 'r', 'o', 'u', -'t', 'e', '\022', 'C', '\n', '\010', 'r', 'e', 'd', 'i', 'r', 'e', 'c', 't', '\030', '\003', ' ', '\001', '(', '\013', '2', '%', '.', 'e', 'n', -'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'e', 'd', 'i', 'r', -'e', 'c', 't', 'A', 'c', 't', 'i', 'o', 'n', 'H', '\000', 'R', '\010', 'r', 'e', 'd', 'i', 'r', 'e', 'c', 't', '\022', 'V', '\n', '\017', -'d', 'i', 'r', 'e', 'c', 't', '_', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '\030', '\007', ' ', '\001', '(', '\013', '2', '+', '.', 'e', -'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'D', 'i', 'r', 'e', -'c', 't', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'A', 'c', 't', 'i', 'o', 'n', 'H', '\000', 'R', '\016', 'd', 'i', 'r', 'e', 'c', -'t', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', '\022', 'J', '\n', '\r', 'f', 'i', 'l', 't', 'e', 'r', '_', 'a', 'c', 't', 'i', 'o', -'n', '\030', '\021', ' ', '\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', -'u', 't', 'e', '.', 'v', '3', '.', 'F', 'i', 'l', 't', 'e', 'r', 'A', 'c', 't', 'i', 'o', 'n', 'H', '\000', 'R', '\014', 'f', 'i', -'l', 't', 'e', 'r', 'A', 'c', 't', 'i', 'o', 'n', '\022', ':', '\n', '\010', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '\030', '\004', ' ', -'\001', '(', '\013', '2', '\036', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', -'3', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'R', '\010', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '\022', '>', '\n', '\t', 'd', -'e', 'c', 'o', 'r', 'a', 't', 'o', 'r', '\030', '\005', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', -'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'D', 'e', 'c', 'o', 'r', 'a', 't', 'o', 'r', 'R', '\t', -'d', 'e', 'c', 'o', 'r', 'a', 't', 'o', 'r', '\022', 'm', '\n', '\027', 't', 'y', 'p', 'e', 'd', '_', 'p', 'e', 'r', '_', 'f', 'i', -'l', 't', 'e', 'r', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\r', ' ', '\003', '(', '\013', '2', '6', '.', 'e', 'n', 'v', 'o', 'y', -'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'o', 'u', 't', 'e', '.', 'T', 'y', -'p', 'e', 'd', 'P', 'e', 'r', 'F', 'i', 'l', 't', 'e', 'r', 'C', 'o', 'n', 'f', 'i', 'g', 'E', 'n', 't', 'r', 'y', 'R', '\024', -'t', 'y', 'p', 'e', 'd', 'P', 'e', 'r', 'F', 'i', 'l', 't', 'e', 'r', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'g', '\n', '\026', 'r', -'e', 'q', 'u', 'e', 's', 't', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '_', 't', 'o', '_', 'a', 'd', 'd', '\030', '\t', ' ', '\003', -'(', '\013', '2', '\'', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', -'.', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'O', 'p', 't', 'i', 'o', 'n', 'B', '\t', '\372', 'B', '\006', '\222', '\001', -'\003', '\020', '\350', '\007', 'R', '\023', 'r', 'e', 'q', 'u', 'e', 's', 't', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'T', 'o', 'A', 'd', 'd', -'\022', 'M', '\n', '\031', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '_', 't', 'o', '_', 'r', 'e', -'m', 'o', 'v', 'e', '\030', '\014', ' ', '\003', '(', '\t', 'B', '\022', '\372', 'B', '\017', '\222', '\001', '\014', '\"', '\n', 'r', '\010', '\020', '\001', '\300', -'\001', '\001', '\310', '\001', '\000', 'R', '\026', 'r', 'e', 'q', 'u', 'e', 's', 't', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'T', 'o', 'R', 'e', -'m', 'o', 'v', 'e', '\022', 'i', '\n', '\027', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '_', -'t', 'o', '_', 'a', 'd', 'd', '\030', '\n', ' ', '\003', '(', '\013', '2', '\'', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', -'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'O', 'p', 't', -'i', 'o', 'n', 'B', '\t', '\372', 'B', '\006', '\222', '\001', '\003', '\020', '\350', '\007', 'R', '\024', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', 'H', -'e', 'a', 'd', 'e', 'r', 's', 'T', 'o', 'A', 'd', 'd', '\022', 'O', '\n', '\032', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 'h', -'e', 'a', 'd', 'e', 'r', 's', '_', 't', 'o', '_', 'r', 'e', 'm', 'o', 'v', 'e', '\030', '\013', ' ', '\003', '(', '\t', 'B', '\022', '\372', -'B', '\017', '\222', '\001', '\014', '\"', '\n', 'r', '\010', '\020', '\001', '\300', '\001', '\001', '\310', '\001', '\000', 'R', '\027', 'r', 'e', 's', 'p', 'o', 'n', -'s', 'e', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'T', 'o', 'R', 'e', 'm', 'o', 'v', 'e', '\022', '8', '\n', '\007', 't', 'r', 'a', 'c', -'i', 'n', 'g', '\030', '\017', ' ', '\001', '(', '\013', '2', '\036', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', -'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'T', 'r', 'a', 'c', 'i', 'n', 'g', 'R', '\007', 't', 'r', 'a', 'c', 'i', 'n', 'g', -'\022', '`', '\n', '\036', 'p', 'e', 'r', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'b', 'u', 'f', 'f', 'e', 'r', '_', 'l', 'i', -'m', 'i', 't', '_', 'b', 'y', 't', 'e', 's', '\030', '\020', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', -'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\032', 'p', 'e', 'r', -'R', 'e', 'q', 'u', 'e', 's', 't', 'B', 'u', 'f', 'f', 'e', 'r', 'L', 'i', 'm', 'i', 't', 'B', 'y', 't', 'e', 's', '\032', ']', -'\n', '\031', 'T', 'y', 'p', 'e', 'd', 'P', 'e', 'r', 'F', 'i', 'l', 't', 'e', 'r', 'C', 'o', 'n', 'f', 'i', 'g', 'E', 'n', 't', -'r', 'y', '\022', '\020', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\003', 'k', 'e', 'y', '\022', '*', '\n', '\005', 'v', -'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', -'b', 'u', 'f', '.', 'A', 'n', 'y', 'R', '\005', 'v', 'a', 'l', 'u', 'e', ':', '\002', '8', '\001', ':', '\037', '\232', '\305', '\210', '\036', '\032', -'\n', '\030', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'o', 'u', 't', -'e', 'B', '\r', '\n', '\006', 'a', 'c', 't', 'i', 'o', 'n', '\022', '\003', '\370', 'B', '\001', 'J', '\004', '\010', '\006', '\020', '\007', 'J', '\004', '\010', -'\010', '\020', '\t', 'R', '\021', 'p', 'e', 'r', '_', 'f', 'i', 'l', 't', 'e', 'r', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\"', '\353', '\010', -'\n', '\017', 'W', 'e', 'i', 'g', 'h', 't', 'e', 'd', 'C', 'l', 'u', 's', 't', 'e', 'r', '\022', 'Z', '\n', '\010', 'c', 'l', 'u', 's', -'t', 'e', 'r', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '4', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', -'.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'W', 'e', 'i', 'g', 'h', 't', 'e', 'd', 'C', 'l', 'u', 's', 't', 'e', 'r', -'.', 'C', 'l', 'u', 's', 't', 'e', 'r', 'W', 'e', 'i', 'g', 'h', 't', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', 'R', -'\010', 'c', 'l', 'u', 's', 't', 'e', 'r', 's', '\022', 'H', '\n', '\014', 't', 'o', 't', 'a', 'l', '_', 'w', 'e', 'i', 'g', 'h', 't', -'\030', '\003', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', -'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\007', '\372', 'B', '\004', '*', '\002', '(', '\001', 'R', '\013', 't', 'o', 't', -'a', 'l', 'W', 'e', 'i', 'g', 'h', 't', '\022', ',', '\n', '\022', 'r', 'u', 'n', 't', 'i', 'm', 'e', '_', 'k', 'e', 'y', '_', 'p', -'r', 'e', 'f', 'i', 'x', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\020', 'r', 'u', 'n', 't', 'i', 'm', 'e', 'K', 'e', 'y', 'P', 'r', -'e', 'f', 'i', 'x', '\032', '\330', '\006', '\n', '\r', 'C', 'l', 'u', 's', 't', 'e', 'r', 'W', 'e', 'i', 'g', 'h', 't', '\022', '\033', '\n', -'\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', 'm', -'e', '\022', '4', '\n', '\006', 'w', 'e', 'i', 'g', 'h', 't', '\030', '\002', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', -'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\006', 'w', -'e', 'i', 'g', 'h', 't', '\022', 'E', '\n', '\016', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '_', 'm', 'a', 't', 'c', 'h', '\030', '\003', -' ', '\001', '(', '\013', '2', '\036', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', -'v', '3', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'R', '\r', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', 'M', 'a', 't', 'c', -'h', '\022', 'g', '\n', '\026', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '_', 't', 'o', '_', 'a', -'d', 'd', '\030', '\004', ' ', '\003', '(', '\013', '2', '\'', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', -'o', 'r', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'O', 'p', 't', 'i', 'o', 'n', 'B', -'\t', '\372', 'B', '\006', '\222', '\001', '\003', '\020', '\350', '\007', 'R', '\023', 'r', 'e', 'q', 'u', 'e', 's', 't', 'H', 'e', 'a', 'd', 'e', 'r', -'s', 'T', 'o', 'A', 'd', 'd', '\022', 'K', '\n', '\031', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', -'_', 't', 'o', '_', 'r', 'e', 'm', 'o', 'v', 'e', '\030', '\t', ' ', '\003', '(', '\t', 'B', '\020', '\372', 'B', '\r', '\222', '\001', '\n', '\"', -'\010', 'r', '\006', '\300', '\001', '\001', '\310', '\001', '\000', 'R', '\026', 'r', 'e', 'q', 'u', 'e', 's', 't', 'H', 'e', 'a', 'd', 'e', 'r', 's', -'T', 'o', 'R', 'e', 'm', 'o', 'v', 'e', '\022', 'i', '\n', '\027', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 'h', 'e', 'a', 'd', -'e', 'r', 's', '_', 't', 'o', '_', 'a', 'd', 'd', '\030', '\005', ' ', '\003', '(', '\013', '2', '\'', '.', 'e', 'n', 'v', 'o', 'y', '.', -'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', -'e', 'O', 'p', 't', 'i', 'o', 'n', 'B', '\t', '\372', 'B', '\006', '\222', '\001', '\003', '\020', '\350', '\007', 'R', '\024', 'r', 'e', 's', 'p', 'o', -'n', 's', 'e', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'T', 'o', 'A', 'd', 'd', '\022', 'M', '\n', '\032', 'r', 'e', 's', 'p', 'o', 'n', -'s', 'e', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '_', 't', 'o', '_', 'r', 'e', 'm', 'o', 'v', 'e', '\030', '\006', ' ', '\003', '(', -'\t', 'B', '\020', '\372', 'B', '\r', '\222', '\001', '\n', '\"', '\010', 'r', '\006', '\300', '\001', '\001', '\310', '\001', '\000', 'R', '\027', 'r', 'e', 's', 'p', -'o', 'n', 's', 'e', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'T', 'o', 'R', 'e', 'm', 'o', 'v', 'e', '\022', '\205', '\001', '\n', '\027', 't', -'y', 'p', 'e', 'd', '_', 'p', 'e', 'r', '_', 'f', 'i', 'l', 't', 'e', 'r', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\n', ' ', -'\003', '(', '\013', '2', 'N', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', -'v', '3', '.', 'W', 'e', 'i', 'g', 'h', 't', 'e', 'd', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'C', 'l', 'u', 's', 't', 'e', -'r', 'W', 'e', 'i', 'g', 'h', 't', '.', 'T', 'y', 'p', 'e', 'd', 'P', 'e', 'r', 'F', 'i', 'l', 't', 'e', 'r', 'C', 'o', 'n', -'f', 'i', 'g', 'E', 'n', 't', 'r', 'y', 'R', '\024', 't', 'y', 'p', 'e', 'd', 'P', 'e', 'r', 'F', 'i', 'l', 't', 'e', 'r', 'C', -'o', 'n', 'f', 'i', 'g', '\032', ']', '\n', '\031', 'T', 'y', 'p', 'e', 'd', 'P', 'e', 'r', 'F', 'i', 'l', 't', 'e', 'r', 'C', 'o', -'n', 'f', 'i', 'g', 'E', 'n', 't', 'r', 'y', '\022', '\020', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\003', 'k', -'e', 'y', '\022', '*', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', -'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'R', '\005', 'v', 'a', 'l', 'u', 'e', ':', '\002', '8', '\001', -':', '7', '\232', '\305', '\210', '\036', '2', '\n', '0', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', -'t', 'e', '.', 'W', 'e', 'i', 'g', 'h', 't', 'e', 'd', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'C', 'l', 'u', 's', 't', 'e', -'r', 'W', 'e', 'i', 'g', 'h', 't', 'J', '\004', '\010', '\007', '\020', '\010', 'J', '\004', '\010', '\010', '\020', '\t', 'R', '\021', 'p', 'e', 'r', '_', -'f', 'i', 'l', 't', 'e', 'r', '_', 'c', 'o', 'n', 'f', 'i', 'g', ':', ')', '\232', '\305', '\210', '\036', '$', '\n', '\"', 'e', 'n', 'v', -'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'W', 'e', 'i', 'g', 'h', 't', 'e', 'd', 'C', -'l', 'u', 's', 't', 'e', 'r', '\"', '\313', '\010', '\n', '\n', 'R', 'o', 'u', 't', 'e', 'M', 'a', 't', 'c', 'h', '\022', '\030', '\n', '\006', -'p', 'r', 'e', 'f', 'i', 'x', '\030', '\001', ' ', '\001', '(', '\t', 'H', '\000', 'R', '\006', 'p', 'r', 'e', 'f', 'i', 'x', '\022', '\024', '\n', -'\004', 'p', 'a', 't', 'h', '\030', '\002', ' ', '\001', '(', '\t', 'H', '\000', 'R', '\004', 'p', 'a', 't', 'h', '\022', 'N', '\n', '\n', 's', 'a', -'f', 'e', '_', 'r', 'e', 'g', 'e', 'x', '\030', '\n', ' ', '\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', -'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'R', 'e', 'g', 'e', 'x', 'M', 'a', 't', 'c', 'h', 'e', -'r', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'H', '\000', 'R', '\t', 's', 'a', 'f', 'e', 'R', 'e', 'g', 'e', 'x', '\022', -'[', '\n', '\017', 'c', 'o', 'n', 'n', 'e', 'c', 't', '_', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\030', '\014', ' ', '\001', '(', '\013', '2', -'0', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', -'o', 'u', 't', 'e', 'M', 'a', 't', 'c', 'h', '.', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'H', -'\000', 'R', '\016', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'M', 'a', 't', 'c', 'h', 'e', 'r', '\022', 'A', '\n', '\016', 'c', 'a', 's', 'e', -'_', 's', 'e', 'n', 's', 'i', 't', 'i', 'v', 'e', '\030', '\004', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', -'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\r', 'c', 'a', 's', 'e', -'S', 'e', 'n', 's', 'i', 't', 'i', 'v', 'e', '\022', 'Y', '\n', '\020', 'r', 'u', 'n', 't', 'i', 'm', 'e', '_', 'f', 'r', 'a', 'c', -'t', 'i', 'o', 'n', '\030', '\t', ' ', '\001', '(', '\013', '2', '.', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', -'.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'F', 'r', 'a', 'c', 't', 'i', 'o', 'n', 'a', -'l', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', '\017', 'r', 'u', 'n', 't', 'i', 'm', 'e', 'F', 'r', 'a', 'c', 't', 'i', 'o', 'n', -'\022', '>', '\n', '\007', 'h', 'e', 'a', 'd', 'e', 'r', 's', '\030', '\006', ' ', '\003', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', -'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'M', 'a', -'t', 'c', 'h', 'e', 'r', 'R', '\007', 'h', 'e', 'a', 'd', 'e', 'r', 's', '\022', 'W', '\n', '\020', 'q', 'u', 'e', 'r', 'y', '_', 'p', -'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 's', '\030', '\007', ' ', '\003', '(', '\013', '2', ',', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', -'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'Q', 'u', 'e', 'r', 'y', 'P', 'a', 'r', 'a', 'm', -'e', 't', 'e', 'r', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'R', '\017', 'q', 'u', 'e', 'r', 'y', 'P', 'a', 'r', 'a', 'm', 'e', 't', -'e', 'r', 's', '\022', 'K', '\n', '\004', 'g', 'r', 'p', 'c', '\030', '\010', ' ', '\001', '(', '\013', '2', '7', '.', 'e', 'n', 'v', 'o', 'y', -'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'o', 'u', 't', 'e', 'M', 'a', 't', -'c', 'h', '.', 'G', 'r', 'p', 'c', 'R', 'o', 'u', 't', 'e', 'M', 'a', 't', 'c', 'h', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', -'\004', 'g', 'r', 'p', 'c', '\022', 'Y', '\n', '\013', 't', 'l', 's', '_', 'c', 'o', 'n', 't', 'e', 'x', 't', '\030', '\013', ' ', '\001', '(', -'\013', '2', '8', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', -'.', 'R', 'o', 'u', 't', 'e', 'M', 'a', 't', 'c', 'h', '.', 'T', 'l', 's', 'C', 'o', 'n', 't', 'e', 'x', 't', 'M', 'a', 't', -'c', 'h', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\n', 't', 'l', 's', 'C', 'o', 'n', 't', 'e', 'x', 't', '\032', 'S', '\n', '\025', -'G', 'r', 'p', 'c', 'R', 'o', 'u', 't', 'e', 'M', 'a', 't', 'c', 'h', 'O', 'p', 't', 'i', 'o', 'n', 's', ':', ':', '\232', '\305', -'\210', '\036', '5', '\n', '3', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', -'o', 'u', 't', 'e', 'M', 'a', 't', 'c', 'h', '.', 'G', 'r', 'p', 'c', 'R', 'o', 'u', 't', 'e', 'M', 'a', 't', 'c', 'h', 'O', -'p', 't', 'i', 'o', 'n', 's', '\032', '\311', '\001', '\n', '\026', 'T', 'l', 's', 'C', 'o', 'n', 't', 'e', 'x', 't', 'M', 'a', 't', 'c', -'h', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '8', '\n', '\t', 'p', 'r', 'e', 's', 'e', 'n', 't', 'e', 'd', '\030', '\001', ' ', '\001', -'(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', -'V', 'a', 'l', 'u', 'e', 'R', '\t', 'p', 'r', 'e', 's', 'e', 'n', 't', 'e', 'd', '\022', '8', '\n', '\t', 'v', 'a', 'l', 'i', 'd', -'a', 't', 'e', 'd', '\030', '\002', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', -'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\t', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', 'd', ':', -';', '\232', '\305', '\210', '\036', '6', '\n', '4', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', -'e', '.', 'R', 'o', 'u', 't', 'e', 'M', 'a', 't', 'c', 'h', '.', 'T', 'l', 's', 'C', 'o', 'n', 't', 'e', 'x', 't', 'M', 'a', -'t', 'c', 'h', 'O', 'p', 't', 'i', 'o', 'n', 's', '\032', '\020', '\n', '\016', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'M', 'a', 't', 'c', -'h', 'e', 'r', ':', '$', '\232', '\305', '\210', '\036', '\037', '\n', '\035', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', -'r', 'o', 'u', 't', 'e', '.', 'R', 'o', 'u', 't', 'e', 'M', 'a', 't', 'c', 'h', 'B', '\025', '\n', '\016', 'p', 'a', 't', 'h', '_', -'s', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', '\001', 'J', '\004', '\010', '\005', '\020', '\006', 'J', '\004', '\010', '\003', '\020', -'\004', 'R', '\005', 'r', 'e', 'g', 'e', 'x', '\"', '\350', '\004', '\n', '\n', 'C', 'o', 'r', 's', 'P', 'o', 'l', 'i', 'c', 'y', '\022', '_', -'\n', '\031', 'a', 'l', 'l', 'o', 'w', '_', 'o', 'r', 'i', 'g', 'i', 'n', '_', 's', 't', 'r', 'i', 'n', 'g', '_', 'm', 'a', 't', -'c', 'h', '\030', '\013', ' ', '\003', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', -'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'S', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'R', '\026', 'a', 'l', -'l', 'o', 'w', 'O', 'r', 'i', 'g', 'i', 'n', 'S', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', '\022', '#', '\n', '\r', 'a', -'l', 'l', 'o', 'w', '_', 'm', 'e', 't', 'h', 'o', 'd', 's', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\014', 'a', 'l', 'l', 'o', 'w', -'M', 'e', 't', 'h', 'o', 'd', 's', '\022', '#', '\n', '\r', 'a', 'l', 'l', 'o', 'w', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '\030', -'\003', ' ', '\001', '(', '\t', 'R', '\014', 'a', 'l', 'l', 'o', 'w', 'H', 'e', 'a', 'd', 'e', 'r', 's', '\022', '%', '\n', '\016', 'e', 'x', -'p', 'o', 's', 'e', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '\030', '\004', ' ', '\001', '(', '\t', 'R', '\r', 'e', 'x', 'p', 'o', 's', -'e', 'H', 'e', 'a', 'd', 'e', 'r', 's', '\022', '\027', '\n', '\007', 'm', 'a', 'x', '_', 'a', 'g', 'e', '\030', '\005', ' ', '\001', '(', '\t', -'R', '\006', 'm', 'a', 'x', 'A', 'g', 'e', '\022', 'G', '\n', '\021', 'a', 'l', 'l', 'o', 'w', '_', 'c', 'r', 'e', 'd', 'e', 'n', 't', -'i', 'a', 'l', 's', '\030', '\006', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', -'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\020', 'a', 'l', 'l', 'o', 'w', 'C', 'r', 'e', 'd', 'e', -'n', 't', 'i', 'a', 'l', 's', '\022', 'W', '\n', '\016', 'f', 'i', 'l', 't', 'e', 'r', '_', 'e', 'n', 'a', 'b', 'l', 'e', 'd', '\030', +'n', 'y', 'R', '\005', 'v', 'a', 'l', 'u', 'e', ':', '\002', '8', '\001', ':', '\037', '\232', '\305', '\210', '\036', '\032', '\n', '\030', 'e', 'n', 'v', +'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'o', 'u', 't', 'e', 'B', '\r', '\n', '\006', +'a', 'c', 't', 'i', 'o', 'n', '\022', '\003', '\370', 'B', '\001', 'J', '\004', '\010', '\006', '\020', '\007', 'J', '\004', '\010', '\010', '\020', '\t', 'R', '\021', +'p', 'e', 'r', '_', 'f', 'i', 'l', 't', 'e', 'r', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\"', '\353', '\010', '\n', '\017', 'W', 'e', 'i', +'g', 'h', 't', 'e', 'd', 'C', 'l', 'u', 's', 't', 'e', 'r', '\022', 'Z', '\n', '\010', 'c', 'l', 'u', 's', 't', 'e', 'r', 's', '\030', +'\001', ' ', '\003', '(', '\013', '2', '4', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', +'e', '.', 'v', '3', '.', 'W', 'e', 'i', 'g', 'h', 't', 'e', 'd', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'C', 'l', 'u', 's', +'t', 'e', 'r', 'W', 'e', 'i', 'g', 'h', 't', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', 'R', '\010', 'c', 'l', 'u', 's', +'t', 'e', 'r', 's', '\022', 'H', '\n', '\014', 't', 'o', 't', 'a', 'l', '_', 'w', 'e', 'i', 'g', 'h', 't', '\030', '\003', ' ', '\001', '(', +'\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', +'2', 'V', 'a', 'l', 'u', 'e', 'B', '\007', '\372', 'B', '\004', '*', '\002', '(', '\001', 'R', '\013', 't', 'o', 't', 'a', 'l', 'W', 'e', 'i', +'g', 'h', 't', '\022', ',', '\n', '\022', 'r', 'u', 'n', 't', 'i', 'm', 'e', '_', 'k', 'e', 'y', '_', 'p', 'r', 'e', 'f', 'i', 'x', +'\030', '\002', ' ', '\001', '(', '\t', 'R', '\020', 'r', 'u', 'n', 't', 'i', 'm', 'e', 'K', 'e', 'y', 'P', 'r', 'e', 'f', 'i', 'x', '\032', +'\330', '\006', '\n', '\r', 'C', 'l', 'u', 's', 't', 'e', 'r', 'W', 'e', 'i', 'g', 'h', 't', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', +'\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '4', '\n', '\006', +'w', 'e', 'i', 'g', 'h', 't', '\030', '\002', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', +'t', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\006', 'w', 'e', 'i', 'g', 'h', 't', +'\022', 'E', '\n', '\016', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '_', 'm', 'a', 't', 'c', 'h', '\030', '\003', ' ', '\001', '(', '\013', '2', +'\036', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'M', 'e', +'t', 'a', 'd', 'a', 't', 'a', 'R', '\r', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', 'M', 'a', 't', 'c', 'h', '\022', 'g', '\n', '\026', +'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '_', 't', 'o', '_', 'a', 'd', 'd', '\030', '\004', ' ', +'\003', '(', '\013', '2', '\'', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', +'3', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'O', 'p', 't', 'i', 'o', 'n', 'B', '\t', '\372', 'B', '\006', '\222', +'\001', '\003', '\020', '\350', '\007', 'R', '\023', 'r', 'e', 'q', 'u', 'e', 's', 't', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'T', 'o', 'A', 'd', +'d', '\022', 'K', '\n', '\031', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '_', 't', 'o', '_', 'r', +'e', 'm', 'o', 'v', 'e', '\030', '\t', ' ', '\003', '(', '\t', 'B', '\020', '\372', 'B', '\r', '\222', '\001', '\n', '\"', '\010', 'r', '\006', '\300', '\001', +'\001', '\310', '\001', '\000', 'R', '\026', 'r', 'e', 'q', 'u', 'e', 's', 't', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'T', 'o', 'R', 'e', 'm', +'o', 'v', 'e', '\022', 'i', '\n', '\027', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '_', 't', +'o', '_', 'a', 'd', 'd', '\030', '\005', ' ', '\003', '(', '\013', '2', '\'', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', +'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'O', 'p', 't', 'i', +'o', 'n', 'B', '\t', '\372', 'B', '\006', '\222', '\001', '\003', '\020', '\350', '\007', 'R', '\024', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', 'H', 'e', +'a', 'd', 'e', 'r', 's', 'T', 'o', 'A', 'd', 'd', '\022', 'M', '\n', '\032', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 'h', 'e', +'a', 'd', 'e', 'r', 's', '_', 't', 'o', '_', 'r', 'e', 'm', 'o', 'v', 'e', '\030', '\006', ' ', '\003', '(', '\t', 'B', '\020', '\372', 'B', +'\r', '\222', '\001', '\n', '\"', '\010', 'r', '\006', '\300', '\001', '\001', '\310', '\001', '\000', 'R', '\027', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', 'H', +'e', 'a', 'd', 'e', 'r', 's', 'T', 'o', 'R', 'e', 'm', 'o', 'v', 'e', '\022', '\205', '\001', '\n', '\027', 't', 'y', 'p', 'e', 'd', '_', +'p', 'e', 'r', '_', 'f', 'i', 'l', 't', 'e', 'r', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\n', ' ', '\003', '(', '\013', '2', 'N', +'.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'W', 'e', +'i', 'g', 'h', 't', 'e', 'd', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', 'W', 'e', 'i', 'g', +'h', 't', '.', 'T', 'y', 'p', 'e', 'd', 'P', 'e', 'r', 'F', 'i', 'l', 't', 'e', 'r', 'C', 'o', 'n', 'f', 'i', 'g', 'E', 'n', +'t', 'r', 'y', 'R', '\024', 't', 'y', 'p', 'e', 'd', 'P', 'e', 'r', 'F', 'i', 'l', 't', 'e', 'r', 'C', 'o', 'n', 'f', 'i', 'g', +'\032', ']', '\n', '\031', 'T', 'y', 'p', 'e', 'd', 'P', 'e', 'r', 'F', 'i', 'l', 't', 'e', 'r', 'C', 'o', 'n', 'f', 'i', 'g', 'E', +'n', 't', 'r', 'y', '\022', '\020', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\003', 'k', 'e', 'y', '\022', '*', '\n', +'\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', +'t', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'R', '\005', 'v', 'a', 'l', 'u', 'e', ':', '\002', '8', '\001', ':', '7', '\232', '\305', '\210', +'\036', '2', '\n', '0', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'W', 'e', +'i', 'g', 'h', 't', 'e', 'd', 'C', 'l', 'u', 's', 't', 'e', 'r', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', 'W', 'e', 'i', 'g', +'h', 't', 'J', '\004', '\010', '\007', '\020', '\010', 'J', '\004', '\010', '\010', '\020', '\t', 'R', '\021', 'p', 'e', 'r', '_', 'f', 'i', 'l', 't', 'e', +'r', '_', 'c', 'o', 'n', 'f', 'i', 'g', ':', ')', '\232', '\305', '\210', '\036', '$', '\n', '\"', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', +'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'W', 'e', 'i', 'g', 'h', 't', 'e', 'd', 'C', 'l', 'u', 's', 't', 'e', +'r', '\"', '\313', '\010', '\n', '\n', 'R', 'o', 'u', 't', 'e', 'M', 'a', 't', 'c', 'h', '\022', '\030', '\n', '\006', 'p', 'r', 'e', 'f', 'i', +'x', '\030', '\001', ' ', '\001', '(', '\t', 'H', '\000', 'R', '\006', 'p', 'r', 'e', 'f', 'i', 'x', '\022', '\024', '\n', '\004', 'p', 'a', 't', 'h', +'\030', '\002', ' ', '\001', '(', '\t', 'H', '\000', 'R', '\004', 'p', 'a', 't', 'h', '\022', 'N', '\n', '\n', 's', 'a', 'f', 'e', '_', 'r', 'e', +'g', 'e', 'x', '\030', '\n', ' ', '\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', +'t', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'R', 'e', 'g', 'e', 'x', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '\010', '\372', 'B', +'\005', '\212', '\001', '\002', '\020', '\001', 'H', '\000', 'R', '\t', 's', 'a', 'f', 'e', 'R', 'e', 'g', 'e', 'x', '\022', '[', '\n', '\017', 'c', 'o', +'n', 'n', 'e', 'c', 't', '_', 'm', 'a', 't', 'c', 'h', 'e', 'r', '\030', '\014', ' ', '\001', '(', '\013', '2', '0', '.', 'e', 'n', 'v', +'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'o', 'u', 't', 'e', 'M', +'a', 't', 'c', 'h', '.', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'H', '\000', 'R', '\016', 'c', 'o', +'n', 'n', 'e', 'c', 't', 'M', 'a', 't', 'c', 'h', 'e', 'r', '\022', 'A', '\n', '\016', 'c', 'a', 's', 'e', '_', 's', 'e', 'n', 's', +'i', 't', 'i', 'v', 'e', '\030', '\004', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', +'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\r', 'c', 'a', 's', 'e', 'S', 'e', 'n', 's', 'i', +'t', 'i', 'v', 'e', '\022', 'Y', '\n', '\020', 'r', 'u', 'n', 't', 'i', 'm', 'e', '_', 'f', 'r', 'a', 'c', 't', 'i', 'o', 'n', '\030', '\t', ' ', '\001', '(', '\013', '2', '.', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'F', 'r', 'a', 'c', 't', 'i', 'o', 'n', 'a', 'l', 'P', 'e', 'r', 'c', -'e', 'n', 't', 'H', '\000', 'R', '\r', 'f', 'i', 'l', 't', 'e', 'r', 'E', 'n', 'a', 'b', 'l', 'e', 'd', '\022', 'U', '\n', '\016', 's', -'h', 'a', 'd', 'o', 'w', '_', 'e', 'n', 'a', 'b', 'l', 'e', 'd', '\030', '\n', ' ', '\001', '(', '\013', '2', '.', '.', 'e', 'n', 'v', -'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'R', 'u', 'n', 't', 'i', 'm', 'e', -'F', 'r', 'a', 'c', 't', 'i', 'o', 'n', 'a', 'l', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', '\r', 's', 'h', 'a', 'd', 'o', 'w', -'E', 'n', 'a', 'b', 'l', 'e', 'd', ':', '$', '\232', '\305', '\210', '\036', '\037', '\n', '\035', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', -'.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'C', 'o', 'r', 's', 'P', 'o', 'l', 'i', 'c', 'y', 'B', '\023', '\n', '\021', 'e', -'n', 'a', 'b', 'l', 'e', 'd', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'J', '\004', '\010', '\001', '\020', '\002', 'J', '\004', '\010', -'\010', '\020', '\t', 'J', '\004', '\010', '\007', '\020', '\010', 'R', '\014', 'a', 'l', 'l', 'o', 'w', '_', 'o', 'r', 'i', 'g', 'i', 'n', 'R', '\022', -'a', 'l', 'l', 'o', 'w', '_', 'o', 'r', 'i', 'g', 'i', 'n', '_', 'r', 'e', 'g', 'e', 'x', 'R', '\007', 'e', 'n', 'a', 'b', 'l', -'e', 'd', '\"', '\236', '&', '\n', '\013', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', '\022', '#', '\n', '\007', 'c', 'l', 'u', -'s', 't', 'e', 'r', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'H', '\000', 'R', '\007', 'c', 'l', -'u', 's', 't', 'e', 'r', '\022', '6', '\n', '\016', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 'h', 'e', 'a', 'd', 'e', 'r', '\030', '\002', -' ', '\001', '(', '\t', 'B', '\r', '\372', 'B', '\n', 'r', '\010', '\020', '\001', '\300', '\001', '\001', '\310', '\001', '\000', 'H', '\000', 'R', '\r', 'c', 'l', -'u', 's', 't', 'e', 'r', 'H', 'e', 'a', 'd', 'e', 'r', '\022', 'U', '\n', '\021', 'w', 'e', 'i', 'g', 'h', 't', 'e', 'd', '_', 'c', -'l', 'u', 's', 't', 'e', 'r', 's', '\030', '\003', ' ', '\001', '(', '\013', '2', '&', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', -'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'W', 'e', 'i', 'g', 'h', 't', 'e', 'd', 'C', 'l', 'u', 's', -'t', 'e', 'r', 'H', '\000', 'R', '\020', 'w', 'e', 'i', 'g', 'h', 't', 'e', 'd', 'C', 'l', 'u', 's', 't', 'e', 'r', 's', '\022', '\216', -'\001', '\n', '\037', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 'n', 'o', 't', '_', 'f', 'o', 'u', 'n', 'd', '_', 'r', 'e', 's', 'p', -'o', 'n', 's', 'e', '_', 'c', 'o', 'd', 'e', '\030', '\024', ' ', '\001', '(', '\016', '2', '>', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', -'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', -'n', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', 'N', 'o', 't', 'F', 'o', 'u', 'n', 'd', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', -'C', 'o', 'd', 'e', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\033', 'c', 'l', 'u', 's', 't', 'e', 'r', 'N', 'o', -'t', 'F', 'o', 'u', 'n', 'd', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'C', 'o', 'd', 'e', '\022', 'E', '\n', '\016', 'm', 'e', 't', -'a', 'd', 'a', 't', 'a', '_', 'm', 'a', 't', 'c', 'h', '\030', '\004', ' ', '\001', '(', '\013', '2', '\036', '.', 'e', 'n', 'v', 'o', 'y', -'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'R', -'\r', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', 'M', 'a', 't', 'c', 'h', '\022', '2', '\n', '\016', 'p', 'r', 'e', 'f', 'i', 'x', '_', -'r', 'e', 'w', 'r', 'i', 't', 'e', '\030', '\005', ' ', '\001', '(', '\t', 'B', '\013', '\372', 'B', '\010', 'r', '\006', '\300', '\001', '\002', '\310', '\001', -'\000', 'R', '\r', 'p', 'r', 'e', 'f', 'i', 'x', 'R', 'e', 'w', 'r', 'i', 't', 'e', '\022', 'S', '\n', '\r', 'r', 'e', 'g', 'e', 'x', -'_', 'r', 'e', 'w', 'r', 'i', 't', 'e', '\030', ' ', ' ', '\001', '(', '\013', '2', '.', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', -'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'R', 'e', 'g', 'e', 'x', 'M', 'a', 't', 'c', 'h', 'A', -'n', 'd', 'S', 'u', 'b', 's', 't', 'i', 't', 'u', 't', 'e', 'R', '\014', 'r', 'e', 'g', 'e', 'x', 'R', 'e', 'w', 'r', 'i', 't', -'e', '\022', '?', '\n', '\024', 'h', 'o', 's', 't', '_', 'r', 'e', 'w', 'r', 'i', 't', 'e', '_', 'l', 'i', 't', 'e', 'r', 'a', 'l', -'\030', '\006', ' ', '\001', '(', '\t', 'B', '\013', '\372', 'B', '\010', 'r', '\006', '\300', '\001', '\002', '\310', '\001', '\000', 'H', '\001', 'R', '\022', 'h', 'o', -'s', 't', 'R', 'e', 'w', 'r', 'i', 't', 'e', 'L', 'i', 't', 'e', 'r', 'a', 'l', '\022', 'H', '\n', '\021', 'a', 'u', 't', 'o', '_', -'h', 'o', 's', 't', '_', 'r', 'e', 'w', 'r', 'i', 't', 'e', '\030', '\007', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', -'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'H', '\001', 'R', '\017', -'a', 'u', 't', 'o', 'H', 'o', 's', 't', 'R', 'e', 'w', 'r', 'i', 't', 'e', '\022', '=', '\n', '\023', 'h', 'o', 's', 't', '_', 'r', -'e', 'w', 'r', 'i', 't', 'e', '_', 'h', 'e', 'a', 'd', 'e', 'r', '\030', '\035', ' ', '\001', '(', '\t', 'B', '\013', '\372', 'B', '\010', 'r', -'\006', '\300', '\001', '\001', '\310', '\001', '\000', 'H', '\001', 'R', '\021', 'h', 'o', 's', 't', 'R', 'e', 'w', 'r', 'i', 't', 'e', 'H', 'e', 'a', -'d', 'e', 'r', '\022', 'g', '\n', '\027', 'h', 'o', 's', 't', '_', 'r', 'e', 'w', 'r', 'i', 't', 'e', '_', 'p', 'a', 't', 'h', '_', -'r', 'e', 'g', 'e', 'x', '\030', '#', ' ', '\001', '(', '\013', '2', '.', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', -'m', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'R', 'e', 'g', 'e', 'x', 'M', 'a', 't', 'c', 'h', 'A', 'n', 'd', 'S', -'u', 'b', 's', 't', 'i', 't', 'u', 't', 'e', 'H', '\001', 'R', '\024', 'h', 'o', 's', 't', 'R', 'e', 'w', 'r', 'i', 't', 'e', 'P', -'a', 't', 'h', 'R', 'e', 'g', 'e', 'x', '\022', '3', '\n', '\007', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\010', ' ', '\001', '(', '\013', -'2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', -'o', 'n', 'R', '\007', 't', 'i', 'm', 'e', 'o', 'u', 't', '\022', '<', '\n', '\014', 'i', 'd', 'l', 'e', '_', 't', 'i', 'm', 'e', 'o', -'u', 't', '\030', '\030', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', -'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\013', 'i', 'd', 'l', 'e', 'T', 'i', 'm', 'e', 'o', 'u', 't', '\022', 'E', -'\n', '\014', 'r', 'e', 't', 'r', 'y', '_', 'p', 'o', 'l', 'i', 'c', 'y', '\030', '\t', ' ', '\001', '(', '\013', '2', '\"', '.', 'e', 'n', -'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'e', 't', 'r', 'y', -'P', 'o', 'l', 'i', 'c', 'y', 'R', '\013', 'r', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', '\022', 'O', '\n', '\031', 'r', 'e', -'t', 'r', 'y', '_', 'p', 'o', 'l', 'i', 'c', 'y', '_', 't', 'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '!', -' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', -'y', 'R', '\026', 'r', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', 'T', 'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', -'\022', 'n', '\n', '\027', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'm', 'i', 'r', 'r', 'o', 'r', '_', 'p', 'o', 'l', 'i', 'c', 'i', -'e', 's', '\030', '\036', ' ', '\003', '(', '\013', '2', '6', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', -'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', '.', 'R', 'e', 'q', 'u', 'e', -'s', 't', 'M', 'i', 'r', 'r', 'o', 'r', 'P', 'o', 'l', 'i', 'c', 'y', 'R', '\025', 'r', 'e', 'q', 'u', 'e', 's', 't', 'M', 'i', -'r', 'r', 'o', 'r', 'P', 'o', 'l', 'i', 'c', 'i', 'e', 's', '\022', 'K', '\n', '\010', 'p', 'r', 'i', 'o', 'r', 'i', 't', 'y', '\030', -'\013', ' ', '\001', '(', '\016', '2', '%', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', -'.', 'v', '3', '.', 'R', 'o', 'u', 't', 'i', 'n', 'g', 'P', 'r', 'i', 'o', 'r', 'i', 't', 'y', 'B', '\010', '\372', 'B', '\005', '\202', -'\001', '\002', '\020', '\001', 'R', '\010', 'p', 'r', 'i', 'o', 'r', 'i', 't', 'y', '\022', 'A', '\n', '\013', 'r', 'a', 't', 'e', '_', 'l', 'i', -'m', 'i', 't', 's', '\030', '\r', ' ', '\003', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', -'.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', 'R', '\n', 'r', 'a', 't', 'e', -'L', 'i', 'm', 'i', 't', 's', '\022', 'S', '\n', '\026', 'i', 'n', 'c', 'l', 'u', 'd', 'e', '_', 'v', 'h', '_', 'r', 'a', 't', 'e', -'_', 'l', 'i', 'm', 'i', 't', 's', '\030', '\016', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', -'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'B', '\002', '\030', '\001', 'R', '\023', 'i', 'n', 'c', -'l', 'u', 'd', 'e', 'V', 'h', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', 's', '\022', 'N', '\n', '\013', 'h', 'a', 's', 'h', '_', -'p', 'o', 'l', 'i', 'c', 'y', '\030', '\017', ' ', '\003', '(', '\013', '2', '-', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', -'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', '.', 'H', -'a', 's', 'h', 'P', 'o', 'l', 'i', 'c', 'y', 'R', '\n', 'h', 'a', 's', 'h', 'P', 'o', 'l', 'i', 'c', 'y', '\022', '5', '\n', '\004', -'c', 'o', 'r', 's', '\030', '\021', ' ', '\001', '(', '\013', '2', '!', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', -'.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'C', 'o', 'r', 's', 'P', 'o', 'l', 'i', 'c', 'y', 'R', '\004', 'c', 'o', 'r', -'s', '\022', 'C', '\n', '\020', 'm', 'a', 'x', '_', 'g', 'r', 'p', 'c', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\027', ' ', '\001', -'(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', -'t', 'i', 'o', 'n', 'R', '\016', 'm', 'a', 'x', 'G', 'r', 'p', 'c', 'T', 'i', 'm', 'e', 'o', 'u', 't', '\022', 'I', '\n', '\023', 'g', -'r', 'p', 'c', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '_', 'o', 'f', 'f', 's', 'e', 't', '\030', '\034', ' ', '\001', '(', '\013', '2', -'\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', -'n', 'R', '\021', 'g', 'r', 'p', 'c', 'T', 'i', 'm', 'e', 'o', 'u', 't', 'O', 'f', 'f', 's', 'e', 't', '\022', 'Y', '\n', '\017', 'u', -'p', 'g', 'r', 'a', 'd', 'e', '_', 'c', 'o', 'n', 'f', 'i', 'g', 's', '\030', '\031', ' ', '\003', '(', '\013', '2', '0', '.', 'e', 'n', -'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'o', 'u', 't', 'e', -'A', 'c', 't', 'i', 'o', 'n', '.', 'U', 'p', 'g', 'r', 'a', 'd', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\016', 'u', 'p', 'g', -'r', 'a', 'd', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 's', '\022', 'g', '\n', '\030', 'i', 'n', 't', 'e', 'r', 'n', 'a', 'l', '_', 'r', -'e', 'd', 'i', 'r', 'e', 'c', 't', '_', 'p', 'o', 'l', 'i', 'c', 'y', '\030', '\"', ' ', '\001', '(', '\013', '2', '-', '.', 'e', 'n', -'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'I', 'n', 't', 'e', 'r', -'n', 'a', 'l', 'R', 'e', 'd', 'i', 'r', 'e', 'c', 't', 'P', 'o', 'l', 'i', 'c', 'y', 'R', '\026', 'i', 'n', 't', 'e', 'r', 'n', -'a', 'l', 'R', 'e', 'd', 'i', 'r', 'e', 'c', 't', 'P', 'o', 'l', 'i', 'c', 'y', '\022', 'w', '\n', '\030', 'i', 'n', 't', 'e', 'r', -'n', 'a', 'l', '_', 'r', 'e', 'd', 'i', 'r', 'e', 'c', 't', '_', 'a', 'c', 't', 'i', 'o', 'n', '\030', '\032', ' ', '\001', '(', '\016', -'2', '9', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', -'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', '.', 'I', 'n', 't', 'e', 'r', 'n', 'a', 'l', 'R', 'e', 'd', 'i', 'r', -'e', 'c', 't', 'A', 'c', 't', 'i', 'o', 'n', 'B', '\002', '\030', '\001', 'R', '\026', 'i', 'n', 't', 'e', 'r', 'n', 'a', 'l', 'R', 'e', -'d', 'i', 'r', 'e', 'c', 't', 'A', 'c', 't', 'i', 'o', 'n', '\022', 'V', '\n', '\026', 'm', 'a', 'x', '_', 'i', 'n', 't', 'e', 'r', -'n', 'a', 'l', '_', 'r', 'e', 'd', 'i', 'r', 'e', 'c', 't', 's', '\030', '\037', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', -'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', -'\002', '\030', '\001', 'R', '\024', 'm', 'a', 'x', 'I', 'n', 't', 'e', 'r', 'n', 'a', 'l', 'R', 'e', 'd', 'i', 'r', 'e', 'c', 't', 's', -'\022', 'E', '\n', '\014', 'h', 'e', 'd', 'g', 'e', '_', 'p', 'o', 'l', 'i', 'c', 'y', '\030', '\033', ' ', '\001', '(', '\013', '2', '\"', '.', -'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'H', 'e', 'd', -'g', 'e', 'P', 'o', 'l', 'i', 'c', 'y', 'R', '\013', 'h', 'e', 'd', 'g', 'e', 'P', 'o', 'l', 'i', 'c', 'y', '\022', 'd', '\n', '\023', -'m', 'a', 'x', '_', 's', 't', 'r', 'e', 'a', 'm', '_', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', '\030', '$', ' ', '\001', '(', '\013', +'e', 'n', 't', 'R', '\017', 'r', 'u', 'n', 't', 'i', 'm', 'e', 'F', 'r', 'a', 'c', 't', 'i', 'o', 'n', '\022', '>', '\n', '\007', 'h', +'e', 'a', 'd', 'e', 'r', 's', '\030', '\006', ' ', '\003', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', +'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'M', 'a', 't', 'c', 'h', 'e', 'r', +'R', '\007', 'h', 'e', 'a', 'd', 'e', 'r', 's', '\022', 'W', '\n', '\020', 'q', 'u', 'e', 'r', 'y', '_', 'p', 'a', 'r', 'a', 'm', 'e', +'t', 'e', 'r', 's', '\030', '\007', ' ', '\003', '(', '\013', '2', ',', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', +'.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'Q', 'u', 'e', 'r', 'y', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'M', +'a', 't', 'c', 'h', 'e', 'r', 'R', '\017', 'q', 'u', 'e', 'r', 'y', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 's', '\022', 'K', +'\n', '\004', 'g', 'r', 'p', 'c', '\030', '\010', ' ', '\001', '(', '\013', '2', '7', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', +'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'o', 'u', 't', 'e', 'M', 'a', 't', 'c', 'h', '.', 'G', 'r', +'p', 'c', 'R', 'o', 'u', 't', 'e', 'M', 'a', 't', 'c', 'h', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\004', 'g', 'r', 'p', 'c', +'\022', 'Y', '\n', '\013', 't', 'l', 's', '_', 'c', 'o', 'n', 't', 'e', 'x', 't', '\030', '\013', ' ', '\001', '(', '\013', '2', '8', '.', 'e', +'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'o', 'u', 't', +'e', 'M', 'a', 't', 'c', 'h', '.', 'T', 'l', 's', 'C', 'o', 'n', 't', 'e', 'x', 't', 'M', 'a', 't', 'c', 'h', 'O', 'p', 't', +'i', 'o', 'n', 's', 'R', '\n', 't', 'l', 's', 'C', 'o', 'n', 't', 'e', 'x', 't', '\032', 'S', '\n', '\025', 'G', 'r', 'p', 'c', 'R', +'o', 'u', 't', 'e', 'M', 'a', 't', 'c', 'h', 'O', 'p', 't', 'i', 'o', 'n', 's', ':', ':', '\232', '\305', '\210', '\036', '5', '\n', '3', +'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'o', 'u', 't', 'e', 'M', +'a', 't', 'c', 'h', '.', 'G', 'r', 'p', 'c', 'R', 'o', 'u', 't', 'e', 'M', 'a', 't', 'c', 'h', 'O', 'p', 't', 'i', 'o', 'n', +'s', '\032', '\311', '\001', '\n', '\026', 'T', 'l', 's', 'C', 'o', 'n', 't', 'e', 'x', 't', 'M', 'a', 't', 'c', 'h', 'O', 'p', 't', 'i', +'o', 'n', 's', '\022', '8', '\n', '\t', 'p', 'r', 'e', 's', 'e', 'n', 't', 'e', 'd', '\030', '\001', ' ', '\001', '(', '\013', '2', '\032', '.', +'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', +'R', '\t', 'p', 'r', 'e', 's', 'e', 'n', 't', 'e', 'd', '\022', '8', '\n', '\t', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', 'd', '\030', +'\002', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', +'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\t', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', 'd', ':', ';', '\232', '\305', '\210', '\036', +'6', '\n', '4', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'o', 'u', +'t', 'e', 'M', 'a', 't', 'c', 'h', '.', 'T', 'l', 's', 'C', 'o', 'n', 't', 'e', 'x', 't', 'M', 'a', 't', 'c', 'h', 'O', 'p', +'t', 'i', 'o', 'n', 's', '\032', '\020', '\n', '\016', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'M', 'a', 't', 'c', 'h', 'e', 'r', ':', '$', +'\232', '\305', '\210', '\036', '\037', '\n', '\035', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', +'.', 'R', 'o', 'u', 't', 'e', 'M', 'a', 't', 'c', 'h', 'B', '\025', '\n', '\016', 'p', 'a', 't', 'h', '_', 's', 'p', 'e', 'c', 'i', +'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', '\001', 'J', '\004', '\010', '\005', '\020', '\006', 'J', '\004', '\010', '\003', '\020', '\004', 'R', '\005', 'r', 'e', +'g', 'e', 'x', '\"', '\350', '\004', '\n', '\n', 'C', 'o', 'r', 's', 'P', 'o', 'l', 'i', 'c', 'y', '\022', '_', '\n', '\031', 'a', 'l', 'l', +'o', 'w', '_', 'o', 'r', 'i', 'g', 'i', 'n', '_', 's', 't', 'r', 'i', 'n', 'g', '_', 'm', 'a', 't', 'c', 'h', '\030', '\013', ' ', +'\003', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', +'v', '3', '.', 'S', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'R', '\026', 'a', 'l', 'l', 'o', 'w', 'O', 'r', +'i', 'g', 'i', 'n', 'S', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', '\022', '#', '\n', '\r', 'a', 'l', 'l', 'o', 'w', '_', +'m', 'e', 't', 'h', 'o', 'd', 's', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\014', 'a', 'l', 'l', 'o', 'w', 'M', 'e', 't', 'h', 'o', +'d', 's', '\022', '#', '\n', '\r', 'a', 'l', 'l', 'o', 'w', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '\030', '\003', ' ', '\001', '(', '\t', +'R', '\014', 'a', 'l', 'l', 'o', 'w', 'H', 'e', 'a', 'd', 'e', 'r', 's', '\022', '%', '\n', '\016', 'e', 'x', 'p', 'o', 's', 'e', '_', +'h', 'e', 'a', 'd', 'e', 'r', 's', '\030', '\004', ' ', '\001', '(', '\t', 'R', '\r', 'e', 'x', 'p', 'o', 's', 'e', 'H', 'e', 'a', 'd', +'e', 'r', 's', '\022', '\027', '\n', '\007', 'm', 'a', 'x', '_', 'a', 'g', 'e', '\030', '\005', ' ', '\001', '(', '\t', 'R', '\006', 'm', 'a', 'x', +'A', 'g', 'e', '\022', 'G', '\n', '\021', 'a', 'l', 'l', 'o', 'w', '_', 'c', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', 's', '\030', +'\006', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', +'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\020', 'a', 'l', 'l', 'o', 'w', 'C', 'r', 'e', 'd', 'e', 'n', 't', 'i', 'a', 'l', +'s', '\022', 'W', '\n', '\016', 'f', 'i', 'l', 't', 'e', 'r', '_', 'e', 'n', 'a', 'b', 'l', 'e', 'd', '\030', '\t', ' ', '\001', '(', '\013', +'2', '.', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'R', +'u', 'n', 't', 'i', 'm', 'e', 'F', 'r', 'a', 'c', 't', 'i', 'o', 'n', 'a', 'l', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'H', '\000', +'R', '\r', 'f', 'i', 'l', 't', 'e', 'r', 'E', 'n', 'a', 'b', 'l', 'e', 'd', '\022', 'U', '\n', '\016', 's', 'h', 'a', 'd', 'o', 'w', +'_', 'e', 'n', 'a', 'b', 'l', 'e', 'd', '\030', '\n', ' ', '\001', '(', '\013', '2', '.', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', +'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'F', 'r', 'a', 'c', 't', +'i', 'o', 'n', 'a', 'l', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', '\r', 's', 'h', 'a', 'd', 'o', 'w', 'E', 'n', 'a', 'b', 'l', +'e', 'd', ':', '$', '\232', '\305', '\210', '\036', '\037', '\n', '\035', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', +'o', 'u', 't', 'e', '.', 'C', 'o', 'r', 's', 'P', 'o', 'l', 'i', 'c', 'y', 'B', '\023', '\n', '\021', 'e', 'n', 'a', 'b', 'l', 'e', +'d', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'J', '\004', '\010', '\001', '\020', '\002', 'J', '\004', '\010', '\010', '\020', '\t', 'J', '\004', +'\010', '\007', '\020', '\010', 'R', '\014', 'a', 'l', 'l', 'o', 'w', '_', 'o', 'r', 'i', 'g', 'i', 'n', 'R', '\022', 'a', 'l', 'l', 'o', 'w', +'_', 'o', 'r', 'i', 'g', 'i', 'n', '_', 'r', 'e', 'g', 'e', 'x', 'R', '\007', 'e', 'n', 'a', 'b', 'l', 'e', 'd', '\"', '\310', '&', +'\n', '\013', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', '\022', '#', '\n', '\007', 'c', 'l', 'u', 's', 't', 'e', 'r', '\030', +'\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'H', '\000', 'R', '\007', 'c', 'l', 'u', 's', 't', 'e', 'r', +'\022', '6', '\n', '\016', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 'h', 'e', 'a', 'd', 'e', 'r', '\030', '\002', ' ', '\001', '(', '\t', 'B', +'\r', '\372', 'B', '\n', 'r', '\010', '\020', '\001', '\300', '\001', '\001', '\310', '\001', '\000', 'H', '\000', 'R', '\r', 'c', 'l', 'u', 's', 't', 'e', 'r', +'H', 'e', 'a', 'd', 'e', 'r', '\022', 'U', '\n', '\021', 'w', 'e', 'i', 'g', 'h', 't', 'e', 'd', '_', 'c', 'l', 'u', 's', 't', 'e', +'r', 's', '\030', '\003', ' ', '\001', '(', '\013', '2', '&', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', +'o', 'u', 't', 'e', '.', 'v', '3', '.', 'W', 'e', 'i', 'g', 'h', 't', 'e', 'd', 'C', 'l', 'u', 's', 't', 'e', 'r', 'H', '\000', +'R', '\020', 'w', 'e', 'i', 'g', 'h', 't', 'e', 'd', 'C', 'l', 'u', 's', 't', 'e', 'r', 's', '\022', '\216', '\001', '\n', '\037', 'c', 'l', +'u', 's', 't', 'e', 'r', '_', 'n', 'o', 't', '_', 'f', 'o', 'u', 'n', 'd', '_', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', +'c', 'o', 'd', 'e', '\030', '\024', ' ', '\001', '(', '\016', '2', '>', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', +'.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', '.', 'C', 'l', 'u', +'s', 't', 'e', 'r', 'N', 'o', 't', 'F', 'o', 'u', 'n', 'd', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'C', 'o', 'd', 'e', 'B', +'\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\033', 'c', 'l', 'u', 's', 't', 'e', 'r', 'N', 'o', 't', 'F', 'o', 'u', 'n', +'d', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'C', 'o', 'd', 'e', '\022', 'E', '\n', '\016', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', +'_', 'm', 'a', 't', 'c', 'h', '\030', '\004', ' ', '\001', '(', '\013', '2', '\036', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', +'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'R', '\r', 'm', 'e', 't', 'a', +'d', 'a', 't', 'a', 'M', 'a', 't', 'c', 'h', '\022', '2', '\n', '\016', 'p', 'r', 'e', 'f', 'i', 'x', '_', 'r', 'e', 'w', 'r', 'i', +'t', 'e', '\030', '\005', ' ', '\001', '(', '\t', 'B', '\013', '\372', 'B', '\010', 'r', '\006', '\300', '\001', '\002', '\310', '\001', '\000', 'R', '\r', 'p', 'r', +'e', 'f', 'i', 'x', 'R', 'e', 'w', 'r', 'i', 't', 'e', '\022', 'S', '\n', '\r', 'r', 'e', 'g', 'e', 'x', '_', 'r', 'e', 'w', 'r', +'i', 't', 'e', '\030', ' ', ' ', '\001', '(', '\013', '2', '.', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', +'t', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'R', 'e', 'g', 'e', 'x', 'M', 'a', 't', 'c', 'h', 'A', 'n', 'd', 'S', 'u', 'b', +'s', 't', 'i', 't', 'u', 't', 'e', 'R', '\014', 'r', 'e', 'g', 'e', 'x', 'R', 'e', 'w', 'r', 'i', 't', 'e', '\022', '?', '\n', '\024', +'h', 'o', 's', 't', '_', 'r', 'e', 'w', 'r', 'i', 't', 'e', '_', 'l', 'i', 't', 'e', 'r', 'a', 'l', '\030', '\006', ' ', '\001', '(', +'\t', 'B', '\013', '\372', 'B', '\010', 'r', '\006', '\300', '\001', '\002', '\310', '\001', '\000', 'H', '\001', 'R', '\022', 'h', 'o', 's', 't', 'R', 'e', 'w', +'r', 'i', 't', 'e', 'L', 'i', 't', 'e', 'r', 'a', 'l', '\022', 'H', '\n', '\021', 'a', 'u', 't', 'o', '_', 'h', 'o', 's', 't', '_', +'r', 'e', 'w', 'r', 'i', 't', 'e', '\030', '\007', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', +'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'H', '\001', 'R', '\017', 'a', 'u', 't', 'o', 'H', +'o', 's', 't', 'R', 'e', 'w', 'r', 'i', 't', 'e', '\022', '=', '\n', '\023', 'h', 'o', 's', 't', '_', 'r', 'e', 'w', 'r', 'i', 't', +'e', '_', 'h', 'e', 'a', 'd', 'e', 'r', '\030', '\035', ' ', '\001', '(', '\t', 'B', '\013', '\372', 'B', '\010', 'r', '\006', '\300', '\001', '\001', '\310', +'\001', '\000', 'H', '\001', 'R', '\021', 'h', 'o', 's', 't', 'R', 'e', 'w', 'r', 'i', 't', 'e', 'H', 'e', 'a', 'd', 'e', 'r', '\022', 'g', +'\n', '\027', 'h', 'o', 's', 't', '_', 'r', 'e', 'w', 'r', 'i', 't', 'e', '_', 'p', 'a', 't', 'h', '_', 'r', 'e', 'g', 'e', 'x', +'\030', '#', ' ', '\001', '(', '\013', '2', '.', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', +'e', 'r', '.', 'v', '3', '.', 'R', 'e', 'g', 'e', 'x', 'M', 'a', 't', 'c', 'h', 'A', 'n', 'd', 'S', 'u', 'b', 's', 't', 'i', +'t', 'u', 't', 'e', 'H', '\001', 'R', '\024', 'h', 'o', 's', 't', 'R', 'e', 'w', 'r', 'i', 't', 'e', 'P', 'a', 't', 'h', 'R', 'e', +'g', 'e', 'x', '\022', '3', '\n', '\007', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\010', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', +'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\007', 't', +'i', 'm', 'e', 'o', 'u', 't', '\022', '<', '\n', '\014', 'i', 'd', 'l', 'e', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\030', ' ', +'\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', +'a', 't', 'i', 'o', 'n', 'R', '\013', 'i', 'd', 'l', 'e', 'T', 'i', 'm', 'e', 'o', 'u', 't', '\022', 'E', '\n', '\014', 'r', 'e', 't', +'r', 'y', '_', 'p', 'o', 'l', 'i', 'c', 'y', '\030', '\t', ' ', '\001', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', +'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', 'c', +'y', 'R', '\013', 'r', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', '\022', 'O', '\n', '\031', 'r', 'e', 't', 'r', 'y', '_', 'p', +'o', 'l', 'i', 'c', 'y', '_', 't', 'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '!', ' ', '\001', '(', '\013', '2', +'\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'R', '\026', 'r', 'e', +'t', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', 'T', 'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'n', '\n', '\027', 'r', +'e', 'q', 'u', 'e', 's', 't', '_', 'm', 'i', 'r', 'r', 'o', 'r', '_', 'p', 'o', 'l', 'i', 'c', 'i', 'e', 's', '\030', '\036', ' ', +'\003', '(', '\013', '2', '6', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', +'v', '3', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', '.', 'R', 'e', 'q', 'u', 'e', 's', 't', 'M', 'i', 'r', +'r', 'o', 'r', 'P', 'o', 'l', 'i', 'c', 'y', 'R', '\025', 'r', 'e', 'q', 'u', 'e', 's', 't', 'M', 'i', 'r', 'r', 'o', 'r', 'P', +'o', 'l', 'i', 'c', 'i', 'e', 's', '\022', 'K', '\n', '\010', 'p', 'r', 'i', 'o', 'r', 'i', 't', 'y', '\030', '\013', ' ', '\001', '(', '\016', +'2', '%', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'R', +'o', 'u', 't', 'i', 'n', 'g', 'P', 'r', 'i', 'o', 'r', 'i', 't', 'y', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', +'\010', 'p', 'r', 'i', 'o', 'r', 'i', 't', 'y', '\022', 'A', '\n', '\013', 'r', 'a', 't', 'e', '_', 'l', 'i', 'm', 'i', 't', 's', '\030', +'\r', ' ', '\003', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', +'e', '.', 'v', '3', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', 'R', '\n', 'r', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', +'s', '\022', 'S', '\n', '\026', 'i', 'n', 'c', 'l', 'u', 'd', 'e', '_', 'v', 'h', '_', 'r', 'a', 't', 'e', '_', 'l', 'i', 'm', 'i', +'t', 's', '\030', '\016', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', +'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'B', '\002', '\030', '\001', 'R', '\023', 'i', 'n', 'c', 'l', 'u', 'd', 'e', 'V', +'h', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', 's', '\022', 'N', '\n', '\013', 'h', 'a', 's', 'h', '_', 'p', 'o', 'l', 'i', 'c', +'y', '\030', '\017', ' ', '\003', '(', '\013', '2', '-', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', +'u', 't', 'e', '.', 'v', '3', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', '.', 'H', 'a', 's', 'h', 'P', 'o', +'l', 'i', 'c', 'y', 'R', '\n', 'h', 'a', 's', 'h', 'P', 'o', 'l', 'i', 'c', 'y', '\022', '5', '\n', '\004', 'c', 'o', 'r', 's', '\030', +'\021', ' ', '\001', '(', '\013', '2', '!', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', +'e', '.', 'v', '3', '.', 'C', 'o', 'r', 's', 'P', 'o', 'l', 'i', 'c', 'y', 'R', '\004', 'c', 'o', 'r', 's', '\022', 'G', '\n', '\020', +'m', 'a', 'x', '_', 'g', 'r', 'p', 'c', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\027', ' ', '\001', '(', '\013', '2', '\031', '.', +'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', +'\002', '\030', '\001', 'R', '\016', 'm', 'a', 'x', 'G', 'r', 'p', 'c', 'T', 'i', 'm', 'e', 'o', 'u', 't', '\022', 'M', '\n', '\023', 'g', 'r', +'p', 'c', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '_', 'o', 'f', 'f', 's', 'e', 't', '\030', '\034', ' ', '\001', '(', '\013', '2', '\031', +'.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', +'B', '\002', '\030', '\001', 'R', '\021', 'g', 'r', 'p', 'c', 'T', 'i', 'm', 'e', 'o', 'u', 't', 'O', 'f', 'f', 's', 'e', 't', '\022', 'Y', +'\n', '\017', 'u', 'p', 'g', 'r', 'a', 'd', 'e', '_', 'c', 'o', 'n', 'f', 'i', 'g', 's', '\030', '\031', ' ', '\003', '(', '\013', '2', '0', +'.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'o', +'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', '.', 'U', 'p', 'g', 'r', 'a', 'd', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\016', +'u', 'p', 'g', 'r', 'a', 'd', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 's', '\022', 'g', '\n', '\030', 'i', 'n', 't', 'e', 'r', 'n', 'a', +'l', '_', 'r', 'e', 'd', 'i', 'r', 'e', 'c', 't', '_', 'p', 'o', 'l', 'i', 'c', 'y', '\030', '\"', ' ', '\001', '(', '\013', '2', '-', +'.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'I', 'n', +'t', 'e', 'r', 'n', 'a', 'l', 'R', 'e', 'd', 'i', 'r', 'e', 'c', 't', 'P', 'o', 'l', 'i', 'c', 'y', 'R', '\026', 'i', 'n', 't', +'e', 'r', 'n', 'a', 'l', 'R', 'e', 'd', 'i', 'r', 'e', 'c', 't', 'P', 'o', 'l', 'i', 'c', 'y', '\022', 'w', '\n', '\030', 'i', 'n', +'t', 'e', 'r', 'n', 'a', 'l', '_', 'r', 'e', 'd', 'i', 'r', 'e', 'c', 't', '_', 'a', 'c', 't', 'i', 'o', 'n', '\030', '\032', ' ', +'\001', '(', '\016', '2', '9', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', +'v', '3', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', '.', 'I', 'n', 't', 'e', 'r', 'n', 'a', 'l', 'R', 'e', +'d', 'i', 'r', 'e', 'c', 't', 'A', 'c', 't', 'i', 'o', 'n', 'B', '\002', '\030', '\001', 'R', '\026', 'i', 'n', 't', 'e', 'r', 'n', 'a', +'l', 'R', 'e', 'd', 'i', 'r', 'e', 'c', 't', 'A', 'c', 't', 'i', 'o', 'n', '\022', 'V', '\n', '\026', 'm', 'a', 'x', '_', 'i', 'n', +'t', 'e', 'r', 'n', 'a', 'l', '_', 'r', 'e', 'd', 'i', 'r', 'e', 'c', 't', 's', '\030', '\037', ' ', '\001', '(', '\013', '2', '\034', '.', +'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', +'u', 'e', 'B', '\002', '\030', '\001', 'R', '\024', 'm', 'a', 'x', 'I', 'n', 't', 'e', 'r', 'n', 'a', 'l', 'R', 'e', 'd', 'i', 'r', 'e', +'c', 't', 's', '\022', 'E', '\n', '\014', 'h', 'e', 'd', 'g', 'e', '_', 'p', 'o', 'l', 'i', 'c', 'y', '\030', '\033', ' ', '\001', '(', '\013', +'2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', +'H', 'e', 'd', 'g', 'e', 'P', 'o', 'l', 'i', 'c', 'y', 'R', '\013', 'h', 'e', 'd', 'g', 'e', 'P', 'o', 'l', 'i', 'c', 'y', '\022', +'d', '\n', '\023', 'm', 'a', 'x', '_', 's', 't', 'r', 'e', 'a', 'm', '_', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', '\030', '$', ' ', +'\001', '(', '\013', '2', '4', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', +'v', '3', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', '.', 'M', 'a', 'x', 'S', 't', 'r', 'e', 'a', 'm', 'D', +'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\021', 'm', 'a', 'x', 'S', 't', 'r', 'e', 'a', 'm', 'D', 'u', 'r', 'a', 't', 'i', 'o', +'n', '\032', '\242', '\002', '\n', '\023', 'R', 'e', 'q', 'u', 'e', 's', 't', 'M', 'i', 'r', 'r', 'o', 'r', 'P', 'o', 'l', 'i', 'c', 'y', +'\022', '!', '\n', '\007', 'c', 'l', 'u', 's', 't', 'e', 'r', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', +'\001', 'R', '\007', 'c', 'l', 'u', 's', 't', 'e', 'r', '\022', 'Y', '\n', '\020', 'r', 'u', 'n', 't', 'i', 'm', 'e', '_', 'f', 'r', 'a', +'c', 't', 'i', 'o', 'n', '\030', '\003', ' ', '\001', '(', '\013', '2', '.', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', +'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'F', 'r', 'a', 'c', 't', 'i', 'o', 'n', +'a', 'l', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', '\017', 'r', 'u', 'n', 't', 'i', 'm', 'e', 'F', 'r', 'a', 'c', 't', 'i', 'o', +'n', '\022', '?', '\n', '\r', 't', 'r', 'a', 'c', 'e', '_', 's', 'a', 'm', 'p', 'l', 'e', 'd', '\030', '\004', ' ', '\001', '(', '\013', '2', +'\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', +'u', 'e', 'R', '\014', 't', 'r', 'a', 'c', 'e', 'S', 'a', 'm', 'p', 'l', 'e', 'd', ':', '9', '\232', '\305', '\210', '\036', '4', '\n', '2', +'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'o', 'u', 't', 'e', 'A', +'c', 't', 'i', 'o', 'n', '.', 'R', 'e', 'q', 'u', 'e', 's', 't', 'M', 'i', 'r', 'r', 'o', 'r', 'P', 'o', 'l', 'i', 'c', 'y', +'J', '\004', '\010', '\002', '\020', '\003', 'R', '\013', 'r', 'u', 'n', 't', 'i', 'm', 'e', '_', 'k', 'e', 'y', '\032', '\226', '\n', '\n', '\n', 'H', +'a', 's', 'h', 'P', 'o', 'l', 'i', 'c', 'y', '\022', 'N', '\n', '\006', 'h', 'e', 'a', 'd', 'e', 'r', '\030', '\001', ' ', '\001', '(', '\013', '2', '4', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', -'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', '.', 'M', 'a', 'x', 'S', 't', 'r', 'e', 'a', 'm', 'D', 'u', 'r', 'a', -'t', 'i', 'o', 'n', 'R', '\021', 'm', 'a', 'x', 'S', 't', 'r', 'e', 'a', 'm', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', '\032', '\242', -'\002', '\n', '\023', 'R', 'e', 'q', 'u', 'e', 's', 't', 'M', 'i', 'r', 'r', 'o', 'r', 'P', 'o', 'l', 'i', 'c', 'y', '\022', '!', '\n', -'\007', 'c', 'l', 'u', 's', 't', 'e', 'r', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\007', -'c', 'l', 'u', 's', 't', 'e', 'r', '\022', 'Y', '\n', '\020', 'r', 'u', 'n', 't', 'i', 'm', 'e', '_', 'f', 'r', 'a', 'c', 't', 'i', -'o', 'n', '\030', '\003', ' ', '\001', '(', '\013', '2', '.', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', -'o', 'r', 'e', '.', 'v', '3', '.', 'R', 'u', 'n', 't', 'i', 'm', 'e', 'F', 'r', 'a', 'c', 't', 'i', 'o', 'n', 'a', 'l', 'P', -'e', 'r', 'c', 'e', 'n', 't', 'R', '\017', 'r', 'u', 'n', 't', 'i', 'm', 'e', 'F', 'r', 'a', 'c', 't', 'i', 'o', 'n', '\022', '?', -'\n', '\r', 't', 'r', 'a', 'c', 'e', '_', 's', 'a', 'm', 'p', 'l', 'e', 'd', '\030', '\004', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', -'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', -'\014', 't', 'r', 'a', 'c', 'e', 'S', 'a', 'm', 'p', 'l', 'e', 'd', ':', '9', '\232', '\305', '\210', '\036', '4', '\n', '2', 'e', 'n', 'v', -'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', -'o', 'n', '.', 'R', 'e', 'q', 'u', 'e', 's', 't', 'M', 'i', 'r', 'r', 'o', 'r', 'P', 'o', 'l', 'i', 'c', 'y', 'J', '\004', '\010', -'\002', '\020', '\003', 'R', '\013', 'r', 'u', 'n', 't', 'i', 'm', 'e', '_', 'k', 'e', 'y', '\032', '\226', '\n', '\n', '\n', 'H', 'a', 's', 'h', -'P', 'o', 'l', 'i', 'c', 'y', '\022', 'N', '\n', '\006', 'h', 'e', 'a', 'd', 'e', 'r', '\030', '\001', ' ', '\001', '(', '\013', '2', '4', '.', -'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'o', 'u', -'t', 'e', 'A', 'c', 't', 'i', 'o', 'n', '.', 'H', 'a', 's', 'h', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'H', 'e', 'a', 'd', 'e', -'r', 'H', '\000', 'R', '\006', 'h', 'e', 'a', 'd', 'e', 'r', '\022', 'N', '\n', '\006', 'c', 'o', 'o', 'k', 'i', 'e', '\030', '\002', ' ', '\001', -'(', '\013', '2', '4', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', -'3', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', '.', 'H', 'a', 's', 'h', 'P', 'o', 'l', 'i', 'c', 'y', '.', -'C', 'o', 'o', 'k', 'i', 'e', 'H', '\000', 'R', '\006', 'c', 'o', 'o', 'k', 'i', 'e', '\022', 'y', '\n', '\025', 'c', 'o', 'n', 'n', 'e', -'c', 't', 'i', 'o', 'n', '_', 'p', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\030', '\003', ' ', '\001', '(', '\013', '2', 'B', '.', -'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'o', 'u', -'t', 'e', 'A', 'c', 't', 'i', 'o', 'n', '.', 'H', 'a', 's', 'h', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'C', 'o', 'n', 'n', 'e', -'c', 't', 'i', 'o', 'n', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', 'H', '\000', 'R', '\024', 'c', 'o', 'n', 'n', 'e', 'c', -'t', 'i', 'o', 'n', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\022', 'g', '\n', '\017', 'q', 'u', 'e', 'r', 'y', '_', 'p', -'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', '\030', '\005', ' ', '\001', '(', '\013', '2', '<', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', -'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', -'.', 'H', 'a', 's', 'h', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'Q', 'u', 'e', 'r', 'y', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', -'r', 'H', '\000', 'R', '\016', 'q', 'u', 'e', 'r', 'y', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', '\022', '^', '\n', '\014', 'f', 'i', -'l', 't', 'e', 'r', '_', 's', 't', 'a', 't', 'e', '\030', '\006', ' ', '\001', '(', '\013', '2', '9', '.', 'e', 'n', 'v', 'o', 'y', '.', -'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', -'o', 'n', '.', 'H', 'a', 's', 'h', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'F', 'i', 'l', 't', 'e', 'r', 'S', 't', 'a', 't', 'e', -'H', '\000', 'R', '\013', 'f', 'i', 'l', 't', 'e', 'r', 'S', 't', 'a', 't', 'e', '\022', '\032', '\n', '\010', 't', 'e', 'r', 'm', 'i', 'n', -'a', 'l', '\030', '\004', ' ', '\001', '(', '\010', 'R', '\010', 't', 'e', 'r', 'm', 'i', 'n', 'a', 'l', '\032', '\306', '\001', '\n', '\006', 'H', 'e', -'a', 'd', 'e', 'r', '\022', '.', '\n', '\013', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', -'B', '\r', '\372', 'B', '\n', 'r', '\010', '\020', '\001', '\300', '\001', '\001', '\310', '\001', '\000', 'R', '\n', 'h', 'e', 'a', 'd', 'e', 'r', 'N', 'a', -'m', 'e', '\022', 'S', '\n', '\r', 'r', 'e', 'g', 'e', 'x', '_', 'r', 'e', 'w', 'r', 'i', 't', 'e', '\030', '\002', ' ', '\001', '(', '\013', -'2', '.', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', -'R', 'e', 'g', 'e', 'x', 'M', 'a', 't', 'c', 'h', 'A', 'n', 'd', 'S', 'u', 'b', 's', 't', 'i', 't', 'u', 't', 'e', 'R', '\014', -'r', 'e', 'g', 'e', 'x', 'R', 'e', 'w', 'r', 'i', 't', 'e', ':', '7', '\232', '\305', '\210', '\036', '2', '\n', '0', 'e', 'n', 'v', 'o', +'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', '.', 'H', 'a', 's', 'h', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'H', 'e', +'a', 'd', 'e', 'r', 'H', '\000', 'R', '\006', 'h', 'e', 'a', 'd', 'e', 'r', '\022', 'N', '\n', '\006', 'c', 'o', 'o', 'k', 'i', 'e', '\030', +'\002', ' ', '\001', '(', '\013', '2', '4', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', +'e', '.', 'v', '3', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', '.', 'H', 'a', 's', 'h', 'P', 'o', 'l', 'i', +'c', 'y', '.', 'C', 'o', 'o', 'k', 'i', 'e', 'H', '\000', 'R', '\006', 'c', 'o', 'o', 'k', 'i', 'e', '\022', 'y', '\n', '\025', 'c', 'o', +'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'p', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\030', '\003', ' ', '\001', '(', '\013', +'2', 'B', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', +'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', '.', 'H', 'a', 's', 'h', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'C', 'o', +'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', 'H', '\000', 'R', '\024', 'c', 'o', 'n', +'n', 'e', 'c', 't', 'i', 'o', 'n', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\022', 'g', '\n', '\017', 'q', 'u', 'e', 'r', +'y', '_', 'p', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', '\030', '\005', ' ', '\001', '(', '\013', '2', '<', '.', 'e', 'n', 'v', 'o', 'y', +'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', +'i', 'o', 'n', '.', 'H', 'a', 's', 'h', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'Q', 'u', 'e', 'r', 'y', 'P', 'a', 'r', 'a', 'm', +'e', 't', 'e', 'r', 'H', '\000', 'R', '\016', 'q', 'u', 'e', 'r', 'y', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', '\022', '^', '\n', +'\014', 'f', 'i', 'l', 't', 'e', 'r', '_', 's', 't', 'a', 't', 'e', '\030', '\006', ' ', '\001', '(', '\013', '2', '9', '.', 'e', 'n', 'v', +'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'o', 'u', 't', 'e', 'A', +'c', 't', 'i', 'o', 'n', '.', 'H', 'a', 's', 'h', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'F', 'i', 'l', 't', 'e', 'r', 'S', 't', +'a', 't', 'e', 'H', '\000', 'R', '\013', 'f', 'i', 'l', 't', 'e', 'r', 'S', 't', 'a', 't', 'e', '\022', '\032', '\n', '\010', 't', 'e', 'r', +'m', 'i', 'n', 'a', 'l', '\030', '\004', ' ', '\001', '(', '\010', 'R', '\010', 't', 'e', 'r', 'm', 'i', 'n', 'a', 'l', '\032', '\306', '\001', '\n', +'\006', 'H', 'e', 'a', 'd', 'e', 'r', '\022', '.', '\n', '\013', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'n', 'a', 'm', 'e', '\030', '\001', ' ', +'\001', '(', '\t', 'B', '\r', '\372', 'B', '\n', 'r', '\010', '\020', '\001', '\300', '\001', '\001', '\310', '\001', '\000', 'R', '\n', 'h', 'e', 'a', 'd', 'e', +'r', 'N', 'a', 'm', 'e', '\022', 'S', '\n', '\r', 'r', 'e', 'g', 'e', 'x', '_', 'r', 'e', 'w', 'r', 'i', 't', 'e', '\030', '\002', ' ', +'\001', '(', '\013', '2', '.', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', +'v', '3', '.', 'R', 'e', 'g', 'e', 'x', 'M', 'a', 't', 'c', 'h', 'A', 'n', 'd', 'S', 'u', 'b', 's', 't', 'i', 't', 'u', 't', +'e', 'R', '\014', 'r', 'e', 'g', 'e', 'x', 'R', 'e', 'w', 'r', 'i', 't', 'e', ':', '7', '\232', '\305', '\210', '\036', '2', '\n', '0', 'e', +'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', +'t', 'i', 'o', 'n', '.', 'H', 'a', 's', 'h', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'H', 'e', 'a', 'd', 'e', 'r', '\032', '\237', '\001', +'\n', '\006', 'C', 'o', 'o', 'k', 'i', 'e', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', +'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '+', '\n', '\003', 't', 't', 'l', '\030', '\002', ' ', '\001', '(', '\013', +'2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', +'o', 'n', 'R', '\003', 't', 't', 'l', '\022', '\022', '\n', '\004', 'p', 'a', 't', 'h', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\004', 'p', 'a', +'t', 'h', ':', '7', '\232', '\305', '\210', '\036', '2', '\n', '0', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', +'o', 'u', 't', 'e', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', '.', 'H', 'a', 's', 'h', 'P', 'o', 'l', 'i', +'c', 'y', '.', 'C', 'o', 'o', 'k', 'i', 'e', '\032', 'z', '\n', '\024', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'P', 'r', +'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\022', '\033', '\n', '\t', 's', 'o', 'u', 'r', 'c', 'e', '_', 'i', 'p', '\030', '\001', ' ', '\001', +'(', '\010', 'R', '\010', 's', 'o', 'u', 'r', 'c', 'e', 'I', 'p', ':', 'E', '\232', '\305', '\210', '\036', '@', '\n', '>', 'e', 'n', 'v', 'o', +'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', +'n', '.', 'H', 'a', 's', 'h', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'P', 'r', +'o', 'p', 'e', 'r', 't', 'i', 'e', 's', '\032', 'n', '\n', '\016', 'Q', 'u', 'e', 'r', 'y', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', +'r', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', +'\004', 'n', 'a', 'm', 'e', ':', '?', '\232', '\305', '\210', '\036', ':', '\n', '8', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', +'2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', '.', 'H', 'a', 's', 'h', 'P', +'o', 'l', 'i', 'c', 'y', '.', 'Q', 'u', 'e', 'r', 'y', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', '\032', 'f', '\n', '\013', 'F', +'i', 'l', 't', 'e', 'r', 'S', 't', 'a', 't', 'e', '\022', '\031', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', +'\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\003', 'k', 'e', 'y', ':', '<', '\232', '\305', '\210', '\036', '7', '\n', '5', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', -'n', '.', 'H', 'a', 's', 'h', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'H', 'e', 'a', 'd', 'e', 'r', '\032', '\237', '\001', '\n', '\006', 'C', -'o', 'o', 'k', 'i', 'e', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', -'\002', '\020', '\001', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '+', '\n', '\003', 't', 't', 'l', '\030', '\002', ' ', '\001', '(', '\013', '2', '\031', '.', +'n', '.', 'H', 'a', 's', 'h', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'F', 'i', 'l', 't', 'e', 'r', 'S', 't', 'a', 't', 'e', ':', +'0', '\232', '\305', '\210', '\036', '+', '\n', ')', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', +'e', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', '.', 'H', 'a', 's', 'h', 'P', 'o', 'l', 'i', 'c', 'y', 'B', +'\027', '\n', '\020', 'p', 'o', 'l', 'i', 'c', 'y', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', '\001', '\032', +'\243', '\003', '\n', '\r', 'U', 'p', 'g', 'r', 'a', 'd', 'e', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '0', '\n', '\014', 'u', 'p', 'g', 'r', +'a', 'd', 'e', '_', 't', 'y', 'p', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\r', '\372', 'B', '\n', 'r', '\010', '\020', '\001', '\300', '\001', +'\002', '\310', '\001', '\000', 'R', '\013', 'u', 'p', 'g', 'r', 'a', 'd', 'e', 'T', 'y', 'p', 'e', '\022', '4', '\n', '\007', 'e', 'n', 'a', 'b', +'l', 'e', 'd', '\030', '\002', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', +'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\007', 'e', 'n', 'a', 'b', 'l', 'e', 'd', '\022', 'e', '\n', '\016', +'c', 'o', 'n', 'n', 'e', 'c', 't', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\003', ' ', '\001', '(', '\013', '2', '>', '.', 'e', 'n', +'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'o', 'u', 't', 'e', +'A', 'c', 't', 'i', 'o', 'n', '.', 'U', 'p', 'g', 'r', 'a', 'd', 'e', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'C', 'o', 'n', 'n', +'e', 'c', 't', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\r', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'C', 'o', 'n', 'f', 'i', 'g', '\032', +'\215', '\001', '\n', '\r', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'C', 'o', 'n', 'f', 'i', 'g', '\022', ']', '\n', '\025', 'p', 'r', 'o', 'x', +'y', '_', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\001', ' ', '\001', '(', '\013', '2', ')', +'.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'P', 'r', 'o', +'x', 'y', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\023', 'p', 'r', 'o', 'x', 'y', 'P', 'r', +'o', 't', 'o', 'c', 'o', 'l', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '\035', '\n', '\n', 'a', 'l', 'l', 'o', 'w', '_', 'p', 'o', 's', +'t', '\030', '\002', ' ', '\001', '(', '\010', 'R', '\t', 'a', 'l', 'l', 'o', 'w', 'P', 'o', 's', 't', ':', '3', '\232', '\305', '\210', '\036', '.', +'\n', ',', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'o', 'u', 't', +'e', 'A', 'c', 't', 'i', 'o', 'n', '.', 'U', 'p', 'g', 'r', 'a', 'd', 'e', 'C', 'o', 'n', 'f', 'i', 'g', '\032', '\210', '\002', '\n', +'\021', 'M', 'a', 'x', 'S', 't', 'r', 'e', 'a', 'm', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', '\022', 'I', '\n', '\023', 'm', 'a', 'x', +'_', 's', 't', 'r', 'e', 'a', 'm', '_', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', '\030', '\001', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', -'\003', 't', 't', 'l', '\022', '\022', '\n', '\004', 'p', 'a', 't', 'h', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\004', 'p', 'a', 't', 'h', ':', -'7', '\232', '\305', '\210', '\036', '2', '\n', '0', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', -'e', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', '.', 'H', 'a', 's', 'h', 'P', 'o', 'l', 'i', 'c', 'y', '.', -'C', 'o', 'o', 'k', 'i', 'e', '\032', 'z', '\n', '\024', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'P', 'r', 'o', 'p', 'e', -'r', 't', 'i', 'e', 's', '\022', '\033', '\n', '\t', 's', 'o', 'u', 'r', 'c', 'e', '_', 'i', 'p', '\030', '\001', ' ', '\001', '(', '\010', 'R', -'\010', 's', 'o', 'u', 'r', 'c', 'e', 'I', 'p', ':', 'E', '\232', '\305', '\210', '\036', '@', '\n', '>', 'e', 'n', 'v', 'o', 'y', '.', 'a', -'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', '.', 'H', -'a', 's', 'h', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'P', 'r', 'o', 'p', 'e', -'r', 't', 'i', 'e', 's', '\032', 'n', '\n', '\016', 'Q', 'u', 'e', 'r', 'y', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', '\022', '\033', -'\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', -'m', 'e', ':', '?', '\232', '\305', '\210', '\036', ':', '\n', '8', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', -'o', 'u', 't', 'e', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', '.', 'H', 'a', 's', 'h', 'P', 'o', 'l', 'i', -'c', 'y', '.', 'Q', 'u', 'e', 'r', 'y', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', '\032', 'f', '\n', '\013', 'F', 'i', 'l', 't', -'e', 'r', 'S', 't', 'a', 't', 'e', '\022', '\031', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', -'r', '\002', '\020', '\001', 'R', '\003', 'k', 'e', 'y', ':', '<', '\232', '\305', '\210', '\036', '7', '\n', '5', 'e', 'n', 'v', 'o', 'y', '.', 'a', -'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', '.', 'H', -'a', 's', 'h', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'F', 'i', 'l', 't', 'e', 'r', 'S', 't', 'a', 't', 'e', ':', '0', '\232', '\305', -'\210', '\036', '+', '\n', ')', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', -'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', '.', 'H', 'a', 's', 'h', 'P', 'o', 'l', 'i', 'c', 'y', 'B', '\027', '\n', '\020', -'p', 'o', 'l', 'i', 'c', 'y', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', '\001', '\032', '\201', '\003', '\n', -'\r', 'U', 'p', 'g', 'r', 'a', 'd', 'e', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '.', '\n', '\014', 'u', 'p', 'g', 'r', 'a', 'd', 'e', -'_', 't', 'y', 'p', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\013', '\372', 'B', '\010', 'r', '\006', '\300', '\001', '\002', '\310', '\001', '\000', 'R', -'\013', 'u', 'p', 'g', 'r', 'a', 'd', 'e', 'T', 'y', 'p', 'e', '\022', '4', '\n', '\007', 'e', 'n', 'a', 'b', 'l', 'e', 'd', '\030', '\002', -' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', -'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\007', 'e', 'n', 'a', 'b', 'l', 'e', 'd', '\022', 'e', '\n', '\016', 'c', 'o', 'n', 'n', 'e', -'c', 't', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\003', ' ', '\001', '(', '\013', '2', '>', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', -'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', -'n', '.', 'U', 'p', 'g', 'r', 'a', 'd', 'e', 'C', 'o', 'n', 'f', 'i', 'g', '.', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'C', 'o', -'n', 'f', 'i', 'g', 'R', '\r', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'C', 'o', 'n', 'f', 'i', 'g', '\032', 'n', '\n', '\r', 'C', 'o', -'n', 'n', 'e', 'c', 't', 'C', 'o', 'n', 'f', 'i', 'g', '\022', ']', '\n', '\025', 'p', 'r', 'o', 'x', 'y', '_', 'p', 'r', 'o', 't', -'o', 'c', 'o', 'l', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\001', ' ', '\001', '(', '\013', '2', ')', '.', 'e', 'n', 'v', 'o', 'y', -'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'P', 'r', 'o', 'x', 'y', 'P', 'r', 'o', 't', -'o', 'c', 'o', 'l', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\023', 'p', 'r', 'o', 'x', 'y', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', -'C', 'o', 'n', 'f', 'i', 'g', ':', '3', '\232', '\305', '\210', '\036', '.', '\n', ',', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', -'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', '.', 'U', 'p', 'g', 'r', -'a', 'd', 'e', 'C', 'o', 'n', 'f', 'i', 'g', '\032', '\210', '\002', '\n', '\021', 'M', 'a', 'x', 'S', 't', 'r', 'e', 'a', 'm', 'D', 'u', -'r', 'a', 't', 'i', 'o', 'n', '\022', 'I', '\n', '\023', 'm', 'a', 'x', '_', 's', 't', 'r', 'e', 'a', 'm', '_', 'd', 'u', 'r', 'a', -'t', 'i', 'o', 'n', '\030', '\001', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', -'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\021', 'm', 'a', 'x', 'S', 't', 'r', 'e', 'a', 'm', 'D', 'u', -'r', 'a', 't', 'i', 'o', 'n', '\022', 'P', '\n', '\027', 'g', 'r', 'p', 'c', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '_', 'h', 'e', -'a', 'd', 'e', 'r', '_', 'm', 'a', 'x', '\030', '\002', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', -'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\024', 'g', 'r', 'p', 'c', 'T', 'i', 'm', -'e', 'o', 'u', 't', 'H', 'e', 'a', 'd', 'e', 'r', 'M', 'a', 'x', '\022', 'V', '\n', '\032', 'g', 'r', 'p', 'c', '_', 't', 'i', 'm', -'e', 'o', 'u', 't', '_', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'o', 'f', 'f', 's', 'e', 't', '\030', '\003', ' ', '\001', '(', '\013', '2', -'\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', -'n', 'R', '\027', 'g', 'r', 'p', 'c', 'T', 'i', 'm', 'e', 'o', 'u', 't', 'H', 'e', 'a', 'd', 'e', 'r', 'O', 'f', 'f', 's', 'e', -'t', '\"', 'E', '\n', '\033', 'C', 'l', 'u', 's', 't', 'e', 'r', 'N', 'o', 't', 'F', 'o', 'u', 'n', 'd', 'R', 'e', 's', 'p', 'o', -'n', 's', 'e', 'C', 'o', 'd', 'e', '\022', '\027', '\n', '\023', 'S', 'E', 'R', 'V', 'I', 'C', 'E', '_', 'U', 'N', 'A', 'V', 'A', 'I', -'L', 'A', 'B', 'L', 'E', '\020', '\000', '\022', '\r', '\n', '\t', 'N', 'O', 'T', '_', 'F', 'O', 'U', 'N', 'D', '\020', '\001', '\"', '^', '\n', -'\026', 'I', 'n', 't', 'e', 'r', 'n', 'a', 'l', 'R', 'e', 'd', 'i', 'r', 'e', 'c', 't', 'A', 'c', 't', 'i', 'o', 'n', '\022', '\"', -'\n', '\036', 'P', 'A', 'S', 'S', '_', 'T', 'H', 'R', 'O', 'U', 'G', 'H', '_', 'I', 'N', 'T', 'E', 'R', 'N', 'A', 'L', '_', 'R', -'E', 'D', 'I', 'R', 'E', 'C', 'T', '\020', '\000', '\022', '\034', '\n', '\030', 'H', 'A', 'N', 'D', 'L', 'E', '_', 'I', 'N', 'T', 'E', 'R', -'N', 'A', 'L', '_', 'R', 'E', 'D', 'I', 'R', 'E', 'C', 'T', '\020', '\001', '\032', '\002', '\030', '\001', ':', '%', '\232', '\305', '\210', '\036', ' ', -'\n', '\036', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'o', 'u', 't', -'e', 'A', 'c', 't', 'i', 'o', 'n', 'B', '\030', '\n', '\021', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 's', 'p', 'e', 'c', 'i', 'f', -'i', 'e', 'r', '\022', '\003', '\370', 'B', '\001', 'B', '\030', '\n', '\026', 'h', 'o', 's', 't', '_', 'r', 'e', 'w', 'r', 'i', 't', 'e', '_', -'s', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'J', '\004', '\010', '\014', '\020', '\r', 'J', '\004', '\010', '\022', '\020', '\023', 'J', '\004', '\010', '\023', -'\020', '\024', 'J', '\004', '\010', '\020', '\020', '\021', 'J', '\004', '\010', '\026', '\020', '\027', 'J', '\004', '\010', '\025', '\020', '\026', 'J', '\004', '\010', '\n', '\020', -'\013', 'R', '\025', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'm', 'i', 'r', 'r', 'o', 'r', '_', 'p', 'o', 'l', 'i', 'c', 'y', '\"', -'\215', '\017', '\n', '\013', 'R', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', '\022', '\031', '\n', '\010', 'r', 'e', 't', 'r', 'y', '_', -'o', 'n', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\007', 'r', 'e', 't', 'r', 'y', 'O', 'n', '\022', 'R', '\n', '\013', 'n', 'u', 'm', '_', -'r', 'e', 't', 'r', 'i', 'e', 's', '\030', '\002', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', -'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\023', '\362', '\230', '\376', '\217', '\005', -'\r', '\n', '\013', 'm', 'a', 'x', '_', 'r', 'e', 't', 'r', 'i', 'e', 's', 'R', '\n', 'n', 'u', 'm', 'R', 'e', 't', 'r', 'i', 'e', -'s', '\022', 'A', '\n', '\017', 'p', 'e', 'r', '_', 't', 'r', 'y', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\003', ' ', '\001', '(', +'\021', 'm', 'a', 'x', 'S', 't', 'r', 'e', 'a', 'm', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', '\022', 'P', '\n', '\027', 'g', 'r', 'p', +'c', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '_', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'm', 'a', 'x', '\030', '\002', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', -'i', 'o', 'n', 'R', '\r', 'p', 'e', 'r', 'T', 'r', 'y', 'T', 'i', 'm', 'e', 'o', 'u', 't', '\022', 'W', '\n', '\016', 'r', 'e', 't', -'r', 'y', '_', 'p', 'r', 'i', 'o', 'r', 'i', 't', 'y', '\030', '\004', ' ', '\001', '(', '\013', '2', '0', '.', 'e', 'n', 'v', 'o', 'y', -'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'e', 't', 'r', 'y', 'P', 'o', 'l', -'i', 'c', 'y', '.', 'R', 'e', 't', 'r', 'y', 'P', 'r', 'i', 'o', 'r', 'i', 't', 'y', 'R', '\r', 'r', 'e', 't', 'r', 'y', 'P', -'r', 'i', 'o', 'r', 'i', 't', 'y', '\022', 'g', '\n', '\024', 'r', 'e', 't', 'r', 'y', '_', 'h', 'o', 's', 't', '_', 'p', 'r', 'e', -'d', 'i', 'c', 'a', 't', 'e', '\030', '\005', ' ', '\003', '(', '\013', '2', '5', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', -'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'R', -'e', 't', 'r', 'y', 'H', 'o', 's', 't', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 'R', '\022', 'r', 'e', 't', 'r', 'y', 'H', -'o', 's', 't', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', '\022', 'H', '\n', '!', 'h', 'o', 's', 't', '_', 's', 'e', 'l', 'e', -'c', 't', 'i', 'o', 'n', '_', 'r', 'e', 't', 'r', 'y', '_', 'm', 'a', 'x', '_', 'a', 't', 't', 'e', 'm', 'p', 't', 's', '\030', -'\006', ' ', '\001', '(', '\003', 'R', '\035', 'h', 'o', 's', 't', 'S', 'e', 'l', 'e', 'c', 't', 'i', 'o', 'n', 'R', 'e', 't', 'r', 'y', -'M', 'a', 'x', 'A', 't', 't', 'e', 'm', 'p', 't', 's', '\022', '4', '\n', '\026', 'r', 'e', 't', 'r', 'i', 'a', 'b', 'l', 'e', '_', -'s', 't', 'a', 't', 'u', 's', '_', 'c', 'o', 'd', 'e', 's', '\030', '\007', ' ', '\003', '(', '\r', 'R', '\024', 'r', 'e', 't', 'r', 'i', -'a', 'b', 'l', 'e', 'S', 't', 'a', 't', 'u', 's', 'C', 'o', 'd', 'e', 's', '\022', 'U', '\n', '\016', 'r', 'e', 't', 'r', 'y', '_', -'b', 'a', 'c', 'k', '_', 'o', 'f', 'f', '\030', '\010', ' ', '\001', '(', '\013', '2', '/', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', -'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', -'.', 'R', 'e', 't', 'r', 'y', 'B', 'a', 'c', 'k', 'O', 'f', 'f', 'R', '\014', 'r', 'e', 't', 'r', 'y', 'B', 'a', 'c', 'k', 'O', -'f', 'f', '\022', 'x', '\n', '\033', 'r', 'a', 't', 'e', '_', 'l', 'i', 'm', 'i', 't', 'e', 'd', '_', 'r', 'e', 't', 'r', 'y', '_', -'b', 'a', 'c', 'k', '_', 'o', 'f', 'f', '\030', '\013', ' ', '\001', '(', '\013', '2', ':', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', -'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', -'.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', 'e', 'd', 'R', 'e', 't', 'r', 'y', 'B', 'a', 'c', 'k', 'O', 'f', 'f', 'R', -'\027', 'r', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', 'e', 'd', 'R', 'e', 't', 'r', 'y', 'B', 'a', 'c', 'k', 'O', 'f', 'f', '\022', -'Q', '\n', '\021', 'r', 'e', 't', 'r', 'i', 'a', 'b', 'l', 'e', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '\030', '\t', ' ', '\003', '(', -'\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', -'.', 'H', 'e', 'a', 'd', 'e', 'r', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'R', '\020', 'r', 'e', 't', 'r', 'i', 'a', 'b', 'l', 'e', -'H', 'e', 'a', 'd', 'e', 'r', 's', '\022', '`', '\n', '\031', 'r', 'e', 't', 'r', 'i', 'a', 'b', 'l', 'e', '_', 'r', 'e', 'q', 'u', -'e', 's', 't', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '\030', '\n', ' ', '\003', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', -'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'M', 'a', -'t', 'c', 'h', 'e', 'r', 'R', '\027', 'r', 'e', 't', 'r', 'i', 'a', 'b', 'l', 'e', 'R', 'e', 'q', 'u', 'e', 's', 't', 'H', 'e', -'a', 'd', 'e', 'r', 's', '\032', '\271', '\001', '\n', '\r', 'R', 'e', 't', 'r', 'y', 'P', 'r', 'i', 'o', 'r', 'i', 't', 'y', '\022', '\033', -'\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', -'m', 'e', '\022', '9', '\n', '\014', 't', 'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\003', ' ', '\001', '(', '\013', '2', -'\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'H', '\000', 'R', '\013', -'t', 'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', ':', '3', '\232', '\305', '\210', '\036', '.', '\n', ',', 'e', 'n', 'v', 'o', 'y', -'.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', -'.', 'R', 'e', 't', 'r', 'y', 'P', 'r', 'i', 'o', 'r', 'i', 't', 'y', 'B', '\r', '\n', '\013', 'c', 'o', 'n', 'f', 'i', 'g', '_', -'t', 'y', 'p', 'e', 'J', '\004', '\010', '\002', '\020', '\003', 'R', '\006', 'c', 'o', 'n', 'f', 'i', 'g', '\032', '\303', '\001', '\n', '\022', 'R', 'e', -'t', 'r', 'y', 'H', 'o', 's', 't', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', -'\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '9', '\n', '\014', 't', -'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\003', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', -'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'H', '\000', 'R', '\013', 't', 'y', 'p', 'e', 'd', 'C', 'o', -'n', 'f', 'i', 'g', ':', '8', '\232', '\305', '\210', '\036', '3', '\n', '1', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', -'.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'R', 'e', 't', 'r', 'y', 'H', -'o', 's', 't', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 'B', '\r', '\n', '\013', 'c', 'o', 'n', 'f', 'i', 'g', '_', 't', 'y', -'p', 'e', 'J', '\004', '\010', '\002', '\020', '\003', 'R', '\006', 'c', 'o', 'n', 'f', 'i', 'g', '\032', '\326', '\001', '\n', '\014', 'R', 'e', 't', 'r', -'y', 'B', 'a', 'c', 'k', 'O', 'f', 'f', '\022', 'J', '\n', '\r', 'b', 'a', 's', 'e', '_', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', -'\030', '\001', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', -'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\n', '\372', 'B', '\007', '\252', '\001', '\004', '\010', '\001', '*', '\000', 'R', '\014', 'b', 'a', 's', -'e', 'I', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\022', 'F', '\n', '\014', 'm', 'a', 'x', '_', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', -'\030', '\002', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', -'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\252', '\001', '\002', '*', '\000', 'R', '\013', 'm', 'a', 'x', 'I', 'n', -'t', 'e', 'r', 'v', 'a', 'l', ':', '2', '\232', '\305', '\210', '\036', '-', '\n', '+', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', -'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'R', 'e', 't', 'r', -'y', 'B', 'a', 'c', 'k', 'O', 'f', 'f', '\032', '\210', '\001', '\n', '\013', 'R', 'e', 's', 'e', 't', 'H', 'e', 'a', 'd', 'e', 'r', '\022', -'!', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\r', '\372', 'B', '\n', 'r', '\010', '\020', '\001', '\300', '\001', '\001', -'\310', '\001', '\000', 'R', '\004', 'n', 'a', 'm', 'e', '\022', 'V', '\n', '\006', 'f', 'o', 'r', 'm', 'a', 't', '\030', '\002', ' ', '\001', '(', '\016', -'2', '4', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', -'R', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'R', 'e', 's', 'e', 't', 'H', 'e', 'a', 'd', 'e', 'r', 'F', 'o', -'r', 'm', 'a', 't', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\006', 'f', 'o', 'r', 'm', 'a', 't', '\032', '\300', '\001', -'\n', '\027', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', 'e', 'd', 'R', 'e', 't', 'r', 'y', 'B', 'a', 'c', 'k', 'O', 'f', 'f', -'\022', ']', '\n', '\r', 'r', 'e', 's', 'e', 't', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '.', -'.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'e', -'t', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'R', 'e', 's', 'e', 't', 'H', 'e', 'a', 'd', 'e', 'r', 'B', '\010', '\372', 'B', -'\005', '\222', '\001', '\002', '\010', '\001', 'R', '\014', 'r', 'e', 's', 'e', 't', 'H', 'e', 'a', 'd', 'e', 'r', 's', '\022', 'F', '\n', '\014', 'm', -'a', 'x', '_', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\030', '\002', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', -'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\252', -'\001', '\002', '*', '\000', 'R', '\013', 'm', 'a', 'x', 'I', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\"', '4', '\n', '\021', 'R', 'e', 's', 'e', -'t', 'H', 'e', 'a', 'd', 'e', 'r', 'F', 'o', 'r', 'm', 'a', 't', '\022', '\013', '\n', '\007', 'S', 'E', 'C', 'O', 'N', 'D', 'S', '\020', -'\000', '\022', '\022', '\n', '\016', 'U', 'N', 'I', 'X', '_', 'T', 'I', 'M', 'E', 'S', 'T', 'A', 'M', 'P', '\020', '\001', ':', '%', '\232', '\305', -'\210', '\036', ' ', '\n', '\036', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', -'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', '\"', '\234', '\002', '\n', '\013', 'H', 'e', 'd', 'g', 'e', 'P', 'o', 'l', 'i', 'c', -'y', '\022', 'P', '\n', '\020', 'i', 'n', 'i', 't', 'i', 'a', 'l', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', 's', '\030', '\001', ' ', '\001', -'(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', -'3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\007', '\372', 'B', '\004', '*', '\002', '(', '\001', 'R', '\017', 'i', 'n', 'i', 't', 'i', 'a', 'l', -'R', 'e', 'q', 'u', 'e', 's', 't', 's', '\022', '\\', '\n', '\031', 'a', 'd', 'd', 'i', 't', 'i', 'o', 'n', 'a', 'l', '_', 'r', 'e', -'q', 'u', 'e', 's', 't', '_', 'c', 'h', 'a', 'n', 'c', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', -'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'F', 'r', 'a', 'c', 't', 'i', 'o', 'n', 'a', 'l', 'P', 'e', 'r', 'c', 'e', -'n', 't', 'R', '\027', 'a', 'd', 'd', 'i', 't', 'i', 'o', 'n', 'a', 'l', 'R', 'e', 'q', 'u', 'e', 's', 't', 'C', 'h', 'a', 'n', -'c', 'e', '\022', '6', '\n', '\030', 'h', 'e', 'd', 'g', 'e', '_', 'o', 'n', '_', 'p', 'e', 'r', '_', 't', 'r', 'y', '_', 't', 'i', -'m', 'e', 'o', 'u', 't', '\030', '\003', ' ', '\001', '(', '\010', 'R', '\024', 'h', 'e', 'd', 'g', 'e', 'O', 'n', 'P', 'e', 'r', 'T', 'r', -'y', 'T', 'i', 'm', 'e', 'o', 'u', 't', ':', '%', '\232', '\305', '\210', '\036', ' ', '\n', '\036', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', -'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'H', 'e', 'd', 'g', 'e', 'P', 'o', 'l', 'i', 'c', 'y', '\"', '\212', '\005', -'\n', '\016', 'R', 'e', 'd', 'i', 'r', 'e', 'c', 't', 'A', 'c', 't', 'i', 'o', 'n', '\022', '\'', '\n', '\016', 'h', 't', 't', 'p', 's', -'_', 'r', 'e', 'd', 'i', 'r', 'e', 'c', 't', '\030', '\004', ' ', '\001', '(', '\010', 'H', '\000', 'R', '\r', 'h', 't', 't', 'p', 's', 'R', -'e', 'd', 'i', 'r', 'e', 'c', 't', '\022', ')', '\n', '\017', 's', 'c', 'h', 'e', 'm', 'e', '_', 'r', 'e', 'd', 'i', 'r', 'e', 'c', -'t', '\030', '\007', ' ', '\001', '(', '\t', 'H', '\000', 'R', '\016', 's', 'c', 'h', 'e', 'm', 'e', 'R', 'e', 'd', 'i', 'r', 'e', 'c', 't', -'\022', '0', '\n', '\r', 'h', 'o', 's', 't', '_', 'r', 'e', 'd', 'i', 'r', 'e', 'c', 't', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\013', -'\372', 'B', '\010', 'r', '\006', '\300', '\001', '\002', '\310', '\001', '\000', 'R', '\014', 'h', 'o', 's', 't', 'R', 'e', 'd', 'i', 'r', 'e', 'c', 't', -'\022', '#', '\n', '\r', 'p', 'o', 'r', 't', '_', 'r', 'e', 'd', 'i', 'r', 'e', 'c', 't', '\030', '\010', ' ', '\001', '(', '\r', 'R', '\014', -'p', 'o', 'r', 't', 'R', 'e', 'd', 'i', 'r', 'e', 'c', 't', '\022', '2', '\n', '\r', 'p', 'a', 't', 'h', '_', 'r', 'e', 'd', 'i', -'r', 'e', 'c', 't', '\030', '\002', ' ', '\001', '(', '\t', 'B', '\013', '\372', 'B', '\010', 'r', '\006', '\300', '\001', '\002', '\310', '\001', '\000', 'H', '\001', -'R', '\014', 'p', 'a', 't', 'h', 'R', 'e', 'd', 'i', 'r', 'e', 'c', 't', '\022', '4', '\n', '\016', 'p', 'r', 'e', 'f', 'i', 'x', '_', -'r', 'e', 'w', 'r', 'i', 't', 'e', '\030', '\005', ' ', '\001', '(', '\t', 'B', '\013', '\372', 'B', '\010', 'r', '\006', '\300', '\001', '\002', '\310', '\001', -'\000', 'H', '\001', 'R', '\r', 'p', 'r', 'e', 'f', 'i', 'x', 'R', 'e', 'w', 'r', 'i', 't', 'e', '\022', 'i', '\n', '\r', 'r', 'e', 's', -'p', 'o', 'n', 's', 'e', '_', 'c', 'o', 'd', 'e', '\030', '\003', ' ', '\001', '(', '\016', '2', ':', '.', 'e', 'n', 'v', 'o', 'y', '.', -'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'e', 'd', 'i', 'r', 'e', 'c', 't', 'A', -'c', 't', 'i', 'o', 'n', '.', 'R', 'e', 'd', 'i', 'r', 'e', 'c', 't', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'C', 'o', 'd', -'e', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\014', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', 'C', 'o', 'd', 'e', -'\022', '\037', '\n', '\013', 's', 't', 'r', 'i', 'p', '_', 'q', 'u', 'e', 'r', 'y', '\030', '\006', ' ', '\001', '(', '\010', 'R', '\n', 's', 't', -'r', 'i', 'p', 'Q', 'u', 'e', 'r', 'y', '\"', 'w', '\n', '\024', 'R', 'e', 'd', 'i', 'r', 'e', 'c', 't', 'R', 'e', 's', 'p', 'o', -'n', 's', 'e', 'C', 'o', 'd', 'e', '\022', '\025', '\n', '\021', 'M', 'O', 'V', 'E', 'D', '_', 'P', 'E', 'R', 'M', 'A', 'N', 'E', 'N', -'T', 'L', 'Y', '\020', '\000', '\022', '\t', '\n', '\005', 'F', 'O', 'U', 'N', 'D', '\020', '\001', '\022', '\r', '\n', '\t', 'S', 'E', 'E', '_', 'O', -'T', 'H', 'E', 'R', '\020', '\002', '\022', '\026', '\n', '\022', 'T', 'E', 'M', 'P', 'O', 'R', 'A', 'R', 'Y', '_', 'R', 'E', 'D', 'I', 'R', -'E', 'C', 'T', '\020', '\003', '\022', '\026', '\n', '\022', 'P', 'E', 'R', 'M', 'A', 'N', 'E', 'N', 'T', '_', 'R', 'E', 'D', 'I', 'R', 'E', -'C', 'T', '\020', '\004', ':', '(', '\232', '\305', '\210', '\036', '#', '\n', '!', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', -'.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'e', 'd', 'i', 'r', 'e', 'c', 't', 'A', 'c', 't', 'i', 'o', 'n', 'B', '\032', '\n', '\030', -'s', 'c', 'h', 'e', 'm', 'e', '_', 'r', 'e', 'w', 'r', 'i', 't', 'e', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'B', -'\030', '\n', '\026', 'p', 'a', 't', 'h', '_', 'r', 'e', 'w', 'r', 'i', 't', 'e', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', -'\"', '\240', '\001', '\n', '\024', 'D', 'i', 'r', 'e', 'c', 't', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'A', 'c', 't', 'i', 'o', 'n', -'\022', '\"', '\n', '\006', 's', 't', 'a', 't', 'u', 's', '\030', '\001', ' ', '\001', '(', '\r', 'B', '\n', '\372', 'B', '\007', '*', '\005', '\020', '\330', -'\004', '(', 'd', 'R', '\006', 's', 't', 'a', 't', 'u', 's', '\022', '4', '\n', '\004', 'b', 'o', 'd', 'y', '\030', '\002', ' ', '\001', '(', '\013', -'2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'D', -'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', 'R', '\004', 'b', 'o', 'd', 'y', ':', '.', '\232', '\305', '\210', '\036', ')', '\n', '\'', 'e', -'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'D', 'i', 'r', 'e', 'c', 't', 'R', -'e', 's', 'p', 'o', 'n', 's', 'e', 'A', 'c', 't', 'i', 'o', 'n', '\"', '\221', '\001', '\n', '\t', 'D', 'e', 'c', 'o', 'r', 'a', 't', -'o', 'r', '\022', '%', '\n', '\t', 'o', 'p', 'e', 'r', 'a', 't', 'i', 'o', 'n', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', -'\004', 'r', '\002', '\020', '\001', 'R', '\t', 'o', 'p', 'e', 'r', 'a', 't', 'i', 'o', 'n', '\022', '8', '\n', '\t', 'p', 'r', 'o', 'p', 'a', -'g', 'a', 't', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', -'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\t', 'p', 'r', 'o', 'p', 'a', 'g', 'a', 't', 'e', ':', -'#', '\232', '\305', '\210', '\036', '\036', '\n', '\034', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', -'e', '.', 'D', 'e', 'c', 'o', 'r', 'a', 't', 'o', 'r', '\"', '\322', '\002', '\n', '\007', 'T', 'r', 'a', 'c', 'i', 'n', 'g', '\022', 'I', -'\n', '\017', 'c', 'l', 'i', 'e', 'n', 't', '_', 's', 'a', 'm', 'p', 'l', 'i', 'n', 'g', '\030', '\001', ' ', '\001', '(', '\013', '2', ' ', -'.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'F', 'r', 'a', 'c', 't', 'i', 'o', 'n', 'a', 'l', -'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', '\016', 'c', 'l', 'i', 'e', 'n', 't', 'S', 'a', 'm', 'p', 'l', 'i', 'n', 'g', '\022', 'I', -'\n', '\017', 'r', 'a', 'n', 'd', 'o', 'm', '_', 's', 'a', 'm', 'p', 'l', 'i', 'n', 'g', '\030', '\002', ' ', '\001', '(', '\013', '2', ' ', -'.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'F', 'r', 'a', 'c', 't', 'i', 'o', 'n', 'a', 'l', -'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', '\016', 'r', 'a', 'n', 'd', 'o', 'm', 'S', 'a', 'm', 'p', 'l', 'i', 'n', 'g', '\022', 'K', -'\n', '\020', 'o', 'v', 'e', 'r', 'a', 'l', 'l', '_', 's', 'a', 'm', 'p', 'l', 'i', 'n', 'g', '\030', '\003', ' ', '\001', '(', '\013', '2', -' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'F', 'r', 'a', 'c', 't', 'i', 'o', 'n', 'a', -'l', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', '\017', 'o', 'v', 'e', 'r', 'a', 'l', 'l', 'S', 'a', 'm', 'p', 'l', 'i', 'n', 'g', -'\022', 'A', '\n', '\013', 'c', 'u', 's', 't', 'o', 'm', '_', 't', 'a', 'g', 's', '\030', '\004', ' ', '\003', '(', '\013', '2', ' ', '.', 'e', -'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 't', 'r', 'a', 'c', 'i', 'n', 'g', '.', 'v', '3', '.', 'C', 'u', 's', 't', -'o', 'm', 'T', 'a', 'g', 'R', '\n', 'c', 'u', 's', 't', 'o', 'm', 'T', 'a', 'g', 's', ':', '!', '\232', '\305', '\210', '\036', '\034', '\n', -'\032', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'T', 'r', 'a', 'c', 'i', -'n', 'g', '\"', '\264', '\001', '\n', '\016', 'V', 'i', 'r', 't', 'u', 'a', 'l', 'C', 'l', 'u', 's', 't', 'e', 'r', '\022', '>', '\n', '\007', -'h', 'e', 'a', 'd', 'e', 'r', 's', '\030', '\004', ' ', '\003', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', +'i', 'o', 'n', 'R', '\024', 'g', 'r', 'p', 'c', 'T', 'i', 'm', 'e', 'o', 'u', 't', 'H', 'e', 'a', 'd', 'e', 'r', 'M', 'a', 'x', +'\022', 'V', '\n', '\032', 'g', 'r', 'p', 'c', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '_', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'o', +'f', 'f', 's', 'e', 't', '\030', '\003', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', +'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\027', 'g', 'r', 'p', 'c', 'T', 'i', 'm', 'e', 'o', 'u', +'t', 'H', 'e', 'a', 'd', 'e', 'r', 'O', 'f', 'f', 's', 'e', 't', '\"', 'E', '\n', '\033', 'C', 'l', 'u', 's', 't', 'e', 'r', 'N', +'o', 't', 'F', 'o', 'u', 'n', 'd', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'C', 'o', 'd', 'e', '\022', '\027', '\n', '\023', 'S', 'E', +'R', 'V', 'I', 'C', 'E', '_', 'U', 'N', 'A', 'V', 'A', 'I', 'L', 'A', 'B', 'L', 'E', '\020', '\000', '\022', '\r', '\n', '\t', 'N', 'O', +'T', '_', 'F', 'O', 'U', 'N', 'D', '\020', '\001', '\"', '^', '\n', '\026', 'I', 'n', 't', 'e', 'r', 'n', 'a', 'l', 'R', 'e', 'd', 'i', +'r', 'e', 'c', 't', 'A', 'c', 't', 'i', 'o', 'n', '\022', '\"', '\n', '\036', 'P', 'A', 'S', 'S', '_', 'T', 'H', 'R', 'O', 'U', 'G', +'H', '_', 'I', 'N', 'T', 'E', 'R', 'N', 'A', 'L', '_', 'R', 'E', 'D', 'I', 'R', 'E', 'C', 'T', '\020', '\000', '\022', '\034', '\n', '\030', +'H', 'A', 'N', 'D', 'L', 'E', '_', 'I', 'N', 'T', 'E', 'R', 'N', 'A', 'L', '_', 'R', 'E', 'D', 'I', 'R', 'E', 'C', 'T', '\020', +'\001', '\032', '\002', '\030', '\001', ':', '%', '\232', '\305', '\210', '\036', ' ', '\n', '\036', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', +'2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'o', 'u', 't', 'e', 'A', 'c', 't', 'i', 'o', 'n', 'B', '\030', '\n', '\021', 'c', 'l', +'u', 's', 't', 'e', 'r', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', '\001', 'B', '\030', '\n', '\026', 'h', +'o', 's', 't', '_', 'r', 'e', 'w', 'r', 'i', 't', 'e', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'J', '\004', '\010', '\014', +'\020', '\r', 'J', '\004', '\010', '\022', '\020', '\023', 'J', '\004', '\010', '\023', '\020', '\024', 'J', '\004', '\010', '\020', '\020', '\021', 'J', '\004', '\010', '\026', '\020', +'\027', 'J', '\004', '\010', '\025', '\020', '\026', 'J', '\004', '\010', '\n', '\020', '\013', 'R', '\025', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'm', 'i', +'r', 'r', 'o', 'r', '_', 'p', 'o', 'l', 'i', 'c', 'y', '\"', '\215', '\017', '\n', '\013', 'R', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', +'c', 'y', '\022', '\031', '\n', '\010', 'r', 'e', 't', 'r', 'y', '_', 'o', 'n', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\007', 'r', 'e', 't', +'r', 'y', 'O', 'n', '\022', 'R', '\n', '\013', 'n', 'u', 'm', '_', 'r', 'e', 't', 'r', 'i', 'e', 's', '\030', '\002', ' ', '\001', '(', '\013', +'2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', +'V', 'a', 'l', 'u', 'e', 'B', '\023', '\362', '\230', '\376', '\217', '\005', '\r', '\n', '\013', 'm', 'a', 'x', '_', 'r', 'e', 't', 'r', 'i', 'e', +'s', 'R', '\n', 'n', 'u', 'm', 'R', 'e', 't', 'r', 'i', 'e', 's', '\022', 'A', '\n', '\017', 'p', 'e', 'r', '_', 't', 'r', 'y', '_', +'t', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\003', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', +'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\r', 'p', 'e', 'r', 'T', 'r', 'y', 'T', 'i', +'m', 'e', 'o', 'u', 't', '\022', 'W', '\n', '\016', 'r', 'e', 't', 'r', 'y', '_', 'p', 'r', 'i', 'o', 'r', 'i', 't', 'y', '\030', '\004', +' ', '\001', '(', '\013', '2', '0', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', +'.', 'v', '3', '.', 'R', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'R', 'e', 't', 'r', 'y', 'P', 'r', 'i', 'o', +'r', 'i', 't', 'y', 'R', '\r', 'r', 'e', 't', 'r', 'y', 'P', 'r', 'i', 'o', 'r', 'i', 't', 'y', '\022', 'g', '\n', '\024', 'r', 'e', +'t', 'r', 'y', '_', 'h', 'o', 's', 't', '_', 'p', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', '\030', '\005', ' ', '\003', '(', '\013', '2', +'5', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', +'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'R', 'e', 't', 'r', 'y', 'H', 'o', 's', 't', 'P', 'r', 'e', 'd', 'i', +'c', 'a', 't', 'e', 'R', '\022', 'r', 'e', 't', 'r', 'y', 'H', 'o', 's', 't', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', '\022', +'H', '\n', '!', 'h', 'o', 's', 't', '_', 's', 'e', 'l', 'e', 'c', 't', 'i', 'o', 'n', '_', 'r', 'e', 't', 'r', 'y', '_', 'm', +'a', 'x', '_', 'a', 't', 't', 'e', 'm', 'p', 't', 's', '\030', '\006', ' ', '\001', '(', '\003', 'R', '\035', 'h', 'o', 's', 't', 'S', 'e', +'l', 'e', 'c', 't', 'i', 'o', 'n', 'R', 'e', 't', 'r', 'y', 'M', 'a', 'x', 'A', 't', 't', 'e', 'm', 'p', 't', 's', '\022', '4', +'\n', '\026', 'r', 'e', 't', 'r', 'i', 'a', 'b', 'l', 'e', '_', 's', 't', 'a', 't', 'u', 's', '_', 'c', 'o', 'd', 'e', 's', '\030', +'\007', ' ', '\003', '(', '\r', 'R', '\024', 'r', 'e', 't', 'r', 'i', 'a', 'b', 'l', 'e', 'S', 't', 'a', 't', 'u', 's', 'C', 'o', 'd', +'e', 's', '\022', 'U', '\n', '\016', 'r', 'e', 't', 'r', 'y', '_', 'b', 'a', 'c', 'k', '_', 'o', 'f', 'f', '\030', '\010', ' ', '\001', '(', +'\013', '2', '/', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', +'.', 'R', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'R', 'e', 't', 'r', 'y', 'B', 'a', 'c', 'k', 'O', 'f', 'f', +'R', '\014', 'r', 'e', 't', 'r', 'y', 'B', 'a', 'c', 'k', 'O', 'f', 'f', '\022', 'x', '\n', '\033', 'r', 'a', 't', 'e', '_', 'l', 'i', +'m', 'i', 't', 'e', 'd', '_', 'r', 'e', 't', 'r', 'y', '_', 'b', 'a', 'c', 'k', '_', 'o', 'f', 'f', '\030', '\013', ' ', '\001', '(', +'\013', '2', ':', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', +'.', 'R', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', 'e', 'd', 'R', +'e', 't', 'r', 'y', 'B', 'a', 'c', 'k', 'O', 'f', 'f', 'R', '\027', 'r', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', 'e', 'd', 'R', +'e', 't', 'r', 'y', 'B', 'a', 'c', 'k', 'O', 'f', 'f', '\022', 'Q', '\n', '\021', 'r', 'e', 't', 'r', 'i', 'a', 'b', 'l', 'e', '_', +'h', 'e', 'a', 'd', 'e', 'r', 's', '\030', '\t', ' ', '\003', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'M', 'a', 't', 'c', 'h', 'e', -'r', 'R', '\007', 'h', 'e', 'a', 'd', 'e', 'r', 's', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'B', -'\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', 'm', 'e', ':', '(', '\232', '\305', '\210', '\036', '#', '\n', '!', 'e', 'n', -'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'V', 'i', 'r', 't', 'u', 'a', 'l', 'C', -'l', 'u', 's', 't', 'e', 'r', 'J', '\004', '\010', '\001', '\020', '\002', 'J', '\004', '\010', '\003', '\020', '\004', 'R', '\007', 'p', 'a', 't', 't', 'e', -'r', 'n', 'R', '\006', 'm', 'e', 't', 'h', 'o', 'd', '\"', '\304', '\022', '\n', '\t', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '\022', -';', '\n', '\005', 's', 't', 'a', 'g', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', +'r', 'R', '\020', 'r', 'e', 't', 'r', 'i', 'a', 'b', 'l', 'e', 'H', 'e', 'a', 'd', 'e', 'r', 's', '\022', '`', '\n', '\031', 'r', 'e', +'t', 'r', 'i', 'a', 'b', 'l', 'e', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '\030', '\n', +' ', '\003', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', +'.', 'v', '3', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'R', '\027', 'r', 'e', 't', 'r', 'i', 'a', +'b', 'l', 'e', 'R', 'e', 'q', 'u', 'e', 's', 't', 'H', 'e', 'a', 'd', 'e', 'r', 's', '\032', '\271', '\001', '\n', '\r', 'R', 'e', 't', +'r', 'y', 'P', 'r', 'i', 'o', 'r', 'i', 't', 'y', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', +'\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '9', '\n', '\014', 't', 'y', 'p', 'e', 'd', '_', 'c', +'o', 'n', 'f', 'i', 'g', '\030', '\003', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', +'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'H', '\000', 'R', '\013', 't', 'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', ':', '3', +'\232', '\305', '\210', '\036', '.', '\n', ',', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', +'.', 'R', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'R', 'e', 't', 'r', 'y', 'P', 'r', 'i', 'o', 'r', 'i', 't', +'y', 'B', '\r', '\n', '\013', 'c', 'o', 'n', 'f', 'i', 'g', '_', 't', 'y', 'p', 'e', 'J', '\004', '\010', '\002', '\020', '\003', 'R', '\006', 'c', +'o', 'n', 'f', 'i', 'g', '\032', '\303', '\001', '\n', '\022', 'R', 'e', 't', 'r', 'y', 'H', 'o', 's', 't', 'P', 'r', 'e', 'd', 'i', 'c', +'a', 't', 'e', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', +'\001', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '9', '\n', '\014', 't', 'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\003', +' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', +'y', 'H', '\000', 'R', '\013', 't', 'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', ':', '8', '\232', '\305', '\210', '\036', '3', '\n', '1', +'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'e', 't', 'r', 'y', 'P', +'o', 'l', 'i', 'c', 'y', '.', 'R', 'e', 't', 'r', 'y', 'H', 'o', 's', 't', 'P', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 'B', +'\r', '\n', '\013', 'c', 'o', 'n', 'f', 'i', 'g', '_', 't', 'y', 'p', 'e', 'J', '\004', '\010', '\002', '\020', '\003', 'R', '\006', 'c', 'o', 'n', +'f', 'i', 'g', '\032', '\326', '\001', '\n', '\014', 'R', 'e', 't', 'r', 'y', 'B', 'a', 'c', 'k', 'O', 'f', 'f', '\022', 'J', '\n', '\r', 'b', +'a', 's', 'e', '_', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\030', '\001', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', +'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\n', '\372', 'B', '\007', +'\252', '\001', '\004', '\010', '\001', '*', '\000', 'R', '\014', 'b', 'a', 's', 'e', 'I', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\022', 'F', '\n', '\014', +'m', 'a', 'x', '_', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\030', '\002', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', +'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', +'\252', '\001', '\002', '*', '\000', 'R', '\013', 'm', 'a', 'x', 'I', 'n', 't', 'e', 'r', 'v', 'a', 'l', ':', '2', '\232', '\305', '\210', '\036', '-', +'\n', '+', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'e', 't', 'r', +'y', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'R', 'e', 't', 'r', 'y', 'B', 'a', 'c', 'k', 'O', 'f', 'f', '\032', '\210', '\001', '\n', '\013', +'R', 'e', 's', 'e', 't', 'H', 'e', 'a', 'd', 'e', 'r', '\022', '!', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', +'B', '\r', '\372', 'B', '\n', 'r', '\010', '\020', '\001', '\300', '\001', '\001', '\310', '\001', '\000', 'R', '\004', 'n', 'a', 'm', 'e', '\022', 'V', '\n', '\006', +'f', 'o', 'r', 'm', 'a', 't', '\030', '\002', ' ', '\001', '(', '\016', '2', '4', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', +'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'R', +'e', 's', 'e', 't', 'H', 'e', 'a', 'd', 'e', 'r', 'F', 'o', 'r', 'm', 'a', 't', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', +'\001', 'R', '\006', 'f', 'o', 'r', 'm', 'a', 't', '\032', '\300', '\001', '\n', '\027', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', 'e', 'd', +'R', 'e', 't', 'r', 'y', 'B', 'a', 'c', 'k', 'O', 'f', 'f', '\022', ']', '\n', '\r', 'r', 'e', 's', 'e', 't', '_', 'h', 'e', 'a', +'d', 'e', 'r', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '.', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', +'.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', '.', 'R', 'e', 's', +'e', 't', 'H', 'e', 'a', 'd', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', 'R', '\014', 'r', 'e', 's', 'e', 't', +'H', 'e', 'a', 'd', 'e', 'r', 's', '\022', 'F', '\n', '\014', 'm', 'a', 'x', '_', 'i', 'n', 't', 'e', 'r', 'v', 'a', 'l', '\030', '\002', +' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', +'r', 'a', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\252', '\001', '\002', '*', '\000', 'R', '\013', 'm', 'a', 'x', 'I', 'n', 't', 'e', +'r', 'v', 'a', 'l', '\"', '4', '\n', '\021', 'R', 'e', 's', 'e', 't', 'H', 'e', 'a', 'd', 'e', 'r', 'F', 'o', 'r', 'm', 'a', 't', +'\022', '\013', '\n', '\007', 'S', 'E', 'C', 'O', 'N', 'D', 'S', '\020', '\000', '\022', '\022', '\n', '\016', 'U', 'N', 'I', 'X', '_', 'T', 'I', 'M', +'E', 'S', 'T', 'A', 'M', 'P', '\020', '\001', ':', '%', '\232', '\305', '\210', '\036', ' ', '\n', '\036', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', +'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'e', 't', 'r', 'y', 'P', 'o', 'l', 'i', 'c', 'y', '\"', '\234', '\002', +'\n', '\013', 'H', 'e', 'd', 'g', 'e', 'P', 'o', 'l', 'i', 'c', 'y', '\022', 'P', '\n', '\020', 'i', 'n', 'i', 't', 'i', 'a', 'l', '_', +'r', 'e', 'q', 'u', 'e', 's', 't', 's', '\030', '\001', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\007', '\372', 'B', '\004', '*', -'\002', '\030', '\n', 'R', '\005', 's', 't', 'a', 'g', 'e', '\022', '\037', '\n', '\013', 'd', 'i', 's', 'a', 'b', 'l', 'e', '_', 'k', 'e', 'y', -'\030', '\002', ' ', '\001', '(', '\t', 'R', '\n', 'd', 'i', 's', 'a', 'b', 'l', 'e', 'K', 'e', 'y', '\022', 'K', '\n', '\007', 'a', 'c', 't', -'i', 'o', 'n', 's', '\030', '\003', ' ', '\003', '(', '\013', '2', '\'', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', -'.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '.', 'A', 'c', 't', 'i', 'o', -'n', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', 'R', '\007', 'a', 'c', 't', 'i', 'o', 'n', 's', '\022', '?', '\n', '\005', 'l', -'i', 'm', 'i', 't', '\030', '\004', ' ', '\001', '(', '\013', '2', ')', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', -'.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '.', 'O', 'v', 'e', 'r', 'r', -'i', 'd', 'e', 'R', '\005', 'l', 'i', 'm', 'i', 't', '\032', '\260', '\016', '\n', '\006', 'A', 'c', 't', 'i', 'o', 'n', '\022', '^', '\n', '\016', -'s', 'o', 'u', 'r', 'c', 'e', '_', 'c', 'l', 'u', 's', 't', 'e', 'r', '\030', '\001', ' ', '\001', '(', '\013', '2', '5', '.', 'e', 'n', -'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'a', 't', 'e', 'L', -'i', 'm', 'i', 't', '.', 'A', 'c', 't', 'i', 'o', 'n', '.', 'S', 'o', 'u', 'r', 'c', 'e', 'C', 'l', 'u', 's', 't', 'e', 'r', -'H', '\000', 'R', '\r', 's', 'o', 'u', 'r', 'c', 'e', 'C', 'l', 'u', 's', 't', 'e', 'r', '\022', 'm', '\n', '\023', 'd', 'e', 's', 't', -'i', 'n', 'a', 't', 'i', 'o', 'n', '_', 'c', 'l', 'u', 's', 't', 'e', 'r', '\030', '\002', ' ', '\001', '(', '\013', '2', ':', '.', 'e', -'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'a', 't', 'e', -'L', 'i', 'm', 'i', 't', '.', 'A', 'c', 't', 'i', 'o', 'n', '.', 'D', 'e', 's', 't', 'i', 'n', 'a', 't', 'i', 'o', 'n', 'C', -'l', 'u', 's', 't', 'e', 'r', 'H', '\000', 'R', '\022', 'd', 'e', 's', 't', 'i', 'n', 'a', 't', 'i', 'o', 'n', 'C', 'l', 'u', 's', -'t', 'e', 'r', '\022', 'a', '\n', '\017', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '\030', '\003', ' ', -'\001', '(', '\013', '2', '6', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', -'v', '3', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '.', 'A', 'c', 't', 'i', 'o', 'n', '.', 'R', 'e', 'q', 'u', 'e', -'s', 't', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'H', '\000', 'R', '\016', 'r', 'e', 'q', 'u', 'e', 's', 't', 'H', 'e', 'a', 'd', 'e', -'r', 's', '\022', '^', '\n', '\016', 'r', 'e', 'm', 'o', 't', 'e', '_', 'a', 'd', 'd', 'r', 'e', 's', 's', '\030', '\004', ' ', '\001', '(', -'\013', '2', '5', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', -'.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '.', 'A', 'c', 't', 'i', 'o', 'n', '.', 'R', 'e', 'm', 'o', 't', 'e', 'A', -'d', 'd', 'r', 'e', 's', 's', 'H', '\000', 'R', '\r', 'r', 'e', 'm', 'o', 't', 'e', 'A', 'd', 'd', 'r', 'e', 's', 's', '\022', 'U', -'\n', '\013', 'g', 'e', 'n', 'e', 'r', 'i', 'c', '_', 'k', 'e', 'y', '\030', '\005', ' ', '\001', '(', '\013', '2', '2', '.', 'e', 'n', 'v', +'\002', '(', '\001', 'R', '\017', 'i', 'n', 'i', 't', 'i', 'a', 'l', 'R', 'e', 'q', 'u', 'e', 's', 't', 's', '\022', '\\', '\n', '\031', 'a', +'d', 'd', 'i', 't', 'i', 'o', 'n', 'a', 'l', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'c', 'h', 'a', 'n', 'c', 'e', '\030', +'\002', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'F', 'r', 'a', +'c', 't', 'i', 'o', 'n', 'a', 'l', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', '\027', 'a', 'd', 'd', 'i', 't', 'i', 'o', 'n', 'a', +'l', 'R', 'e', 'q', 'u', 'e', 's', 't', 'C', 'h', 'a', 'n', 'c', 'e', '\022', '6', '\n', '\030', 'h', 'e', 'd', 'g', 'e', '_', 'o', +'n', '_', 'p', 'e', 'r', '_', 't', 'r', 'y', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\003', ' ', '\001', '(', '\010', 'R', '\024', +'h', 'e', 'd', 'g', 'e', 'O', 'n', 'P', 'e', 'r', 'T', 'r', 'y', 'T', 'i', 'm', 'e', 'o', 'u', 't', ':', '%', '\232', '\305', '\210', +'\036', ' ', '\n', '\036', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'H', 'e', +'d', 'g', 'e', 'P', 'o', 'l', 'i', 'c', 'y', '\"', '\341', '\005', '\n', '\016', 'R', 'e', 'd', 'i', 'r', 'e', 'c', 't', 'A', 'c', 't', +'i', 'o', 'n', '\022', '\'', '\n', '\016', 'h', 't', 't', 'p', 's', '_', 'r', 'e', 'd', 'i', 'r', 'e', 'c', 't', '\030', '\004', ' ', '\001', +'(', '\010', 'H', '\000', 'R', '\r', 'h', 't', 't', 'p', 's', 'R', 'e', 'd', 'i', 'r', 'e', 'c', 't', '\022', ')', '\n', '\017', 's', 'c', +'h', 'e', 'm', 'e', '_', 'r', 'e', 'd', 'i', 'r', 'e', 'c', 't', '\030', '\007', ' ', '\001', '(', '\t', 'H', '\000', 'R', '\016', 's', 'c', +'h', 'e', 'm', 'e', 'R', 'e', 'd', 'i', 'r', 'e', 'c', 't', '\022', '0', '\n', '\r', 'h', 'o', 's', 't', '_', 'r', 'e', 'd', 'i', +'r', 'e', 'c', 't', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\013', '\372', 'B', '\010', 'r', '\006', '\300', '\001', '\002', '\310', '\001', '\000', 'R', '\014', +'h', 'o', 's', 't', 'R', 'e', 'd', 'i', 'r', 'e', 'c', 't', '\022', '#', '\n', '\r', 'p', 'o', 'r', 't', '_', 'r', 'e', 'd', 'i', +'r', 'e', 'c', 't', '\030', '\010', ' ', '\001', '(', '\r', 'R', '\014', 'p', 'o', 'r', 't', 'R', 'e', 'd', 'i', 'r', 'e', 'c', 't', '\022', +'2', '\n', '\r', 'p', 'a', 't', 'h', '_', 'r', 'e', 'd', 'i', 'r', 'e', 'c', 't', '\030', '\002', ' ', '\001', '(', '\t', 'B', '\013', '\372', +'B', '\010', 'r', '\006', '\300', '\001', '\002', '\310', '\001', '\000', 'H', '\001', 'R', '\014', 'p', 'a', 't', 'h', 'R', 'e', 'd', 'i', 'r', 'e', 'c', +'t', '\022', '4', '\n', '\016', 'p', 'r', 'e', 'f', 'i', 'x', '_', 'r', 'e', 'w', 'r', 'i', 't', 'e', '\030', '\005', ' ', '\001', '(', '\t', +'B', '\013', '\372', 'B', '\010', 'r', '\006', '\300', '\001', '\002', '\310', '\001', '\000', 'H', '\001', 'R', '\r', 'p', 'r', 'e', 'f', 'i', 'x', 'R', 'e', +'w', 'r', 'i', 't', 'e', '\022', 'U', '\n', '\r', 'r', 'e', 'g', 'e', 'x', '_', 'r', 'e', 'w', 'r', 'i', 't', 'e', '\030', '\t', ' ', +'\001', '(', '\013', '2', '.', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', +'v', '3', '.', 'R', 'e', 'g', 'e', 'x', 'M', 'a', 't', 'c', 'h', 'A', 'n', 'd', 'S', 'u', 'b', 's', 't', 'i', 't', 'u', 't', +'e', 'H', '\001', 'R', '\014', 'r', 'e', 'g', 'e', 'x', 'R', 'e', 'w', 'r', 'i', 't', 'e', '\022', 'i', '\n', '\r', 'r', 'e', 's', 'p', +'o', 'n', 's', 'e', '_', 'c', 'o', 'd', 'e', '\030', '\003', ' ', '\001', '(', '\016', '2', ':', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', +'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'e', 'd', 'i', 'r', 'e', 'c', 't', 'A', 'c', +'t', 'i', 'o', 'n', '.', 'R', 'e', 'd', 'i', 'r', 'e', 'c', 't', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'C', 'o', 'd', 'e', +'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\014', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', 'C', 'o', 'd', 'e', '\022', +'\037', '\n', '\013', 's', 't', 'r', 'i', 'p', '_', 'q', 'u', 'e', 'r', 'y', '\030', '\006', ' ', '\001', '(', '\010', 'R', '\n', 's', 't', 'r', +'i', 'p', 'Q', 'u', 'e', 'r', 'y', '\"', 'w', '\n', '\024', 'R', 'e', 'd', 'i', 'r', 'e', 'c', 't', 'R', 'e', 's', 'p', 'o', 'n', +'s', 'e', 'C', 'o', 'd', 'e', '\022', '\025', '\n', '\021', 'M', 'O', 'V', 'E', 'D', '_', 'P', 'E', 'R', 'M', 'A', 'N', 'E', 'N', 'T', +'L', 'Y', '\020', '\000', '\022', '\t', '\n', '\005', 'F', 'O', 'U', 'N', 'D', '\020', '\001', '\022', '\r', '\n', '\t', 'S', 'E', 'E', '_', 'O', 'T', +'H', 'E', 'R', '\020', '\002', '\022', '\026', '\n', '\022', 'T', 'E', 'M', 'P', 'O', 'R', 'A', 'R', 'Y', '_', 'R', 'E', 'D', 'I', 'R', 'E', +'C', 'T', '\020', '\003', '\022', '\026', '\n', '\022', 'P', 'E', 'R', 'M', 'A', 'N', 'E', 'N', 'T', '_', 'R', 'E', 'D', 'I', 'R', 'E', 'C', +'T', '\020', '\004', ':', '(', '\232', '\305', '\210', '\036', '#', '\n', '!', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', +'r', 'o', 'u', 't', 'e', '.', 'R', 'e', 'd', 'i', 'r', 'e', 'c', 't', 'A', 'c', 't', 'i', 'o', 'n', 'B', '\032', '\n', '\030', 's', +'c', 'h', 'e', 'm', 'e', '_', 'r', 'e', 'w', 'r', 'i', 't', 'e', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'B', '\030', +'\n', '\026', 'p', 'a', 't', 'h', '_', 'r', 'e', 'w', 'r', 'i', 't', 'e', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\"', +'\240', '\001', '\n', '\024', 'D', 'i', 'r', 'e', 'c', 't', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'A', 'c', 't', 'i', 'o', 'n', '\022', +'\"', '\n', '\006', 's', 't', 'a', 't', 'u', 's', '\030', '\001', ' ', '\001', '(', '\r', 'B', '\n', '\372', 'B', '\007', '*', '\005', '\020', '\330', '\004', +'(', 'd', 'R', '\006', 's', 't', 'a', 't', 'u', 's', '\022', '4', '\n', '\004', 'b', 'o', 'd', 'y', '\030', '\002', ' ', '\001', '(', '\013', '2', +' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'D', 'a', +'t', 'a', 'S', 'o', 'u', 'r', 'c', 'e', 'R', '\004', 'b', 'o', 'd', 'y', ':', '.', '\232', '\305', '\210', '\036', ')', '\n', '\'', 'e', 'n', +'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'D', 'i', 'r', 'e', 'c', 't', 'R', 'e', +'s', 'p', 'o', 'n', 's', 'e', 'A', 'c', 't', 'i', 'o', 'n', '\"', '\221', '\001', '\n', '\t', 'D', 'e', 'c', 'o', 'r', 'a', 't', 'o', +'r', '\022', '%', '\n', '\t', 'o', 'p', 'e', 'r', 'a', 't', 'i', 'o', 'n', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', +'r', '\002', '\020', '\001', 'R', '\t', 'o', 'p', 'e', 'r', 'a', 't', 'i', 'o', 'n', '\022', '8', '\n', '\t', 'p', 'r', 'o', 'p', 'a', 'g', +'a', 't', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', +'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\t', 'p', 'r', 'o', 'p', 'a', 'g', 'a', 't', 'e', ':', '#', +'\232', '\305', '\210', '\036', '\036', '\n', '\034', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', +'.', 'D', 'e', 'c', 'o', 'r', 'a', 't', 'o', 'r', '\"', '\322', '\002', '\n', '\007', 'T', 'r', 'a', 'c', 'i', 'n', 'g', '\022', 'I', '\n', +'\017', 'c', 'l', 'i', 'e', 'n', 't', '_', 's', 'a', 'm', 'p', 'l', 'i', 'n', 'g', '\030', '\001', ' ', '\001', '(', '\013', '2', ' ', '.', +'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'F', 'r', 'a', 'c', 't', 'i', 'o', 'n', 'a', 'l', 'P', +'e', 'r', 'c', 'e', 'n', 't', 'R', '\016', 'c', 'l', 'i', 'e', 'n', 't', 'S', 'a', 'm', 'p', 'l', 'i', 'n', 'g', '\022', 'I', '\n', +'\017', 'r', 'a', 'n', 'd', 'o', 'm', '_', 's', 'a', 'm', 'p', 'l', 'i', 'n', 'g', '\030', '\002', ' ', '\001', '(', '\013', '2', ' ', '.', +'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'F', 'r', 'a', 'c', 't', 'i', 'o', 'n', 'a', 'l', 'P', +'e', 'r', 'c', 'e', 'n', 't', 'R', '\016', 'r', 'a', 'n', 'd', 'o', 'm', 'S', 'a', 'm', 'p', 'l', 'i', 'n', 'g', '\022', 'K', '\n', +'\020', 'o', 'v', 'e', 'r', 'a', 'l', 'l', '_', 's', 'a', 'm', 'p', 'l', 'i', 'n', 'g', '\030', '\003', ' ', '\001', '(', '\013', '2', ' ', +'.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'F', 'r', 'a', 'c', 't', 'i', 'o', 'n', 'a', 'l', +'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', '\017', 'o', 'v', 'e', 'r', 'a', 'l', 'l', 'S', 'a', 'm', 'p', 'l', 'i', 'n', 'g', '\022', +'A', '\n', '\013', 'c', 'u', 's', 't', 'o', 'm', '_', 't', 'a', 'g', 's', '\030', '\004', ' ', '\003', '(', '\013', '2', ' ', '.', 'e', 'n', +'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 't', 'r', 'a', 'c', 'i', 'n', 'g', '.', 'v', '3', '.', 'C', 'u', 's', 't', 'o', +'m', 'T', 'a', 'g', 'R', '\n', 'c', 'u', 's', 't', 'o', 'm', 'T', 'a', 'g', 's', ':', '!', '\232', '\305', '\210', '\036', '\034', '\n', '\032', +'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'T', 'r', 'a', 'c', 'i', 'n', +'g', '\"', '\264', '\001', '\n', '\016', 'V', 'i', 'r', 't', 'u', 'a', 'l', 'C', 'l', 'u', 's', 't', 'e', 'r', '\022', '>', '\n', '\007', 'h', +'e', 'a', 'd', 'e', 'r', 's', '\030', '\004', ' ', '\003', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', +'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'M', 'a', 't', 'c', 'h', 'e', 'r', +'R', '\007', 'h', 'e', 'a', 'd', 'e', 'r', 's', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'B', '\007', +'\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', 'm', 'e', ':', '(', '\232', '\305', '\210', '\036', '#', '\n', '!', 'e', 'n', 'v', +'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'V', 'i', 'r', 't', 'u', 'a', 'l', 'C', 'l', +'u', 's', 't', 'e', 'r', 'J', '\004', '\010', '\001', '\020', '\002', 'J', '\004', '\010', '\003', '\020', '\004', 'R', '\007', 'p', 'a', 't', 't', 'e', 'r', +'n', 'R', '\006', 'm', 'e', 't', 'h', 'o', 'd', '\"', '\241', '\026', '\n', '\t', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '\022', ';', +'\n', '\005', 's', 't', 'a', 'g', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', +'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\007', '\372', 'B', '\004', '*', '\002', +'\030', '\n', 'R', '\005', 's', 't', 'a', 'g', 'e', '\022', '\037', '\n', '\013', 'd', 'i', 's', 'a', 'b', 'l', 'e', '_', 'k', 'e', 'y', '\030', +'\002', ' ', '\001', '(', '\t', 'R', '\n', 'd', 'i', 's', 'a', 'b', 'l', 'e', 'K', 'e', 'y', '\022', 'K', '\n', '\007', 'a', 'c', 't', 'i', +'o', 'n', 's', '\030', '\003', ' ', '\003', '(', '\013', '2', '\'', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', +'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '.', 'A', 'c', 't', 'i', 'o', 'n', +'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', 'R', '\007', 'a', 'c', 't', 'i', 'o', 'n', 's', '\022', '?', '\n', '\005', 'l', 'i', +'m', 'i', 't', '\030', '\004', ' ', '\001', '(', '\013', '2', ')', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', +'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '.', 'O', 'v', 'e', 'r', 'r', 'i', +'d', 'e', 'R', '\005', 'l', 'i', 'm', 'i', 't', '\032', '\215', '\022', '\n', '\006', 'A', 'c', 't', 'i', 'o', 'n', '\022', '^', '\n', '\016', 's', +'o', 'u', 'r', 'c', 'e', '_', 'c', 'l', 'u', 's', 't', 'e', 'r', '\030', '\001', ' ', '\001', '(', '\013', '2', '5', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'a', 't', 'e', 'L', 'i', -'m', 'i', 't', '.', 'A', 'c', 't', 'i', 'o', 'n', '.', 'G', 'e', 'n', 'e', 'r', 'i', 'c', 'K', 'e', 'y', 'H', '\000', 'R', '\n', -'g', 'e', 'n', 'e', 'r', 'i', 'c', 'K', 'e', 'y', '\022', 'h', '\n', '\022', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'v', 'a', 'l', 'u', -'e', '_', 'm', 'a', 't', 'c', 'h', '\030', '\006', ' ', '\001', '(', '\013', '2', '8', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', -'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '.', 'A', 'c', -'t', 'i', 'o', 'n', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'M', 'a', 't', 'c', 'h', 'H', '\000', 'R', '\020', -'h', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'M', 'a', 't', 'c', 'h', '\022', 'd', '\n', '\020', 'd', 'y', 'n', 'a', 'm', -'i', 'c', '_', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '\030', '\007', ' ', '\001', '(', '\013', '2', '7', '.', 'e', 'n', 'v', 'o', 'y', -'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', -'t', '.', 'A', 'c', 't', 'i', 'o', 'n', '.', 'D', 'y', 'n', 'a', 'm', 'i', 'c', 'M', 'e', 't', 'a', 'D', 'a', 't', 'a', 'H', -'\000', 'R', '\017', 'd', 'y', 'n', 'a', 'm', 'i', 'c', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', '\032', 'I', '\n', '\r', 'S', 'o', 'u', -'r', 'c', 'e', 'C', 'l', 'u', 's', 't', 'e', 'r', ':', '8', '\232', '\305', '\210', '\036', '3', '\n', '1', 'e', 'n', 'v', 'o', 'y', '.', -'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '.', 'A', 'c', -'t', 'i', 'o', 'n', '.', 'S', 'o', 'u', 'r', 'c', 'e', 'C', 'l', 'u', 's', 't', 'e', 'r', '\032', 'S', '\n', '\022', 'D', 'e', 's', -'t', 'i', 'n', 'a', 't', 'i', 'o', 'n', 'C', 'l', 'u', 's', 't', 'e', 'r', ':', '=', '\232', '\305', '\210', '\036', '8', '\n', '6', 'e', -'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', -'i', 't', '.', 'A', 'c', 't', 'i', 'o', 'n', '.', 'D', 'e', 's', 't', 'i', 'n', 'a', 't', 'i', 'o', 'n', 'C', 'l', 'u', 's', -'t', 'e', 'r', '\032', '\321', '\001', '\n', '\016', 'R', 'e', 'q', 'u', 'e', 's', 't', 'H', 'e', 'a', 'd', 'e', 'r', 's', '\022', '.', '\n', -'\013', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\r', '\372', 'B', '\n', 'r', '\010', -'\020', '\001', '\300', '\001', '\001', '\310', '\001', '\000', 'R', '\n', 'h', 'e', 'a', 'd', 'e', 'r', 'N', 'a', 'm', 'e', '\022', '.', '\n', '\016', 'd', -'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', '_', 'k', 'e', 'y', '\030', '\002', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', -'\002', '\020', '\001', 'R', '\r', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'K', 'e', 'y', '\022', '$', '\n', '\016', 's', 'k', 'i', -'p', '_', 'i', 'f', '_', 'a', 'b', 's', 'e', 'n', 't', '\030', '\003', ' ', '\001', '(', '\010', 'R', '\014', 's', 'k', 'i', 'p', 'I', 'f', -'A', 'b', 's', 'e', 'n', 't', ':', '9', '\232', '\305', '\210', '\036', '4', '\n', '2', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', -'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '.', 'A', 'c', 't', 'i', 'o', 'n', -'.', 'R', 'e', 'q', 'u', 'e', 's', 't', 'H', 'e', 'a', 'd', 'e', 'r', 's', '\032', 'I', '\n', '\r', 'R', 'e', 'm', 'o', 't', 'e', -'A', 'd', 'd', 'r', 'e', 's', 's', ':', '8', '\232', '\305', '\210', '\036', '3', '\n', '1', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', -'.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '.', 'A', 'c', 't', 'i', 'o', -'n', '.', 'R', 'e', 'm', 'o', 't', 'e', 'A', 'd', 'd', 'r', 'e', 's', 's', '\032', '\236', '\001', '\n', '\n', 'G', 'e', 'n', 'e', 'r', -'i', 'c', 'K', 'e', 'y', '\022', '2', '\n', '\020', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', '_', 'v', 'a', 'l', 'u', 'e', -'\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\017', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', -'o', 'r', 'V', 'a', 'l', 'u', 'e', '\022', '%', '\n', '\016', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', '_', 'k', 'e', 'y', -'\030', '\002', ' ', '\001', '(', '\t', 'R', '\r', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'K', 'e', 'y', ':', '5', '\232', '\305', -'\210', '\036', '0', '\n', '.', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', -'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '.', 'A', 'c', 't', 'i', 'o', 'n', '.', 'G', 'e', 'n', 'e', 'r', 'i', 'c', 'K', 'e', -'y', '\032', '\214', '\002', '\n', '\020', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'M', 'a', 't', 'c', 'h', '\022', '2', '\n', -'\020', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', -'\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\017', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'V', 'a', 'l', 'u', 'e', '\022', -'=', '\n', '\014', 'e', 'x', 'p', 'e', 'c', 't', '_', 'm', 'a', 't', 'c', 'h', '\030', '\002', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', -'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', -'\013', 'e', 'x', 'p', 'e', 'c', 't', 'M', 'a', 't', 'c', 'h', '\022', 'H', '\n', '\007', 'h', 'e', 'a', 'd', 'e', 'r', 's', '\030', '\003', -' ', '\003', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', -'.', 'v', '3', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', -'\010', '\001', 'R', '\007', 'h', 'e', 'a', 'd', 'e', 'r', 's', ':', ';', '\232', '\305', '\210', '\036', '6', '\n', '4', 'e', 'n', 'v', 'o', 'y', +'m', 'i', 't', '.', 'A', 'c', 't', 'i', 'o', 'n', '.', 'S', 'o', 'u', 'r', 'c', 'e', 'C', 'l', 'u', 's', 't', 'e', 'r', 'H', +'\000', 'R', '\r', 's', 'o', 'u', 'r', 'c', 'e', 'C', 'l', 'u', 's', 't', 'e', 'r', '\022', 'm', '\n', '\023', 'd', 'e', 's', 't', 'i', +'n', 'a', 't', 'i', 'o', 'n', '_', 'c', 'l', 'u', 's', 't', 'e', 'r', '\030', '\002', ' ', '\001', '(', '\013', '2', ':', '.', 'e', 'n', +'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'a', 't', 'e', 'L', +'i', 'm', 'i', 't', '.', 'A', 'c', 't', 'i', 'o', 'n', '.', 'D', 'e', 's', 't', 'i', 'n', 'a', 't', 'i', 'o', 'n', 'C', 'l', +'u', 's', 't', 'e', 'r', 'H', '\000', 'R', '\022', 'd', 'e', 's', 't', 'i', 'n', 'a', 't', 'i', 'o', 'n', 'C', 'l', 'u', 's', 't', +'e', 'r', '\022', 'a', '\n', '\017', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '\030', '\003', ' ', '\001', +'(', '\013', '2', '6', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', +'3', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '.', 'A', 'c', 't', 'i', 'o', 'n', '.', 'R', 'e', 'q', 'u', 'e', 's', +'t', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'H', '\000', 'R', '\016', 'r', 'e', 'q', 'u', 'e', 's', 't', 'H', 'e', 'a', 'd', 'e', 'r', +'s', '\022', '^', '\n', '\016', 'r', 'e', 'm', 'o', 't', 'e', '_', 'a', 'd', 'd', 'r', 'e', 's', 's', '\030', '\004', ' ', '\001', '(', '\013', +'2', '5', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', +'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '.', 'A', 'c', 't', 'i', 'o', 'n', '.', 'R', 'e', 'm', 'o', 't', 'e', 'A', 'd', +'d', 'r', 'e', 's', 's', 'H', '\000', 'R', '\r', 'r', 'e', 'm', 'o', 't', 'e', 'A', 'd', 'd', 'r', 'e', 's', 's', '\022', 'U', '\n', +'\013', 'g', 'e', 'n', 'e', 'r', 'i', 'c', '_', 'k', 'e', 'y', '\030', '\005', ' ', '\001', '(', '\013', '2', '2', '.', 'e', 'n', 'v', 'o', +'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', +'i', 't', '.', 'A', 'c', 't', 'i', 'o', 'n', '.', 'G', 'e', 'n', 'e', 'r', 'i', 'c', 'K', 'e', 'y', 'H', '\000', 'R', '\n', 'g', +'e', 'n', 'e', 'r', 'i', 'c', 'K', 'e', 'y', '\022', 'h', '\n', '\022', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'v', 'a', 'l', 'u', 'e', +'_', 'm', 'a', 't', 'c', 'h', '\030', '\006', ' ', '\001', '(', '\013', '2', '8', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', +'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '.', 'A', 'c', 't', +'i', 'o', 'n', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'M', 'a', 't', 'c', 'h', 'H', '\000', 'R', '\020', 'h', +'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'M', 'a', 't', 'c', 'h', '\022', 'n', '\n', '\020', 'd', 'y', 'n', 'a', 'm', 'i', +'c', '_', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '\030', '\007', ' ', '\001', '(', '\013', '2', '7', '.', 'e', 'n', 'v', 'o', 'y', '.', +'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', +'.', 'A', 'c', 't', 'i', 'o', 'n', '.', 'D', 'y', 'n', 'a', 'm', 'i', 'c', 'M', 'e', 't', 'a', 'D', 'a', 't', 'a', 'B', '\010', +'\030', '\001', '\270', '\356', '\362', '\322', '\005', '\001', 'H', '\000', 'R', '\017', 'd', 'y', 'n', 'a', 'm', 'i', 'c', 'M', 'e', 't', 'a', 'd', 'a', +'t', 'a', '\022', 'N', '\n', '\010', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '\030', '\010', ' ', '\001', '(', '\013', '2', '0', '.', 'e', 'n', +'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'a', 't', 'e', 'L', +'i', 'm', 'i', 't', '.', 'A', 'c', 't', 'i', 'o', 'n', '.', 'M', 'e', 't', 'a', 'D', 'a', 't', 'a', 'H', '\000', 'R', '\010', 'm', +'e', 't', 'a', 'd', 'a', 't', 'a', '\022', 'J', '\n', '\t', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '\030', '\t', ' ', '\001', '(', +'\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', +'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'H', '\000', 'R', '\t', 'e', +'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '\032', 'I', '\n', '\r', 'S', 'o', 'u', 'r', 'c', 'e', 'C', 'l', 'u', 's', 't', 'e', 'r', +':', '8', '\232', '\305', '\210', '\036', '3', '\n', '1', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', +'t', 'e', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '.', 'A', 'c', 't', 'i', 'o', 'n', '.', 'S', 'o', 'u', 'r', 'c', +'e', 'C', 'l', 'u', 's', 't', 'e', 'r', '\032', 'S', '\n', '\022', 'D', 'e', 's', 't', 'i', 'n', 'a', 't', 'i', 'o', 'n', 'C', 'l', +'u', 's', 't', 'e', 'r', ':', '=', '\232', '\305', '\210', '\036', '8', '\n', '6', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', +'2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '.', 'A', 'c', 't', 'i', 'o', 'n', '.', +'D', 'e', 's', 't', 'i', 'n', 'a', 't', 'i', 'o', 'n', 'C', 'l', 'u', 's', 't', 'e', 'r', '\032', '\321', '\001', '\n', '\016', 'R', 'e', +'q', 'u', 'e', 's', 't', 'H', 'e', 'a', 'd', 'e', 'r', 's', '\022', '.', '\n', '\013', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'n', 'a', +'m', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\r', '\372', 'B', '\n', 'r', '\010', '\020', '\001', '\300', '\001', '\001', '\310', '\001', '\000', 'R', '\n', +'h', 'e', 'a', 'd', 'e', 'r', 'N', 'a', 'm', 'e', '\022', '.', '\n', '\016', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', '_', +'k', 'e', 'y', '\030', '\002', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\r', 'd', 'e', 's', 'c', 'r', +'i', 'p', 't', 'o', 'r', 'K', 'e', 'y', '\022', '$', '\n', '\016', 's', 'k', 'i', 'p', '_', 'i', 'f', '_', 'a', 'b', 's', 'e', 'n', +'t', '\030', '\003', ' ', '\001', '(', '\010', 'R', '\014', 's', 'k', 'i', 'p', 'I', 'f', 'A', 'b', 's', 'e', 'n', 't', ':', '9', '\232', '\305', +'\210', '\036', '4', '\n', '2', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', +'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '.', 'A', 'c', 't', 'i', 'o', 'n', '.', 'R', 'e', 'q', 'u', 'e', 's', 't', 'H', 'e', +'a', 'd', 'e', 'r', 's', '\032', 'I', '\n', '\r', 'R', 'e', 'm', 'o', 't', 'e', 'A', 'd', 'd', 'r', 'e', 's', 's', ':', '8', '\232', +'\305', '\210', '\036', '3', '\n', '1', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', +'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '.', 'A', 'c', 't', 'i', 'o', 'n', '.', 'R', 'e', 'm', 'o', 't', 'e', 'A', 'd', +'d', 'r', 'e', 's', 's', '\032', '\236', '\001', '\n', '\n', 'G', 'e', 'n', 'e', 'r', 'i', 'c', 'K', 'e', 'y', '\022', '2', '\n', '\020', 'd', +'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', +'\004', 'r', '\002', '\020', '\001', 'R', '\017', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'V', 'a', 'l', 'u', 'e', '\022', '%', '\n', +'\016', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', '_', 'k', 'e', 'y', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\r', 'd', 'e', +'s', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'K', 'e', 'y', ':', '5', '\232', '\305', '\210', '\036', '0', '\n', '.', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '.', 'A', -'c', 't', 'i', 'o', 'n', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'M', 'a', 't', 'c', 'h', '\032', '\270', '\001', -'\n', '\017', 'D', 'y', 'n', 'a', 'm', 'i', 'c', 'M', 'e', 't', 'a', 'D', 'a', 't', 'a', '\022', '.', '\n', '\016', 'd', 'e', 's', 'c', -'r', 'i', 'p', 't', 'o', 'r', '_', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', -'R', '\r', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'K', 'e', 'y', '\022', 'P', '\n', '\014', 'm', 'e', 't', 'a', 'd', 'a', -'t', 'a', '_', 'k', 'e', 'y', '\030', '\002', ' ', '\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', +'c', 't', 'i', 'o', 'n', '.', 'G', 'e', 'n', 'e', 'r', 'i', 'c', 'K', 'e', 'y', '\032', '\214', '\002', '\n', '\020', 'H', 'e', 'a', 'd', +'e', 'r', 'V', 'a', 'l', 'u', 'e', 'M', 'a', 't', 'c', 'h', '\022', '2', '\n', '\020', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', +'r', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\017', 'd', +'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'V', 'a', 'l', 'u', 'e', '\022', '=', '\n', '\014', 'e', 'x', 'p', 'e', 'c', 't', '_', +'m', 'a', 't', 'c', 'h', '\030', '\002', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', +'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\013', 'e', 'x', 'p', 'e', 'c', 't', 'M', 'a', 't', +'c', 'h', '\022', 'H', '\n', '\007', 'h', 'e', 'a', 'd', 'e', 'r', 's', '\030', '\003', ' ', '\003', '(', '\013', '2', '$', '.', 'e', 'n', 'v', +'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'd', 'e', 'r', +'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', 'R', '\007', 'h', 'e', 'a', 'd', 'e', 'r', +'s', ':', ';', '\232', '\305', '\210', '\036', '6', '\n', '4', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', +'u', 't', 'e', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '.', 'A', 'c', 't', 'i', 'o', 'n', '.', 'H', 'e', 'a', 'd', +'e', 'r', 'V', 'a', 'l', 'u', 'e', 'M', 'a', 't', 'c', 'h', '\032', '\270', '\001', '\n', '\017', 'D', 'y', 'n', 'a', 'm', 'i', 'c', 'M', +'e', 't', 'a', 'D', 'a', 't', 'a', '\022', '.', '\n', '\016', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', '_', 'k', 'e', 'y', +'\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\r', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', +'o', 'r', 'K', 'e', 'y', '\022', 'P', '\n', '\014', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '_', 'k', 'e', 'y', '\030', '\002', ' ', '\001', +'(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '.', +'v', '3', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'K', 'e', 'y', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', +'\013', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', 'K', 'e', 'y', '\022', '#', '\n', '\r', 'd', 'e', 'f', 'a', 'u', 'l', 't', '_', 'v', +'a', 'l', 'u', 'e', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\014', 'd', 'e', 'f', 'a', 'u', 'l', 't', 'V', 'a', 'l', 'u', 'e', '\032', +'\264', '\002', '\n', '\010', 'M', 'e', 't', 'a', 'D', 'a', 't', 'a', '\022', '.', '\n', '\016', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', +'r', '_', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\r', 'd', 'e', 's', +'c', 'r', 'i', 'p', 't', 'o', 'r', 'K', 'e', 'y', '\022', 'P', '\n', '\014', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '_', 'k', 'e', +'y', '\030', '\002', ' ', '\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'e', 't', 'a', +'d', 'a', 't', 'a', '.', 'v', '3', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'K', 'e', 'y', 'B', '\010', '\372', 'B', '\005', '\212', +'\001', '\002', '\020', '\001', 'R', '\013', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', 'K', 'e', 'y', '\022', '#', '\n', '\r', 'd', 'e', 'f', 'a', +'u', 'l', 't', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\014', 'd', 'e', 'f', 'a', 'u', 'l', 't', 'V', +'a', 'l', 'u', 'e', '\022', 'Y', '\n', '\006', 's', 'o', 'u', 'r', 'c', 'e', '\030', '\004', ' ', '\001', '(', '\016', '2', '7', '.', 'e', 'n', +'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'a', 't', 'e', 'L', +'i', 'm', 'i', 't', '.', 'A', 'c', 't', 'i', 'o', 'n', '.', 'M', 'e', 't', 'a', 'D', 'a', 't', 'a', '.', 'S', 'o', 'u', 'r', +'c', 'e', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\006', 's', 'o', 'u', 'r', 'c', 'e', '\"', '&', '\n', '\006', 'S', +'o', 'u', 'r', 'c', 'e', '\022', '\013', '\n', '\007', 'D', 'Y', 'N', 'A', 'M', 'I', 'C', '\020', '\000', '\022', '\017', '\n', '\013', 'R', 'O', 'U', +'T', 'E', '_', 'E', 'N', 'T', 'R', 'Y', '\020', '\001', ':', '*', '\232', '\305', '\210', '\036', '%', '\n', '#', 'e', 'n', 'v', 'o', 'y', '.', +'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '.', 'A', 'c', +'t', 'i', 'o', 'n', 'B', '\027', '\n', '\020', 'a', 'c', 't', 'i', 'o', 'n', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\022', +'\003', '\370', 'B', '\001', '\032', '\362', '\001', '\n', '\010', 'O', 'v', 'e', 'r', 'r', 'i', 'd', 'e', '\022', 'f', '\n', '\020', 'd', 'y', 'n', 'a', +'m', 'i', 'c', '_', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '\030', '\001', ' ', '\001', '(', '\013', '2', '9', '.', 'e', 'n', 'v', 'o', +'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', +'i', 't', '.', 'O', 'v', 'e', 'r', 'r', 'i', 'd', 'e', '.', 'D', 'y', 'n', 'a', 'm', 'i', 'c', 'M', 'e', 't', 'a', 'd', 'a', +'t', 'a', 'H', '\000', 'R', '\017', 'd', 'y', 'n', 'a', 'm', 'i', 'c', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', '\032', 'c', '\n', '\017', +'D', 'y', 'n', 'a', 'm', 'i', 'c', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', '\022', 'P', '\n', '\014', 'm', 'e', 't', 'a', 'd', 'a', +'t', 'a', '_', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '.', 'v', '3', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'K', 'e', 'y', 'B', -'\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\013', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', 'K', 'e', 'y', '\022', '#', '\n', -'\r', 'd', 'e', 'f', 'a', 'u', 'l', 't', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\014', 'd', 'e', 'f', -'a', 'u', 'l', 't', 'V', 'a', 'l', 'u', 'e', ':', '*', '\232', '\305', '\210', '\036', '%', '\n', '#', 'e', 'n', 'v', 'o', 'y', '.', 'a', -'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '.', 'A', 'c', 't', -'i', 'o', 'n', 'B', '\027', '\n', '\020', 'a', 'c', 't', 'i', 'o', 'n', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\022', '\003', -'\370', 'B', '\001', '\032', '\362', '\001', '\n', '\010', 'O', 'v', 'e', 'r', 'r', 'i', 'd', 'e', '\022', 'f', '\n', '\020', 'd', 'y', 'n', 'a', 'm', -'i', 'c', '_', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '\030', '\001', ' ', '\001', '(', '\013', '2', '9', '.', 'e', 'n', 'v', 'o', 'y', -'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', -'t', '.', 'O', 'v', 'e', 'r', 'r', 'i', 'd', 'e', '.', 'D', 'y', 'n', 'a', 'm', 'i', 'c', 'M', 'e', 't', 'a', 'd', 'a', 't', -'a', 'H', '\000', 'R', '\017', 'd', 'y', 'n', 'a', 'm', 'i', 'c', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', '\032', 'c', '\n', '\017', 'D', -'y', 'n', 'a', 'm', 'i', 'c', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', '\022', 'P', '\n', '\014', 'm', 'e', 't', 'a', 'd', 'a', 't', -'a', '_', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', -'m', 'e', 't', 'a', 'd', 'a', 't', 'a', '.', 'v', '3', '.', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', 'K', 'e', 'y', 'B', '\010', -'\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\013', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', 'K', 'e', 'y', 'B', '\031', '\n', '\022', -'o', 'v', 'e', 'r', 'r', 'i', 'd', 'e', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', '\001', ':', '#', -'\232', '\305', '\210', '\036', '\036', '\n', '\034', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', -'.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '\"', '\236', '\004', '\n', '\r', 'H', 'e', 'a', 'd', 'e', 'r', 'M', 'a', 't', 'c', -'h', 'e', 'r', '\022', '!', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\r', '\372', 'B', '\n', 'r', '\010', '\020', -'\001', '\300', '\001', '\001', '\310', '\001', '\000', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '!', '\n', '\013', 'e', 'x', 'a', 'c', 't', '_', 'm', 'a', -'t', 'c', 'h', '\030', '\004', ' ', '\001', '(', '\t', 'H', '\000', 'R', '\n', 'e', 'x', 'a', 'c', 't', 'M', 'a', 't', 'c', 'h', '\022', 'O', -'\n', '\020', 's', 'a', 'f', 'e', '_', 'r', 'e', 'g', 'e', 'x', '_', 'm', 'a', 't', 'c', 'h', '\030', '\013', ' ', '\001', '(', '\013', '2', -'#', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'R', -'e', 'g', 'e', 'x', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'H', '\000', 'R', '\016', 's', 'a', 'f', 'e', 'R', 'e', 'g', 'e', 'x', 'M', -'a', 't', 'c', 'h', '\022', '<', '\n', '\013', 'r', 'a', 'n', 'g', 'e', '_', 'm', 'a', 't', 'c', 'h', '\030', '\006', ' ', '\001', '(', '\013', -'2', '\031', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'I', 'n', 't', '6', '4', 'R', 'a', 'n', -'g', 'e', 'H', '\000', 'R', '\n', 'r', 'a', 'n', 'g', 'e', 'M', 'a', 't', 'c', 'h', '\022', '%', '\n', '\r', 'p', 'r', 'e', 's', 'e', -'n', 't', '_', 'm', 'a', 't', 'c', 'h', '\030', '\007', ' ', '\001', '(', '\010', 'H', '\000', 'R', '\014', 'p', 'r', 'e', 's', 'e', 'n', 't', -'M', 'a', 't', 'c', 'h', '\022', ',', '\n', '\014', 'p', 'r', 'e', 'f', 'i', 'x', '_', 'm', 'a', 't', 'c', 'h', '\030', '\t', ' ', '\001', -'(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'H', '\000', 'R', '\013', 'p', 'r', 'e', 'f', 'i', 'x', 'M', 'a', 't', 'c', -'h', '\022', ',', '\n', '\014', 's', 'u', 'f', 'f', 'i', 'x', '_', 'm', 'a', 't', 'c', 'h', '\030', '\n', ' ', '\001', '(', '\t', 'B', '\007', -'\372', 'B', '\004', 'r', '\002', '\020', '\001', 'H', '\000', 'R', '\013', 's', 'u', 'f', 'f', 'i', 'x', 'M', 'a', 't', 'c', 'h', '\022', '0', '\n', -'\016', 'c', 'o', 'n', 't', 'a', 'i', 'n', 's', '_', 'm', 'a', 't', 'c', 'h', '\030', '\014', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', -'\004', 'r', '\002', '\020', '\001', 'H', '\000', 'R', '\r', 'c', 'o', 'n', 't', 'a', 'i', 'n', 's', 'M', 'a', 't', 'c', 'h', '\022', '!', '\n', -'\014', 'i', 'n', 'v', 'e', 'r', 't', '_', 'm', 'a', 't', 'c', 'h', '\030', '\010', ' ', '\001', '(', '\010', 'R', '\013', 'i', 'n', 'v', 'e', -'r', 't', 'M', 'a', 't', 'c', 'h', ':', '\'', '\232', '\305', '\210', '\036', '\"', '\n', ' ', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', -'.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '\030', -'\n', '\026', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'm', 'a', 't', 'c', 'h', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'J', -'\004', '\010', '\002', '\020', '\003', 'J', '\004', '\010', '\003', '\020', '\004', 'J', '\004', '\010', '\005', '\020', '\006', 'R', '\013', 'r', 'e', 'g', 'e', 'x', '_', -'m', 'a', 't', 'c', 'h', '\"', '\241', '\002', '\n', '\025', 'Q', 'u', 'e', 'r', 'y', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 'M', -'a', 't', 'c', 'h', 'e', 'r', '\022', '\036', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\n', '\372', 'B', '\007', -'r', '\005', '\020', '\001', '(', '\200', '\010', 'R', '\004', 'n', 'a', 'm', 'e', '\022', 'S', '\n', '\014', 's', 't', 'r', 'i', 'n', 'g', '_', 'm', -'a', 't', 'c', 'h', '\030', '\005', ' ', '\001', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', -'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'S', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '\010', -'\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'H', '\000', 'R', '\013', 's', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', '\022', '%', -'\n', '\r', 'p', 'r', 'e', 's', 'e', 'n', 't', '_', 'm', 'a', 't', 'c', 'h', '\030', '\006', ' ', '\001', '(', '\010', 'H', '\000', 'R', '\014', -'p', 'r', 'e', 's', 'e', 'n', 't', 'M', 'a', 't', 'c', 'h', ':', '/', '\232', '\305', '\210', '\036', '*', '\n', '(', 'e', 'n', 'v', 'o', -'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'Q', 'u', 'e', 'r', 'y', 'P', 'a', 'r', 'a', 'm', -'e', 't', 'e', 'r', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '!', '\n', '\037', 'q', 'u', 'e', 'r', 'y', '_', 'p', 'a', 'r', 'a', -'m', 'e', 't', 'e', 'r', '_', 'm', 'a', 't', 'c', 'h', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'J', '\004', '\010', '\003', -'\020', '\004', 'J', '\004', '\010', '\004', '\020', '\005', 'R', '\005', 'v', 'a', 'l', 'u', 'e', 'R', '\005', 'r', 'e', 'g', 'e', 'x', '\"', '\271', '\002', -'\n', '\026', 'I', 'n', 't', 'e', 'r', 'n', 'a', 'l', 'R', 'e', 'd', 'i', 'r', 'e', 'c', 't', 'P', 'o', 'l', 'i', 'c', 'y', '\022', -'R', '\n', '\026', 'm', 'a', 'x', '_', 'i', 'n', 't', 'e', 'r', 'n', 'a', 'l', '_', 'r', 'e', 'd', 'i', 'r', 'e', 'c', 't', 's', -'\030', '\001', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', -'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\024', 'm', 'a', 'x', 'I', 'n', 't', 'e', 'r', 'n', 'a', 'l', 'R', -'e', 'd', 'i', 'r', 'e', 'c', 't', 's', '\022', '@', '\n', '\027', 'r', 'e', 'd', 'i', 'r', 'e', 'c', 't', '_', 'r', 'e', 's', 'p', -'o', 'n', 's', 'e', '_', 'c', 'o', 'd', 'e', 's', '\030', '\002', ' ', '\003', '(', '\r', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\020', -'\005', 'R', '\025', 'r', 'e', 'd', 'i', 'r', 'e', 'c', 't', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'C', 'o', 'd', 'e', 's', '\022', -'J', '\n', '\n', 'p', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 's', '\030', '\003', ' ', '\003', '(', '\013', '2', '*', '.', 'e', 'n', 'v', -'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', -'t', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\n', 'p', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 's', -'\022', '=', '\n', '\033', 'a', 'l', 'l', 'o', 'w', '_', 'c', 'r', 'o', 's', 's', '_', 's', 'c', 'h', 'e', 'm', 'e', '_', 'r', 'e', -'d', 'i', 'r', 'e', 'c', 't', '\030', '\004', ' ', '\001', '(', '\010', 'R', '\030', 'a', 'l', 'l', 'o', 'w', 'C', 'r', 'o', 's', 's', 'S', -'c', 'h', 'e', 'm', 'e', 'R', 'e', 'd', 'i', 'r', 'e', 'c', 't', 'B', 'E', '\n', '#', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', -'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', -'v', '3', 'B', '\024', 'R', 'o', 'u', 't', 'e', 'C', 'o', 'm', 'p', 'o', 'n', 'e', 'n', 't', 's', 'P', 'r', 'o', 't', 'o', 'P', -'\001', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +'\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\013', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', 'K', 'e', 'y', 'B', '\031', '\n', +'\022', 'o', 'v', 'e', 'r', 'r', 'i', 'd', 'e', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', '\001', ':', +'#', '\232', '\305', '\210', '\036', '\036', '\n', '\034', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', +'e', '.', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '\"', '\236', '\004', '\n', '\r', 'H', 'e', 'a', 'd', 'e', 'r', 'M', 'a', 't', +'c', 'h', 'e', 'r', '\022', '!', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\r', '\372', 'B', '\n', 'r', '\010', +'\020', '\001', '\300', '\001', '\001', '\310', '\001', '\000', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '!', '\n', '\013', 'e', 'x', 'a', 'c', 't', '_', 'm', +'a', 't', 'c', 'h', '\030', '\004', ' ', '\001', '(', '\t', 'H', '\000', 'R', '\n', 'e', 'x', 'a', 'c', 't', 'M', 'a', 't', 'c', 'h', '\022', +'O', '\n', '\020', 's', 'a', 'f', 'e', '_', 'r', 'e', 'g', 'e', 'x', '_', 'm', 'a', 't', 'c', 'h', '\030', '\013', ' ', '\001', '(', '\013', +'2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', +'R', 'e', 'g', 'e', 'x', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'H', '\000', 'R', '\016', 's', 'a', 'f', 'e', 'R', 'e', 'g', 'e', 'x', +'M', 'a', 't', 'c', 'h', '\022', '<', '\n', '\013', 'r', 'a', 'n', 'g', 'e', '_', 'm', 'a', 't', 'c', 'h', '\030', '\006', ' ', '\001', '(', +'\013', '2', '\031', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'I', 'n', 't', '6', '4', 'R', 'a', +'n', 'g', 'e', 'H', '\000', 'R', '\n', 'r', 'a', 'n', 'g', 'e', 'M', 'a', 't', 'c', 'h', '\022', '%', '\n', '\r', 'p', 'r', 'e', 's', +'e', 'n', 't', '_', 'm', 'a', 't', 'c', 'h', '\030', '\007', ' ', '\001', '(', '\010', 'H', '\000', 'R', '\014', 'p', 'r', 'e', 's', 'e', 'n', +'t', 'M', 'a', 't', 'c', 'h', '\022', ',', '\n', '\014', 'p', 'r', 'e', 'f', 'i', 'x', '_', 'm', 'a', 't', 'c', 'h', '\030', '\t', ' ', +'\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'H', '\000', 'R', '\013', 'p', 'r', 'e', 'f', 'i', 'x', 'M', 'a', 't', +'c', 'h', '\022', ',', '\n', '\014', 's', 'u', 'f', 'f', 'i', 'x', '_', 'm', 'a', 't', 'c', 'h', '\030', '\n', ' ', '\001', '(', '\t', 'B', +'\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'H', '\000', 'R', '\013', 's', 'u', 'f', 'f', 'i', 'x', 'M', 'a', 't', 'c', 'h', '\022', '0', +'\n', '\016', 'c', 'o', 'n', 't', 'a', 'i', 'n', 's', '_', 'm', 'a', 't', 'c', 'h', '\030', '\014', ' ', '\001', '(', '\t', 'B', '\007', '\372', +'B', '\004', 'r', '\002', '\020', '\001', 'H', '\000', 'R', '\r', 'c', 'o', 'n', 't', 'a', 'i', 'n', 's', 'M', 'a', 't', 'c', 'h', '\022', '!', +'\n', '\014', 'i', 'n', 'v', 'e', 'r', 't', '_', 'm', 'a', 't', 'c', 'h', '\030', '\010', ' ', '\001', '(', '\010', 'R', '\013', 'i', 'n', 'v', +'e', 'r', 't', 'M', 'a', 't', 'c', 'h', ':', '\'', '\232', '\305', '\210', '\036', '\"', '\n', ' ', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', +'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', +'\030', '\n', '\026', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'm', 'a', 't', 'c', 'h', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', +'J', '\004', '\010', '\002', '\020', '\003', 'J', '\004', '\010', '\003', '\020', '\004', 'J', '\004', '\010', '\005', '\020', '\006', 'R', '\013', 'r', 'e', 'g', 'e', 'x', +'_', 'm', 'a', 't', 'c', 'h', '\"', '\241', '\002', '\n', '\025', 'Q', 'u', 'e', 'r', 'y', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', +'M', 'a', 't', 'c', 'h', 'e', 'r', '\022', '\036', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\n', '\372', 'B', +'\007', 'r', '\005', '\020', '\001', '(', '\200', '\010', 'R', '\004', 'n', 'a', 'm', 'e', '\022', 'S', '\n', '\014', 's', 't', 'r', 'i', 'n', 'g', '_', +'m', 'a', 't', 'c', 'h', '\030', '\005', ' ', '\001', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', +'m', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'S', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', +'\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'H', '\000', 'R', '\013', 's', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', '\022', +'%', '\n', '\r', 'p', 'r', 'e', 's', 'e', 'n', 't', '_', 'm', 'a', 't', 'c', 'h', '\030', '\006', ' ', '\001', '(', '\010', 'H', '\000', 'R', +'\014', 'p', 'r', 'e', 's', 'e', 'n', 't', 'M', 'a', 't', 'c', 'h', ':', '/', '\232', '\305', '\210', '\036', '*', '\n', '(', 'e', 'n', 'v', +'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'r', 'o', 'u', 't', 'e', '.', 'Q', 'u', 'e', 'r', 'y', 'P', 'a', 'r', 'a', +'m', 'e', 't', 'e', 'r', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '!', '\n', '\037', 'q', 'u', 'e', 'r', 'y', '_', 'p', 'a', 'r', +'a', 'm', 'e', 't', 'e', 'r', '_', 'm', 'a', 't', 'c', 'h', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'J', '\004', '\010', +'\003', '\020', '\004', 'J', '\004', '\010', '\004', '\020', '\005', 'R', '\005', 'v', 'a', 'l', 'u', 'e', 'R', '\005', 'r', 'e', 'g', 'e', 'x', '\"', '\271', +'\002', '\n', '\026', 'I', 'n', 't', 'e', 'r', 'n', 'a', 'l', 'R', 'e', 'd', 'i', 'r', 'e', 'c', 't', 'P', 'o', 'l', 'i', 'c', 'y', +'\022', 'R', '\n', '\026', 'm', 'a', 'x', '_', 'i', 'n', 't', 'e', 'r', 'n', 'a', 'l', '_', 'r', 'e', 'd', 'i', 'r', 'e', 'c', 't', +'s', '\030', '\001', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', +'.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\024', 'm', 'a', 'x', 'I', 'n', 't', 'e', 'r', 'n', 'a', 'l', +'R', 'e', 'd', 'i', 'r', 'e', 'c', 't', 's', '\022', '@', '\n', '\027', 'r', 'e', 'd', 'i', 'r', 'e', 'c', 't', '_', 'r', 'e', 's', +'p', 'o', 'n', 's', 'e', '_', 'c', 'o', 'd', 'e', 's', '\030', '\002', ' ', '\003', '(', '\r', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', +'\020', '\005', 'R', '\025', 'r', 'e', 'd', 'i', 'r', 'e', 'c', 't', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'C', 'o', 'd', 'e', 's', +'\022', 'J', '\n', '\n', 'p', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', 's', '\030', '\003', ' ', '\003', '(', '\013', '2', '*', '.', 'e', 'n', +'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', 'E', +'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\n', 'p', 'r', 'e', 'd', 'i', 'c', 'a', 't', 'e', +'s', '\022', '=', '\n', '\033', 'a', 'l', 'l', 'o', 'w', '_', 'c', 'r', 'o', 's', 's', '_', 's', 'c', 'h', 'e', 'm', 'e', '_', 'r', +'e', 'd', 'i', 'r', 'e', 'c', 't', '\030', '\004', ' ', '\001', '(', '\010', 'R', '\030', 'a', 'l', 'l', 'o', 'w', 'C', 'r', 'o', 's', 's', +'S', 'c', 'h', 'e', 'm', 'e', 'R', 'e', 'd', 'i', 'r', 'e', 'c', 't', '\"', ']', '\n', '\014', 'F', 'i', 'l', 't', 'e', 'r', 'C', +'o', 'n', 'f', 'i', 'g', '\022', ',', '\n', '\006', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\001', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', +'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'R', '\006', 'c', 'o', 'n', 'f', 'i', +'g', '\022', '\037', '\n', '\013', 'i', 's', '_', 'o', 'p', 't', 'i', 'o', 'n', 'a', 'l', '\030', '\002', ' ', '\001', '(', '\010', 'R', '\n', 'i', +'s', 'O', 'p', 't', 'i', 'o', 'n', 'a', 'l', 'B', 'E', '\n', '#', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', +'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', 'B', '\024', +'R', 'o', 'u', 't', 'e', 'C', 'o', 'm', 'p', 'o', 'n', 'e', 'n', 't', 's', 'P', 'r', 'o', 't', 'o', 'P', '\001', '\272', '\200', '\310', +'\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; -static upb_def_init *deps[19] = { +static upb_def_init *deps[18] = { &envoy_config_core_v3_base_proto_upbdefinit, &envoy_config_core_v3_extension_proto_upbdefinit, &envoy_config_core_v3_proxy_protocol_proto_upbdefinit, @@ -897,7 +927,6 @@ static upb_def_init *deps[19] = { &envoy_type_v3_range_proto_upbdefinit, &google_protobuf_any_proto_upbdefinit, &google_protobuf_duration_proto_upbdefinit, - &google_protobuf_struct_proto_upbdefinit, &google_protobuf_wrappers_proto_upbdefinit, &envoy_annotations_deprecation_proto_upbdefinit, &udpa_annotations_migrate_proto_upbdefinit, @@ -911,5 +940,5 @@ upb_def_init envoy_config_route_v3_route_components_proto_upbdefinit = { deps, layouts, "envoy/config/route/v3/route_components.proto", - UPB_STRVIEW_INIT(descriptor, 18792) + UPB_STRVIEW_INIT(descriptor, 19463) }; diff --git a/grpc/src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.h b/grpc/src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.h index e4c85f2d..a3cce451 100644 --- a/grpc/src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.h +++ b/grpc/src/core/ext/upbdefs-generated/envoy/config/route/v3/route_components.upbdefs.h @@ -246,6 +246,11 @@ UPB_INLINE const upb_msgdef *envoy_config_route_v3_RateLimit_Action_DynamicMetaD return upb_symtab_lookupmsg(s, "envoy.config.route.v3.RateLimit.Action.DynamicMetaData"); } +UPB_INLINE const upb_msgdef *envoy_config_route_v3_RateLimit_Action_MetaData_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_config_route_v3_route_components_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.config.route.v3.RateLimit.Action.MetaData"); +} + UPB_INLINE const upb_msgdef *envoy_config_route_v3_RateLimit_Override_getmsgdef(upb_symtab *s) { _upb_symtab_loaddefinit(s, &envoy_config_route_v3_route_components_proto_upbdefinit); return upb_symtab_lookupmsg(s, "envoy.config.route.v3.RateLimit.Override"); @@ -271,6 +276,11 @@ UPB_INLINE const upb_msgdef *envoy_config_route_v3_InternalRedirectPolicy_getmsg return upb_symtab_lookupmsg(s, "envoy.config.route.v3.InternalRedirectPolicy"); } +UPB_INLINE const upb_msgdef *envoy_config_route_v3_FilterConfig_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_config_route_v3_route_components_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.config.route.v3.FilterConfig"); +} + #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/grpc/src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.c b/grpc/src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.c index f1b2bc45..3817a572 100644 --- a/grpc/src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.c +++ b/grpc/src/core/ext/upbdefs-generated/envoy/config/trace/v3/http_tracer.upbdefs.c @@ -10,7 +10,6 @@ #include "envoy/config/trace/v3/http_tracer.upbdefs.h" extern upb_def_init google_protobuf_any_proto_upbdefinit; -extern upb_def_init google_protobuf_struct_proto_upbdefinit; extern upb_def_init udpa_annotations_status_proto_upbdefinit; extern upb_def_init udpa_annotations_versioning_proto_upbdefinit; extern upb_def_init validate_validate_proto_upbdefinit; @@ -22,34 +21,32 @@ static const upb_msglayout *layouts[2] = { &envoy_config_trace_v3_Tracing_Http_msginit, }; -static const char descriptor[562] = {'\n', '\'', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 't', 'r', 'a', 'c', 'e', '/', 'v', '3', '/', 'h', +static const char descriptor[532] = {'\n', '\'', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 't', 'r', 'a', 'c', 'e', '/', 'v', '3', '/', 'h', 't', 't', 'p', '_', 't', 'r', 'a', 'c', 'e', 'r', '.', 'p', 'r', 'o', 't', 'o', '\022', '\025', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'r', 'a', 'c', 'e', '.', 'v', '3', '\032', '\031', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', -'o', 't', 'o', 'b', 'u', 'f', '/', 'a', 'n', 'y', '.', 'p', 'r', 'o', 't', 'o', '\032', '\034', 'g', 'o', 'o', 'g', 'l', 'e', '/', -'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 's', 't', 'r', 'u', 'c', 't', '.', 'p', 'r', 'o', 't', 'o', '\032', '\035', 'u', 'd', -'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', -'t', 'o', '\032', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', -'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', -'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '\221', '\002', '\n', '\007', 'T', 'r', 'a', 'c', 'i', 'n', 'g', '\022', -'7', '\n', '\004', 'h', 't', 't', 'p', '\030', '\001', ' ', '\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', -'f', 'i', 'g', '.', 't', 'r', 'a', 'c', 'e', '.', 'v', '3', '.', 'T', 'r', 'a', 'c', 'i', 'n', 'g', '.', 'H', 't', 't', 'p', -'R', '\004', 'h', 't', 't', 'p', '\032', '\246', '\001', '\n', '\004', 'H', 't', 't', 'p', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', -' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '9', '\n', '\014', 't', 'y', -'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\003', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', -'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'H', '\000', 'R', '\013', 't', 'y', 'p', 'e', 'd', 'C', 'o', 'n', -'f', 'i', 'g', ':', ')', '\232', '\305', '\210', '\036', '$', '\n', '\"', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', -'t', 'r', 'a', 'c', 'e', '.', 'v', '2', '.', 'T', 'r', 'a', 'c', 'i', 'n', 'g', '.', 'H', 't', 't', 'p', 'B', '\r', '\n', '\013', -'c', 'o', 'n', 'f', 'i', 'g', '_', 't', 'y', 'p', 'e', 'J', '\004', '\010', '\002', '\020', '\003', 'R', '\006', 'c', 'o', 'n', 'f', 'i', 'g', -':', '$', '\232', '\305', '\210', '\036', '\037', '\n', '\035', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'r', 'a', -'c', 'e', '.', 'v', '2', '.', 'T', 'r', 'a', 'c', 'i', 'n', 'g', 'B', '@', '\n', '#', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', -'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'r', 'a', 'c', 'e', '.', -'v', '3', 'B', '\017', 'H', 't', 't', 'p', 'T', 'r', 'a', 'c', 'e', 'r', 'P', 'r', 'o', 't', 'o', 'P', '\001', '\272', '\200', '\310', '\321', -'\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +'o', 't', 'o', 'b', 'u', 'f', '/', 'a', 'n', 'y', '.', 'p', 'r', 'o', 't', 'o', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', +'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '!', 'u', +'d', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', +'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', +'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '\221', '\002', '\n', '\007', 'T', 'r', 'a', 'c', 'i', 'n', 'g', '\022', '7', '\n', '\004', 'h', 't', +'t', 'p', '\030', '\001', ' ', '\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', +'r', 'a', 'c', 'e', '.', 'v', '3', '.', 'T', 'r', 'a', 'c', 'i', 'n', 'g', '.', 'H', 't', 't', 'p', 'R', '\004', 'h', 't', 't', +'p', '\032', '\246', '\001', '\n', '\004', 'H', 't', 't', 'p', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', +'\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '9', '\n', '\014', 't', 'y', 'p', 'e', 'd', '_', 'c', +'o', 'n', 'f', 'i', 'g', '\030', '\003', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', +'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'H', '\000', 'R', '\013', 't', 'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', ':', ')', +'\232', '\305', '\210', '\036', '$', '\n', '\"', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'r', 'a', 'c', 'e', +'.', 'v', '2', '.', 'T', 'r', 'a', 'c', 'i', 'n', 'g', '.', 'H', 't', 't', 'p', 'B', '\r', '\n', '\013', 'c', 'o', 'n', 'f', 'i', +'g', '_', 't', 'y', 'p', 'e', 'J', '\004', '\010', '\002', '\020', '\003', 'R', '\006', 'c', 'o', 'n', 'f', 'i', 'g', ':', '$', '\232', '\305', '\210', +'\036', '\037', '\n', '\035', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'r', 'a', 'c', 'e', '.', 'v', '2', +'.', 'T', 'r', 'a', 'c', 'i', 'n', 'g', 'B', '@', '\n', '#', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', +'.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'r', 'a', 'c', 'e', '.', 'v', '3', 'B', '\017', 'H', +'t', 't', 'p', 'T', 'r', 'a', 'c', 'e', 'r', 'P', 'r', 'o', 't', 'o', 'P', '\001', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', +'\006', 'p', 'r', 'o', 't', 'o', '3', }; -static upb_def_init *deps[6] = { +static upb_def_init *deps[5] = { &google_protobuf_any_proto_upbdefinit, - &google_protobuf_struct_proto_upbdefinit, &udpa_annotations_status_proto_upbdefinit, &udpa_annotations_versioning_proto_upbdefinit, &validate_validate_proto_upbdefinit, @@ -60,5 +57,5 @@ upb_def_init envoy_config_trace_v3_http_tracer_proto_upbdefinit = { deps, layouts, "envoy/config/trace/v3/http_tracer.proto", - UPB_STRVIEW_INIT(descriptor, 562) + UPB_STRVIEW_INIT(descriptor, 532) }; diff --git a/grpc/src/core/ext/upbdefs-generated/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.c b/grpc/src/core/ext/upbdefs-generated/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.c new file mode 100644 index 00000000..d159a992 --- /dev/null +++ b/grpc/src/core/ext/upbdefs-generated/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.c @@ -0,0 +1,51 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * envoy/extensions/clusters/aggregate/v3/cluster.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#include "upb/def.h" +#include "envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h" + +extern upb_def_init udpa_annotations_status_proto_upbdefinit; +extern upb_def_init udpa_annotations_versioning_proto_upbdefinit; +extern upb_def_init validate_validate_proto_upbdefinit; +extern const upb_msglayout envoy_extensions_clusters_aggregate_v3_ClusterConfig_msginit; + +static const upb_msglayout *layouts[1] = { + &envoy_extensions_clusters_aggregate_v3_ClusterConfig_msginit, +}; + +static const char descriptor[389] = {'\n', '4', 'e', 'n', 'v', 'o', 'y', '/', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '/', 'c', 'l', 'u', 's', 't', 'e', +'r', 's', '/', 'a', 'g', 'g', 'r', 'e', 'g', 'a', 't', 'e', '/', 'v', '3', '/', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'p', +'r', 'o', 't', 'o', '\022', '&', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'c', 'l', +'u', 's', 't', 'e', 'r', 's', '.', 'a', 'g', 'g', 'r', 'e', 'g', 'a', 't', 'e', '.', 'v', '3', '\032', '\035', 'u', 'd', 'p', 'a', +'/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', +'\032', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', +'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', +'d', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', 'r', '\n', '\r', 'C', 'l', 'u', 's', 't', 'e', 'r', 'C', 'o', 'n', 'f', +'i', 'g', '\022', '$', '\n', '\010', 'c', 'l', 'u', 's', 't', 'e', 'r', 's', '\030', '\001', ' ', '\003', '(', '\t', 'B', '\010', '\372', 'B', '\005', +'\222', '\001', '\002', '\010', '\001', 'R', '\010', 'c', 'l', 'u', 's', 't', 'e', 'r', 's', ':', ';', '\232', '\305', '\210', '\036', '6', '\n', '4', 'e', +'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', '.', 'a', 'g', 'g', 'r', 'e', +'g', 'a', 't', 'e', '.', 'v', '2', 'a', 'l', 'p', 'h', 'a', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', 'C', 'o', 'n', 'f', 'i', +'g', 'B', 'N', '\n', '4', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', +'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'c', 'l', 'u', 's', 't', 'e', 'r', 's', '.', 'a', 'g', 'g', 'r', 'e', +'g', 'a', 't', 'e', '.', 'v', '3', 'B', '\014', 'C', 'l', 'u', 's', 't', 'e', 'r', 'P', 'r', 'o', 't', 'o', 'P', '\001', '\272', '\200', +'\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +}; + +static upb_def_init *deps[4] = { + &udpa_annotations_status_proto_upbdefinit, + &udpa_annotations_versioning_proto_upbdefinit, + &validate_validate_proto_upbdefinit, + NULL +}; + +upb_def_init envoy_extensions_clusters_aggregate_v3_cluster_proto_upbdefinit = { + deps, + layouts, + "envoy/extensions/clusters/aggregate/v3/cluster.proto", + UPB_STRVIEW_INIT(descriptor, 389) +}; diff --git a/grpc/src/core/ext/upbdefs-generated/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h b/grpc/src/core/ext/upbdefs-generated/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h new file mode 100644 index 00000000..fd6d1b87 --- /dev/null +++ b/grpc/src/core/ext/upbdefs-generated/envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h @@ -0,0 +1,35 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * envoy/extensions/clusters/aggregate/v3/cluster.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#ifndef ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPBDEFS_H_ +#define ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPBDEFS_H_ + +#include "upb/def.h" +#include "upb/port_def.inc" +#ifdef __cplusplus +extern "C" { +#endif + +#include "upb/def.h" + +#include "upb/port_def.inc" + +extern upb_def_init envoy_extensions_clusters_aggregate_v3_cluster_proto_upbdefinit; + +UPB_INLINE const upb_msgdef *envoy_extensions_clusters_aggregate_v3_ClusterConfig_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_extensions_clusters_aggregate_v3_cluster_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.extensions.clusters.aggregate.v3.ClusterConfig"); +} + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#include "upb/port_undef.inc" + +#endif /* ENVOY_EXTENSIONS_CLUSTERS_AGGREGATE_V3_CLUSTER_PROTO_UPBDEFS_H_ */ diff --git a/grpc/src/core/ext/upbdefs-generated/envoy/extensions/filters/common/fault/v3/fault.upbdefs.c b/grpc/src/core/ext/upbdefs-generated/envoy/extensions/filters/common/fault/v3/fault.upbdefs.c new file mode 100644 index 00000000..1ee8a911 --- /dev/null +++ b/grpc/src/core/ext/upbdefs-generated/envoy/extensions/filters/common/fault/v3/fault.upbdefs.c @@ -0,0 +1,102 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * envoy/extensions/filters/common/fault/v3/fault.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#include "upb/def.h" +#include "envoy/extensions/filters/common/fault/v3/fault.upbdefs.h" + +extern upb_def_init envoy_type_v3_percent_proto_upbdefinit; +extern upb_def_init google_protobuf_duration_proto_upbdefinit; +extern upb_def_init udpa_annotations_status_proto_upbdefinit; +extern upb_def_init udpa_annotations_versioning_proto_upbdefinit; +extern upb_def_init validate_validate_proto_upbdefinit; +extern const upb_msglayout envoy_extensions_filters_common_fault_v3_FaultDelay_msginit; +extern const upb_msglayout envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay_msginit; +extern const upb_msglayout envoy_extensions_filters_common_fault_v3_FaultRateLimit_msginit; +extern const upb_msglayout envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_msginit; +extern const upb_msglayout envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit_msginit; + +static const upb_msglayout *layouts[5] = { + &envoy_extensions_filters_common_fault_v3_FaultDelay_msginit, + &envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay_msginit, + &envoy_extensions_filters_common_fault_v3_FaultRateLimit_msginit, + &envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_msginit, + &envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit_msginit, +}; + +static const char descriptor[1354] = {'\n', '4', 'e', 'n', 'v', 'o', 'y', '/', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '/', 'f', 'i', 'l', 't', 'e', 'r', +'s', '/', 'c', 'o', 'm', 'm', 'o', 'n', '/', 'f', 'a', 'u', 'l', 't', '/', 'v', '3', '/', 'f', 'a', 'u', 'l', 't', '.', 'p', +'r', 'o', 't', 'o', '\022', '(', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', +'l', 't', 'e', 'r', 's', '.', 'c', 'o', 'm', 'm', 'o', 'n', '.', 'f', 'a', 'u', 'l', 't', '.', 'v', '3', '\032', '\033', 'e', 'n', +'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'v', '3', '/', 'p', 'e', 'r', 'c', 'e', 'n', 't', '.', 'p', 'r', 'o', 't', 'o', +'\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'u', 'r', 'a', 't', 'i', 'o', +'n', '.', 'p', 'r', 'o', 't', 'o', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', +'/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', +'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', +'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '\304', +'\003', '\n', '\n', 'F', 'a', 'u', 'l', 't', 'D', 'e', 'l', 'a', 'y', '\022', 'F', '\n', '\013', 'f', 'i', 'x', 'e', 'd', '_', 'd', 'e', +'l', 'a', 'y', '\030', '\003', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', +'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\252', '\001', '\002', '*', '\000', 'H', '\000', 'R', '\n', +'f', 'i', 'x', 'e', 'd', 'D', 'e', 'l', 'a', 'y', '\022', 'e', '\n', '\014', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'd', 'e', 'l', 'a', +'y', '\030', '\005', ' ', '\001', '(', '\013', '2', '@', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', +'s', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'c', 'o', 'm', 'm', 'o', 'n', '.', 'f', 'a', 'u', 'l', 't', '.', 'v', '3', +'.', 'F', 'a', 'u', 'l', 't', 'D', 'e', 'l', 'a', 'y', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'D', 'e', 'l', 'a', 'y', 'H', '\000', +'R', '\013', 'h', 'e', 'a', 'd', 'e', 'r', 'D', 'e', 'l', 'a', 'y', '\022', '@', '\n', '\n', 'p', 'e', 'r', 'c', 'e', 'n', 't', 'a', +'g', 'e', '\030', '\004', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', +'F', 'r', 'a', 'c', 't', 'i', 'o', 'n', 'a', 'l', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', '\n', 'p', 'e', 'r', 'c', 'e', 'n', +'t', 'a', 'g', 'e', '\032', 'I', '\n', '\013', 'H', 'e', 'a', 'd', 'e', 'r', 'D', 'e', 'l', 'a', 'y', ':', ':', '\232', '\305', '\210', '\036', +'5', '\n', '3', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'f', 'a', +'u', 'l', 't', '.', 'v', '2', '.', 'F', 'a', 'u', 'l', 't', 'D', 'e', 'l', 'a', 'y', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'D', +'e', 'l', 'a', 'y', '\"', '\033', '\n', '\016', 'F', 'a', 'u', 'l', 't', 'D', 'e', 'l', 'a', 'y', 'T', 'y', 'p', 'e', '\022', '\t', '\n', +'\005', 'F', 'I', 'X', 'E', 'D', '\020', '\000', ':', '.', '\232', '\305', '\210', '\036', ')', '\n', '\'', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', +'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'f', 'a', 'u', 'l', 't', '.', 'v', '2', '.', 'F', 'a', 'u', 'l', +'t', 'D', 'e', 'l', 'a', 'y', 'B', '\033', '\n', '\024', 'f', 'a', 'u', 'l', 't', '_', 'd', 'e', 'l', 'a', 'y', '_', 's', 'e', 'c', +'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', '\001', 'J', '\004', '\010', '\002', '\020', '\003', 'J', '\004', '\010', '\001', '\020', '\002', 'R', '\004', 't', +'y', 'p', 'e', '\"', '\260', '\004', '\n', '\016', 'F', 'a', 'u', 'l', 't', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '\022', 'f', '\n', +'\013', 'f', 'i', 'x', 'e', 'd', '_', 'l', 'i', 'm', 'i', 't', '\030', '\001', ' ', '\001', '(', '\013', '2', 'C', '.', 'e', 'n', 'v', 'o', +'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'c', 'o', 'm', 'm', +'o', 'n', '.', 'f', 'a', 'u', 'l', 't', '.', 'v', '3', '.', 'F', 'a', 'u', 'l', 't', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', +'t', '.', 'F', 'i', 'x', 'e', 'd', 'L', 'i', 'm', 'i', 't', 'H', '\000', 'R', '\n', 'f', 'i', 'x', 'e', 'd', 'L', 'i', 'm', 'i', +'t', '\022', 'i', '\n', '\014', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'l', 'i', 'm', 'i', 't', '\030', '\003', ' ', '\001', '(', '\013', '2', 'D', +'.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', +'.', 'c', 'o', 'm', 'm', 'o', 'n', '.', 'f', 'a', 'u', 'l', 't', '.', 'v', '3', '.', 'F', 'a', 'u', 'l', 't', 'R', 'a', 't', +'e', 'L', 'i', 'm', 'i', 't', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'L', 'i', 'm', 'i', 't', 'H', '\000', 'R', '\013', 'h', 'e', 'a', +'d', 'e', 'r', 'L', 'i', 'm', 'i', 't', '\022', '@', '\n', '\n', 'p', 'e', 'r', 'c', 'e', 'n', 't', 'a', 'g', 'e', '\030', '\002', ' ', +'\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'F', 'r', 'a', 'c', 't', +'i', 'o', 'n', 'a', 'l', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', '\n', 'p', 'e', 'r', 'c', 'e', 'n', 't', 'a', 'g', 'e', '\032', +'s', '\n', '\n', 'F', 'i', 'x', 'e', 'd', 'L', 'i', 'm', 'i', 't', '\022', '&', '\n', '\n', 'l', 'i', 'm', 'i', 't', '_', 'k', 'b', +'p', 's', '\030', '\001', ' ', '\001', '(', '\004', 'B', '\007', '\372', 'B', '\004', '2', '\002', '(', '\001', 'R', '\t', 'l', 'i', 'm', 'i', 't', 'K', +'b', 'p', 's', ':', '=', '\232', '\305', '\210', '\036', '8', '\n', '6', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', +'f', 'i', 'l', 't', 'e', 'r', '.', 'f', 'a', 'u', 'l', 't', '.', 'v', '2', '.', 'F', 'a', 'u', 'l', 't', 'R', 'a', 't', 'e', +'L', 'i', 'm', 'i', 't', '.', 'F', 'i', 'x', 'e', 'd', 'L', 'i', 'm', 'i', 't', '\032', 'M', '\n', '\013', 'H', 'e', 'a', 'd', 'e', +'r', 'L', 'i', 'm', 'i', 't', ':', '>', '\232', '\305', '\210', '\036', '9', '\n', '7', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', +'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'f', 'a', 'u', 'l', 't', '.', 'v', '2', '.', 'F', 'a', 'u', 'l', 't', 'R', +'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'L', 'i', 'm', 'i', 't', ':', '2', '\232', '\305', '\210', +'\036', '-', '\n', '+', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'f', +'a', 'u', 'l', 't', '.', 'v', '2', '.', 'F', 'a', 'u', 'l', 't', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', 'B', '\021', '\n', +'\n', 'l', 'i', 'm', 'i', 't', '_', 't', 'y', 'p', 'e', '\022', '\003', '\370', 'B', '\001', 'B', 'N', '\n', '6', 'i', 'o', '.', 'e', 'n', +'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', +'.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'c', 'o', 'm', 'm', 'o', 'n', '.', 'f', 'a', 'u', 'l', 't', '.', 'v', '3', 'B', +'\n', 'F', 'a', 'u', 'l', 't', 'P', 'r', 'o', 't', 'o', 'P', '\001', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', +'o', 't', 'o', '3', +}; + +static upb_def_init *deps[6] = { + &envoy_type_v3_percent_proto_upbdefinit, + &google_protobuf_duration_proto_upbdefinit, + &udpa_annotations_status_proto_upbdefinit, + &udpa_annotations_versioning_proto_upbdefinit, + &validate_validate_proto_upbdefinit, + NULL +}; + +upb_def_init envoy_extensions_filters_common_fault_v3_fault_proto_upbdefinit = { + deps, + layouts, + "envoy/extensions/filters/common/fault/v3/fault.proto", + UPB_STRVIEW_INIT(descriptor, 1354) +}; diff --git a/grpc/src/core/ext/upbdefs-generated/envoy/extensions/filters/common/fault/v3/fault.upbdefs.h b/grpc/src/core/ext/upbdefs-generated/envoy/extensions/filters/common/fault/v3/fault.upbdefs.h new file mode 100644 index 00000000..f3d64b4f --- /dev/null +++ b/grpc/src/core/ext/upbdefs-generated/envoy/extensions/filters/common/fault/v3/fault.upbdefs.h @@ -0,0 +1,55 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * envoy/extensions/filters/common/fault/v3/fault.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#ifndef ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPBDEFS_H_ +#define ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPBDEFS_H_ + +#include "upb/def.h" +#include "upb/port_def.inc" +#ifdef __cplusplus +extern "C" { +#endif + +#include "upb/def.h" + +#include "upb/port_def.inc" + +extern upb_def_init envoy_extensions_filters_common_fault_v3_fault_proto_upbdefinit; + +UPB_INLINE const upb_msgdef *envoy_extensions_filters_common_fault_v3_FaultDelay_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_extensions_filters_common_fault_v3_fault_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.extensions.filters.common.fault.v3.FaultDelay"); +} + +UPB_INLINE const upb_msgdef *envoy_extensions_filters_common_fault_v3_FaultDelay_HeaderDelay_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_extensions_filters_common_fault_v3_fault_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.extensions.filters.common.fault.v3.FaultDelay.HeaderDelay"); +} + +UPB_INLINE const upb_msgdef *envoy_extensions_filters_common_fault_v3_FaultRateLimit_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_extensions_filters_common_fault_v3_fault_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.extensions.filters.common.fault.v3.FaultRateLimit"); +} + +UPB_INLINE const upb_msgdef *envoy_extensions_filters_common_fault_v3_FaultRateLimit_FixedLimit_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_extensions_filters_common_fault_v3_fault_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.extensions.filters.common.fault.v3.FaultRateLimit.FixedLimit"); +} + +UPB_INLINE const upb_msgdef *envoy_extensions_filters_common_fault_v3_FaultRateLimit_HeaderLimit_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_extensions_filters_common_fault_v3_fault_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.extensions.filters.common.fault.v3.FaultRateLimit.HeaderLimit"); +} + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#include "upb/port_undef.inc" + +#endif /* ENVOY_EXTENSIONS_FILTERS_COMMON_FAULT_V3_FAULT_PROTO_UPBDEFS_H_ */ diff --git a/grpc/src/core/ext/upbdefs-generated/envoy/extensions/filters/http/fault/v3/fault.upbdefs.c b/grpc/src/core/ext/upbdefs-generated/envoy/extensions/filters/http/fault/v3/fault.upbdefs.c new file mode 100644 index 00000000..cd46e935 --- /dev/null +++ b/grpc/src/core/ext/upbdefs-generated/envoy/extensions/filters/http/fault/v3/fault.upbdefs.c @@ -0,0 +1,120 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * envoy/extensions/filters/http/fault/v3/fault.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#include "upb/def.h" +#include "envoy/extensions/filters/http/fault/v3/fault.upbdefs.h" + +extern upb_def_init envoy_config_route_v3_route_components_proto_upbdefinit; +extern upb_def_init envoy_extensions_filters_common_fault_v3_fault_proto_upbdefinit; +extern upb_def_init envoy_type_v3_percent_proto_upbdefinit; +extern upb_def_init google_protobuf_wrappers_proto_upbdefinit; +extern upb_def_init udpa_annotations_status_proto_upbdefinit; +extern upb_def_init udpa_annotations_versioning_proto_upbdefinit; +extern upb_def_init validate_validate_proto_upbdefinit; +extern const upb_msglayout envoy_extensions_filters_http_fault_v3_FaultAbort_msginit; +extern const upb_msglayout envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort_msginit; +extern const upb_msglayout envoy_extensions_filters_http_fault_v3_HTTPFault_msginit; + +static const upb_msglayout *layouts[3] = { + &envoy_extensions_filters_http_fault_v3_FaultAbort_msginit, + &envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort_msginit, + &envoy_extensions_filters_http_fault_v3_HTTPFault_msginit, +}; + +static const char descriptor[1812] = {'\n', '2', 'e', 'n', 'v', 'o', 'y', '/', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '/', 'f', 'i', 'l', 't', 'e', 'r', +'s', '/', 'h', 't', 't', 'p', '/', 'f', 'a', 'u', 'l', 't', '/', 'v', '3', '/', 'f', 'a', 'u', 'l', 't', '.', 'p', 'r', 'o', +'t', 'o', '\022', '&', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', +'e', 'r', 's', '.', 'h', 't', 't', 'p', '.', 'f', 'a', 'u', 'l', 't', '.', 'v', '3', '\032', ',', 'e', 'n', 'v', 'o', 'y', '/', +'c', 'o', 'n', 'f', 'i', 'g', '/', 'r', 'o', 'u', 't', 'e', '/', 'v', '3', '/', 'r', 'o', 'u', 't', 'e', '_', 'c', 'o', 'm', +'p', 'o', 'n', 'e', 'n', 't', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '4', 'e', 'n', 'v', 'o', 'y', '/', 'e', 'x', 't', 'e', +'n', 's', 'i', 'o', 'n', 's', '/', 'f', 'i', 'l', 't', 'e', 'r', 's', '/', 'c', 'o', 'm', 'm', 'o', 'n', '/', 'f', 'a', 'u', +'l', 't', '/', 'v', '3', '/', 'f', 'a', 'u', 'l', 't', '.', 'p', 'r', 'o', 't', 'o', '\032', '\033', 'e', 'n', 'v', 'o', 'y', '/', +'t', 'y', 'p', 'e', '/', 'v', '3', '/', 'p', 'e', 'r', 'c', 'e', 'n', 't', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', +'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'w', 'r', 'a', 'p', 'p', 'e', 'r', 's', '.', 'p', 'r', +'o', 't', 'o', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', +'t', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', +'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', 'l', 'i', +'d', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '\244', '\003', '\n', '\n', 'F', +'a', 'u', 'l', 't', 'A', 'b', 'o', 'r', 't', '\022', '.', '\n', '\013', 'h', 't', 't', 'p', '_', 's', 't', 'a', 't', 'u', 's', '\030', +'\002', ' ', '\001', '(', '\r', 'B', '\013', '\372', 'B', '\010', '*', '\006', '\020', '\330', '\004', '(', '\310', '\001', 'H', '\000', 'R', '\n', 'h', 't', 't', +'p', 'S', 't', 'a', 't', 'u', 's', '\022', '!', '\n', '\013', 'g', 'r', 'p', 'c', '_', 's', 't', 'a', 't', 'u', 's', '\030', '\005', ' ', +'\001', '(', '\r', 'H', '\000', 'R', '\n', 'g', 'r', 'p', 'c', 'S', 't', 'a', 't', 'u', 's', '\022', 'c', '\n', '\014', 'h', 'e', 'a', 'd', +'e', 'r', '_', 'a', 'b', 'o', 'r', 't', '\030', '\004', ' ', '\001', '(', '\013', '2', '>', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', +'t', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'h', 't', 't', 'p', '.', 'f', 'a', 'u', +'l', 't', '.', 'v', '3', '.', 'F', 'a', 'u', 'l', 't', 'A', 'b', 'o', 'r', 't', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'A', 'b', +'o', 'r', 't', 'H', '\000', 'R', '\013', 'h', 'e', 'a', 'd', 'e', 'r', 'A', 'b', 'o', 'r', 't', '\022', '@', '\n', '\n', 'p', 'e', 'r', +'c', 'e', 'n', 't', 'a', 'g', 'e', '\030', '\003', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', +'e', '.', 'v', '3', '.', 'F', 'r', 'a', 'c', 't', 'i', 'o', 'n', 'a', 'l', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', '\n', 'p', +'e', 'r', 'c', 'e', 'n', 't', 'a', 'g', 'e', '\032', 'N', '\n', '\013', 'H', 'e', 'a', 'd', 'e', 'r', 'A', 'b', 'o', 'r', 't', ':', +'?', '\232', '\305', '\210', '\036', ':', '\n', '8', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', +'e', 'r', '.', 'h', 't', 't', 'p', '.', 'f', 'a', 'u', 'l', 't', '.', 'v', '2', '.', 'F', 'a', 'u', 'l', 't', 'A', 'b', 'o', +'r', 't', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'A', 'b', 'o', 'r', 't', ':', '3', '\232', '\305', '\210', '\036', '.', '\n', ',', 'e', 'n', +'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'h', 't', 't', 'p', '.', 'f', 'a', +'u', 'l', 't', '.', 'v', '2', '.', 'F', 'a', 'u', 'l', 't', 'A', 'b', 'o', 'r', 't', 'B', '\021', '\n', '\n', 'e', 'r', 'r', 'o', +'r', '_', 't', 'y', 'p', 'e', '\022', '\003', '\370', 'B', '\001', 'J', '\004', '\010', '\001', '\020', '\002', '\"', '\274', '\007', '\n', '\t', 'H', 'T', 'T', +'P', 'F', 'a', 'u', 'l', 't', '\022', 'J', '\n', '\005', 'd', 'e', 'l', 'a', 'y', '\030', '\001', ' ', '\001', '(', '\013', '2', '4', '.', 'e', +'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'c', +'o', 'm', 'm', 'o', 'n', '.', 'f', 'a', 'u', 'l', 't', '.', 'v', '3', '.', 'F', 'a', 'u', 'l', 't', 'D', 'e', 'l', 'a', 'y', +'R', '\005', 'd', 'e', 'l', 'a', 'y', '\022', 'H', '\n', '\005', 'a', 'b', 'o', 'r', 't', '\030', '\002', ' ', '\001', '(', '\013', '2', '2', '.', +'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', +'h', 't', 't', 'p', '.', 'f', 'a', 'u', 'l', 't', '.', 'v', '3', '.', 'F', 'a', 'u', 'l', 't', 'A', 'b', 'o', 'r', 't', 'R', +'\005', 'a', 'b', 'o', 'r', 't', '\022', ')', '\n', '\020', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'c', 'l', 'u', 's', 't', 'e', +'r', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\017', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', 'C', 'l', 'u', 's', 't', 'e', 'r', '\022', +'>', '\n', '\007', 'h', 'e', 'a', 'd', 'e', 'r', 's', '\030', '\004', ' ', '\003', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', +'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'M', 'a', 't', +'c', 'h', 'e', 'r', 'R', '\007', 'h', 'e', 'a', 'd', 'e', 'r', 's', '\022', ')', '\n', '\020', 'd', 'o', 'w', 'n', 's', 't', 'r', 'e', +'a', 'm', '_', 'n', 'o', 'd', 'e', 's', '\030', '\005', ' ', '\003', '(', '\t', 'R', '\017', 'd', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', +'m', 'N', 'o', 'd', 'e', 's', '\022', 'H', '\n', '\021', 'm', 'a', 'x', '_', 'a', 'c', 't', 'i', 'v', 'e', '_', 'f', 'a', 'u', 'l', +'t', 's', '\030', '\006', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', +'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\017', 'm', 'a', 'x', 'A', 'c', 't', 'i', 'v', 'e', 'F', +'a', 'u', 'l', 't', 's', '\022', 'h', '\n', '\023', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 'r', 'a', 't', 'e', '_', 'l', 'i', +'m', 'i', 't', '\030', '\007', ' ', '\001', '(', '\013', '2', '8', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', +'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'c', 'o', 'm', 'm', 'o', 'n', '.', 'f', 'a', 'u', 'l', 't', '.', +'v', '3', '.', 'F', 'a', 'u', 'l', 't', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', 'R', '\021', 'r', 'e', 's', 'p', 'o', 'n', +'s', 'e', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', 't', '\022', '2', '\n', '\025', 'd', 'e', 'l', 'a', 'y', '_', 'p', 'e', 'r', 'c', +'e', 'n', 't', '_', 'r', 'u', 'n', 't', 'i', 'm', 'e', '\030', '\010', ' ', '\001', '(', '\t', 'R', '\023', 'd', 'e', 'l', 'a', 'y', 'P', +'e', 'r', 'c', 'e', 'n', 't', 'R', 'u', 'n', 't', 'i', 'm', 'e', '\022', '2', '\n', '\025', 'a', 'b', 'o', 'r', 't', '_', 'p', 'e', +'r', 'c', 'e', 'n', 't', '_', 'r', 'u', 'n', 't', 'i', 'm', 'e', '\030', '\t', ' ', '\001', '(', '\t', 'R', '\023', 'a', 'b', 'o', 'r', +'t', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', 'u', 'n', 't', 'i', 'm', 'e', '\022', '4', '\n', '\026', 'd', 'e', 'l', 'a', 'y', '_', +'d', 'u', 'r', 'a', 't', 'i', 'o', 'n', '_', 'r', 'u', 'n', 't', 'i', 'm', 'e', '\030', '\n', ' ', '\001', '(', '\t', 'R', '\024', 'd', +'e', 'l', 'a', 'y', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', 'u', 'n', 't', 'i', 'm', 'e', '\022', '9', '\n', '\031', 'a', 'b', +'o', 'r', 't', '_', 'h', 't', 't', 'p', '_', 's', 't', 'a', 't', 'u', 's', '_', 'r', 'u', 'n', 't', 'i', 'm', 'e', '\030', '\013', +' ', '\001', '(', '\t', 'R', '\026', 'a', 'b', 'o', 'r', 't', 'H', 't', 't', 'p', 'S', 't', 'a', 't', 'u', 's', 'R', 'u', 'n', 't', +'i', 'm', 'e', '\022', '9', '\n', '\031', 'm', 'a', 'x', '_', 'a', 'c', 't', 'i', 'v', 'e', '_', 'f', 'a', 'u', 'l', 't', 's', '_', +'r', 'u', 'n', 't', 'i', 'm', 'e', '\030', '\014', ' ', '\001', '(', '\t', 'R', '\026', 'm', 'a', 'x', 'A', 'c', 't', 'i', 'v', 'e', 'F', +'a', 'u', 'l', 't', 's', 'R', 'u', 'n', 't', 'i', 'm', 'e', '\022', 'L', '\n', '#', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', +'r', 'a', 't', 'e', '_', 'l', 'i', 'm', 'i', 't', '_', 'p', 'e', 'r', 'c', 'e', 'n', 't', '_', 'r', 'u', 'n', 't', 'i', 'm', +'e', '\030', '\r', ' ', '\001', '(', '\t', 'R', '\037', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', 'R', 'a', 't', 'e', 'L', 'i', 'm', 'i', +'t', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', 'u', 'n', 't', 'i', 'm', 'e', '\022', '9', '\n', '\031', 'a', 'b', 'o', 'r', 't', '_', +'g', 'r', 'p', 'c', '_', 's', 't', 'a', 't', 'u', 's', '_', 'r', 'u', 'n', 't', 'i', 'm', 'e', '\030', '\016', ' ', '\001', '(', '\t', +'R', '\026', 'a', 'b', 'o', 'r', 't', 'G', 'r', 'p', 'c', 'S', 't', 'a', 't', 'u', 's', 'R', 'u', 'n', 't', 'i', 'm', 'e', ':', +'2', '\232', '\305', '\210', '\036', '-', '\n', '+', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', +'e', 'r', '.', 'h', 't', 't', 'p', '.', 'f', 'a', 'u', 'l', 't', '.', 'v', '2', '.', 'H', 'T', 'T', 'P', 'F', 'a', 'u', 'l', +'t', 'B', 'L', '\n', '4', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', +'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'h', 't', 't', 'p', '.', 'f', +'a', 'u', 'l', 't', '.', 'v', '3', 'B', '\n', 'F', 'a', 'u', 'l', 't', 'P', 'r', 'o', 't', 'o', 'P', '\001', '\272', '\200', '\310', '\321', +'\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +}; + +static upb_def_init *deps[8] = { + &envoy_config_route_v3_route_components_proto_upbdefinit, + &envoy_extensions_filters_common_fault_v3_fault_proto_upbdefinit, + &envoy_type_v3_percent_proto_upbdefinit, + &google_protobuf_wrappers_proto_upbdefinit, + &udpa_annotations_status_proto_upbdefinit, + &udpa_annotations_versioning_proto_upbdefinit, + &validate_validate_proto_upbdefinit, + NULL +}; + +upb_def_init envoy_extensions_filters_http_fault_v3_fault_proto_upbdefinit = { + deps, + layouts, + "envoy/extensions/filters/http/fault/v3/fault.proto", + UPB_STRVIEW_INIT(descriptor, 1812) +}; diff --git a/grpc/src/core/ext/upbdefs-generated/envoy/extensions/filters/http/fault/v3/fault.upbdefs.h b/grpc/src/core/ext/upbdefs-generated/envoy/extensions/filters/http/fault/v3/fault.upbdefs.h new file mode 100644 index 00000000..0beb986b --- /dev/null +++ b/grpc/src/core/ext/upbdefs-generated/envoy/extensions/filters/http/fault/v3/fault.upbdefs.h @@ -0,0 +1,45 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * envoy/extensions/filters/http/fault/v3/fault.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPBDEFS_H_ +#define ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPBDEFS_H_ + +#include "upb/def.h" +#include "upb/port_def.inc" +#ifdef __cplusplus +extern "C" { +#endif + +#include "upb/def.h" + +#include "upb/port_def.inc" + +extern upb_def_init envoy_extensions_filters_http_fault_v3_fault_proto_upbdefinit; + +UPB_INLINE const upb_msgdef *envoy_extensions_filters_http_fault_v3_FaultAbort_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_extensions_filters_http_fault_v3_fault_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.extensions.filters.http.fault.v3.FaultAbort"); +} + +UPB_INLINE const upb_msgdef *envoy_extensions_filters_http_fault_v3_FaultAbort_HeaderAbort_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_extensions_filters_http_fault_v3_fault_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.extensions.filters.http.fault.v3.FaultAbort.HeaderAbort"); +} + +UPB_INLINE const upb_msgdef *envoy_extensions_filters_http_fault_v3_HTTPFault_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_extensions_filters_http_fault_v3_fault_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.extensions.filters.http.fault.v3.HTTPFault"); +} + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#include "upb/port_undef.inc" + +#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_FAULT_V3_FAULT_PROTO_UPBDEFS_H_ */ diff --git a/grpc/src/core/ext/upbdefs-generated/envoy/extensions/filters/http/router/v3/router.upbdefs.c b/grpc/src/core/ext/upbdefs-generated/envoy/extensions/filters/http/router/v3/router.upbdefs.c new file mode 100644 index 00000000..f1d9a578 --- /dev/null +++ b/grpc/src/core/ext/upbdefs-generated/envoy/extensions/filters/http/router/v3/router.upbdefs.c @@ -0,0 +1,76 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * envoy/extensions/filters/http/router/v3/router.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#include "upb/def.h" +#include "envoy/extensions/filters/http/router/v3/router.upbdefs.h" + +extern upb_def_init envoy_config_accesslog_v3_accesslog_proto_upbdefinit; +extern upb_def_init google_protobuf_wrappers_proto_upbdefinit; +extern upb_def_init udpa_annotations_status_proto_upbdefinit; +extern upb_def_init udpa_annotations_versioning_proto_upbdefinit; +extern upb_def_init validate_validate_proto_upbdefinit; +extern const upb_msglayout envoy_extensions_filters_http_router_v3_Router_msginit; + +static const upb_msglayout *layouts[1] = { + &envoy_extensions_filters_http_router_v3_Router_msginit, +}; + +static const char descriptor[909] = {'\n', '4', 'e', 'n', 'v', 'o', 'y', '/', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '/', 'f', 'i', 'l', 't', 'e', 'r', +'s', '/', 'h', 't', 't', 'p', '/', 'r', 'o', 'u', 't', 'e', 'r', '/', 'v', '3', '/', 'r', 'o', 'u', 't', 'e', 'r', '.', 'p', +'r', 'o', 't', 'o', '\022', '\'', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', +'l', 't', 'e', 'r', 's', '.', 'h', 't', 't', 'p', '.', 'r', 'o', 'u', 't', 'e', 'r', '.', 'v', '3', '\032', ')', 'e', 'n', 'v', +'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '/', 'v', '3', '/', 'a', 'c', +'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', +'t', 'o', 'b', 'u', 'f', '/', 'w', 'r', 'a', 'p', 'p', 'e', 'r', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '\035', 'u', 'd', 'p', +'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', +'o', '\032', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', +'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', +'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '\255', '\004', '\n', '\006', 'R', 'o', 'u', 't', 'e', 'r', '\022', '?', '\n', +'\r', 'd', 'y', 'n', 'a', 'm', 'i', 'c', '_', 's', 't', 'a', 't', 's', '\030', '\001', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', +'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\014', +'d', 'y', 'n', 'a', 'm', 'i', 'c', 'S', 't', 'a', 't', 's', '\022', '(', '\n', '\020', 's', 't', 'a', 'r', 't', '_', 'c', 'h', 'i', +'l', 'd', '_', 's', 'p', 'a', 'n', '\030', '\002', ' ', '\001', '(', '\010', 'R', '\016', 's', 't', 'a', 'r', 't', 'C', 'h', 'i', 'l', 'd', +'S', 'p', 'a', 'n', '\022', 'G', '\n', '\014', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '_', 'l', 'o', 'g', '\030', '\003', ' ', '\003', '(', +'\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', +'g', '.', 'v', '3', '.', 'A', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 'R', '\013', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', 'L', +'o', 'g', '\022', '4', '\n', '\026', 's', 'u', 'p', 'p', 'r', 'e', 's', 's', '_', 'e', 'n', 'v', 'o', 'y', '_', 'h', 'e', 'a', 'd', +'e', 'r', 's', '\030', '\004', ' ', '\001', '(', '\010', 'R', '\024', 's', 'u', 'p', 'p', 'r', 'e', 's', 's', 'E', 'n', 'v', 'o', 'y', 'H', +'e', 'a', 'd', 'e', 'r', 's', '\022', '\307', '\001', '\n', '\024', 's', 't', 'r', 'i', 'c', 't', '_', 'c', 'h', 'e', 'c', 'k', '_', 'h', +'e', 'a', 'd', 'e', 'r', 's', '\030', '\005', ' ', '\003', '(', '\t', 'B', '\224', '\001', '\372', 'B', '\220', '\001', '\222', '\001', '\214', '\001', '\"', '\211', +'\001', 'r', '\206', '\001', 'R', '\036', 'x', '-', 'e', 'n', 'v', 'o', 'y', '-', 'u', 'p', 's', 't', 'r', 'e', 'a', 'm', '-', 'r', 'q', +'-', 't', 'i', 'm', 'e', 'o', 'u', 't', '-', 'm', 's', 'R', '&', 'x', '-', 'e', 'n', 'v', 'o', 'y', '-', 'u', 'p', 's', 't', +'r', 'e', 'a', 'm', '-', 'r', 'q', '-', 'p', 'e', 'r', '-', 't', 'r', 'y', '-', 't', 'i', 'm', 'e', 'o', 'u', 't', '-', 'm', +'s', 'R', '\023', 'x', '-', 'e', 'n', 'v', 'o', 'y', '-', 'm', 'a', 'x', '-', 'r', 'e', 't', 'r', 'i', 'e', 's', 'R', '\025', 'x', +'-', 'e', 'n', 'v', 'o', 'y', '-', 'r', 'e', 't', 'r', 'y', '-', 'g', 'r', 'p', 'c', '-', 'o', 'n', 'R', '\020', 'x', '-', 'e', +'n', 'v', 'o', 'y', '-', 'r', 'e', 't', 'r', 'y', '-', 'o', 'n', 'R', '\022', 's', 't', 'r', 'i', 'c', 't', 'C', 'h', 'e', 'c', +'k', 'H', 'e', 'a', 'd', 'e', 'r', 's', '\022', '=', '\n', '\033', 'r', 'e', 's', 'p', 'e', 'c', 't', '_', 'e', 'x', 'p', 'e', 'c', +'t', 'e', 'd', '_', 'r', 'q', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\006', ' ', '\001', '(', '\010', 'R', '\030', 'r', 'e', 's', +'p', 'e', 'c', 't', 'E', 'x', 'p', 'e', 'c', 't', 'e', 'd', 'R', 'q', 'T', 'i', 'm', 'e', 'o', 'u', 't', ':', '0', '\232', '\305', +'\210', '\036', '+', '\n', ')', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', +'h', 't', 't', 'p', '.', 'r', 'o', 'u', 't', 'e', 'r', '.', 'v', '2', '.', 'R', 'o', 'u', 't', 'e', 'r', 'B', 'N', '\n', '5', +'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', +'s', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'h', 't', 't', 'p', '.', 'r', 'o', 'u', 't', 'e', 'r', +'.', 'v', '3', 'B', '\013', 'R', 'o', 'u', 't', 'e', 'r', 'P', 'r', 'o', 't', 'o', 'P', '\001', '\272', '\200', '\310', '\321', '\006', '\002', '\020', +'\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +}; + +static upb_def_init *deps[6] = { + &envoy_config_accesslog_v3_accesslog_proto_upbdefinit, + &google_protobuf_wrappers_proto_upbdefinit, + &udpa_annotations_status_proto_upbdefinit, + &udpa_annotations_versioning_proto_upbdefinit, + &validate_validate_proto_upbdefinit, + NULL +}; + +upb_def_init envoy_extensions_filters_http_router_v3_router_proto_upbdefinit = { + deps, + layouts, + "envoy/extensions/filters/http/router/v3/router.proto", + UPB_STRVIEW_INIT(descriptor, 909) +}; diff --git a/grpc/src/core/ext/upbdefs-generated/envoy/extensions/filters/http/router/v3/router.upbdefs.h b/grpc/src/core/ext/upbdefs-generated/envoy/extensions/filters/http/router/v3/router.upbdefs.h new file mode 100644 index 00000000..dc91890e --- /dev/null +++ b/grpc/src/core/ext/upbdefs-generated/envoy/extensions/filters/http/router/v3/router.upbdefs.h @@ -0,0 +1,35 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * envoy/extensions/filters/http/router/v3/router.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#ifndef ENVOY_EXTENSIONS_FILTERS_HTTP_ROUTER_V3_ROUTER_PROTO_UPBDEFS_H_ +#define ENVOY_EXTENSIONS_FILTERS_HTTP_ROUTER_V3_ROUTER_PROTO_UPBDEFS_H_ + +#include "upb/def.h" +#include "upb/port_def.inc" +#ifdef __cplusplus +extern "C" { +#endif + +#include "upb/def.h" + +#include "upb/port_def.inc" + +extern upb_def_init envoy_extensions_filters_http_router_v3_router_proto_upbdefinit; + +UPB_INLINE const upb_msgdef *envoy_extensions_filters_http_router_v3_Router_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_extensions_filters_http_router_v3_router_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.extensions.filters.http.router.v3.Router"); +} + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#include "upb/port_undef.inc" + +#endif /* ENVOY_EXTENSIONS_FILTERS_HTTP_ROUTER_V3_ROUTER_PROTO_UPBDEFS_H_ */ diff --git a/grpc/src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c b/grpc/src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c index 7eeda1f0..916044e9 100644 --- a/grpc/src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c +++ b/grpc/src/core/ext/upbdefs-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.c @@ -22,10 +22,7 @@ extern upb_def_init envoy_type_tracing_v3_custom_tag_proto_upbdefinit; extern upb_def_init envoy_type_v3_percent_proto_upbdefinit; extern upb_def_init google_protobuf_any_proto_upbdefinit; extern upb_def_init google_protobuf_duration_proto_upbdefinit; -extern upb_def_init google_protobuf_struct_proto_upbdefinit; extern upb_def_init google_protobuf_wrappers_proto_upbdefinit; -extern upb_def_init udpa_core_v1_resource_locator_proto_upbdefinit; -extern upb_def_init envoy_annotations_deprecation_proto_upbdefinit; extern upb_def_init udpa_annotations_migrate_proto_upbdefinit; extern upb_def_init udpa_annotations_security_proto_upbdefinit; extern upb_def_init udpa_annotations_status_proto_upbdefinit; @@ -69,7 +66,7 @@ static const upb_msglayout *layouts[17] = { &envoy_extensions_filters_network_http_connection_manager_v3_RequestIDExtension_msginit, }; -static const char descriptor[10148] = {'\n', 'Y', 'e', 'n', 'v', 'o', 'y', '/', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '/', 'f', 'i', 'l', 't', 'e', 'r', +static const char descriptor[10141] = {'\n', 'Y', 'e', 'n', 'v', 'o', 'y', '/', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '/', 'f', 'i', 'l', 't', 'e', 'r', 's', '/', 'n', 'e', 't', 'w', 'o', 'r', 'k', '/', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '/', 'v', '3', '/', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'p', 'r', 'o', 't', 'o', '\022', ';', 'e', 'n', 'v', 'o', 'y', '.', 'e', @@ -94,390 +91,390 @@ static const char descriptor[10148] = {'\n', 'Y', 'e', 'n', 'v', 'o', 'y', '/', 'a', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\033', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'v', '3', '/', 'p', 'e', 'r', 'c', 'e', 'n', 't', '.', 'p', 'r', 'o', 't', 'o', '\032', '\031', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'a', 'n', 'y', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', -'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\032', '\034', 'g', 'o', -'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 's', 't', 'r', 'u', 'c', 't', '.', 'p', 'r', 'o', 't', -'o', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'w', 'r', 'a', 'p', 'p', 'e', -'r', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '#', 'u', 'd', 'p', 'a', '/', 'c', 'o', 'r', 'e', '/', 'v', '1', '/', 'r', 'e', -'s', 'o', 'u', 'r', 'c', 'e', '_', 'l', 'o', 'c', 'a', 't', 'o', 'r', '.', 'p', 'r', 'o', 't', 'o', '\032', '#', 'e', 'n', 'v', -'o', 'y', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'i', 'o', -'n', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', -'/', 'm', 'i', 'g', 'r', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', '\037', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', -'t', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 'e', 'c', 'u', 'r', 'i', 't', 'y', '.', 'p', 'r', 'o', 't', 'o', '\032', '\035', 'u', -'d', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', -'o', 't', 'o', '\032', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', -'s', 'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', 'v', -'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '\321', ')', '\n', '\025', 'H', 't', 't', 'p', 'C', 'o', 'n', -'n', 'e', 'c', 't', 'i', 'o', 'n', 'M', 'a', 'n', 'a', 'g', 'e', 'r', '\022', '\205', '\001', '\n', '\n', 'c', 'o', 'd', 'e', 'c', '_', -'t', 'y', 'p', 'e', '\030', '\001', ' ', '\001', '(', '\016', '2', '\\', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', -'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', -'_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '3', '.', 'H', 't', -'t', 'p', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'M', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'C', 'o', 'd', 'e', 'c', -'T', 'y', 'p', 'e', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\t', 'c', 'o', 'd', 'e', 'c', 'T', 'y', 'p', 'e', -'\022', '(', '\n', '\013', 's', 't', 'a', 't', '_', 'p', 'r', 'e', 'f', 'i', 'x', '\030', '\002', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', -'\004', 'r', '\002', '\020', '\001', 'R', '\n', 's', 't', 'a', 't', 'P', 'r', 'e', 'f', 'i', 'x', '\022', 'T', '\n', '\003', 'r', 'd', 's', '\030', -'\003', ' ', '\001', '(', '\013', '2', '@', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', -'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', -'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '3', '.', 'R', 'd', 's', 'H', '\000', 'R', '\003', -'r', 'd', 's', '\022', 'N', '\n', '\014', 'r', 'o', 'u', 't', 'e', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\004', ' ', '\001', '(', '\013', -'2', ')', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', -'R', 'o', 'u', 't', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'H', '\000', 'R', '\013', 'r', 'o', 'u', -'t', 'e', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'p', '\n', '\r', 's', 'c', 'o', 'p', 'e', 'd', '_', 'r', 'o', 'u', 't', 'e', 's', -'\030', '\037', ' ', '\001', '(', '\013', '2', 'I', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', +'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', +'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'w', 'r', 'a', 'p', 'p', 'e', 'r', 's', '.', 'p', 'r', +'o', 't', 'o', '\032', '\036', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'm', 'i', 'g', +'r', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', '\037', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', +'o', 'n', 's', '/', 's', 'e', 'c', 'u', 'r', 'i', 't', 'y', '.', 'p', 'r', 'o', 't', 'o', '\032', '\035', 'u', 'd', 'p', 'a', '/', +'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', +'!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', +'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', +'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '\222', '+', '\n', '\025', 'H', 't', 't', 'p', 'C', 'o', 'n', 'n', 'e', 'c', 't', +'i', 'o', 'n', 'M', 'a', 'n', 'a', 'g', 'e', 'r', '\022', '\205', '\001', '\n', '\n', 'c', 'o', 'd', 'e', 'c', '_', 't', 'y', 'p', 'e', +'\030', '\001', ' ', '\001', '(', '\016', '2', '\\', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', -'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '3', '.', 'S', 'c', 'o', 'p', 'e', 'd', -'R', 'o', 'u', 't', 'e', 's', 'H', '\000', 'R', '\014', 's', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 's', '\022', 'j', '\n', -'\014', 'h', 't', 't', 'p', '_', 'f', 'i', 'l', 't', 'e', 'r', 's', '\030', '\005', ' ', '\003', '(', '\013', '2', 'G', '.', 'e', 'n', 'v', -'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'n', 'e', 't', -'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', -'g', 'e', 'r', '.', 'v', '3', '.', 'H', 't', 't', 'p', 'F', 'i', 'l', 't', 'e', 'r', 'R', '\013', 'h', 't', 't', 'p', 'F', 'i', -'l', 't', 'e', 'r', 's', '\022', '@', '\n', '\016', 'a', 'd', 'd', '_', 'u', 's', 'e', 'r', '_', 'a', 'g', 'e', 'n', 't', '\030', '\006', -' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', -'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\014', 'a', 'd', 'd', 'U', 's', 'e', 'r', 'A', 'g', 'e', 'n', 't', '\022', 't', '\n', '\007', -'t', 'r', 'a', 'c', 'i', 'n', 'g', '\030', '\007', ' ', '\001', '(', '\013', '2', 'Z', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', -'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', -'t', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '3', -'.', 'H', 't', 't', 'p', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'M', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'T', 'r', -'a', 'c', 'i', 'n', 'g', 'R', '\007', 't', 'r', 'a', 'c', 'i', 'n', 'g', '\022', 's', '\n', '\034', 'c', 'o', 'm', 'm', 'o', 'n', '_', -'h', 't', 't', 'p', '_', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '_', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '#', ' ', '\001', -'(', '\013', '2', ')', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', -'.', 'H', 't', 't', 'p', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', 'B', '\007', '\212', '\223', '\267', -'*', '\002', '\010', '\001', 'R', '\031', 'c', 'o', 'm', 'm', 'o', 'n', 'H', 't', 't', 'p', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', -'p', 't', 'i', 'o', 'n', 's', '\022', '^', '\n', '\025', 'h', 't', 't', 'p', '_', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '_', 'o', -'p', 't', 'i', 'o', 'n', 's', '\030', '\010', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', -'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 't', 't', 'p', '1', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', -'p', 't', 'i', 'o', 'n', 's', 'R', '\023', 'h', 't', 't', 'p', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', -'n', 's', '\022', 'i', '\n', '\026', 'h', 't', 't', 'p', '2', '_', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '_', 'o', 'p', 't', 'i', -'o', 'n', 's', '\030', '\t', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', -'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 't', 't', 'p', '2', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', -'o', 'n', 's', 'B', '\007', '\212', '\223', '\267', '*', '\002', '\010', '\001', 'R', '\024', 'h', 't', 't', 'p', '2', 'P', 'r', 'o', 't', 'o', 'c', -'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', ',', '\n', '\013', 's', 'e', 'r', 'v', 'e', 'r', '_', 'n', 'a', 'm', 'e', '\030', -'\n', ' ', '\001', '(', '\t', 'B', '\013', '\372', 'B', '\010', 'r', '\006', '\300', '\001', '\002', '\310', '\001', '\000', 'R', '\n', 's', 'e', 'r', 'v', 'e', -'r', 'N', 'a', 'm', 'e', '\022', '\271', '\001', '\n', '\034', 's', 'e', 'r', 'v', 'e', 'r', '_', 'h', 'e', 'a', 'd', 'e', 'r', '_', 't', -'r', 'a', 'n', 's', 'f', 'o', 'r', 'm', 'a', 't', 'i', 'o', 'n', '\030', '\"', ' ', '\001', '(', '\016', '2', 'm', '.', 'e', 'n', 'v', -'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'n', 'e', 't', -'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', -'g', 'e', 'r', '.', 'v', '3', '.', 'H', 't', 't', 'p', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'M', 'a', 'n', 'a', -'g', 'e', 'r', '.', 'S', 'e', 'r', 'v', 'e', 'r', 'H', 'e', 'a', 'd', 'e', 'r', 'T', 'r', 'a', 'n', 's', 'f', 'o', 'r', 'm', -'a', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\032', 's', 'e', 'r', 'v', 'e', 'r', 'H', 'e', -'a', 'd', 'e', 'r', 'T', 'r', 'a', 'n', 's', 'f', 'o', 'r', 'm', 'a', 't', 'i', 'o', 'n', '\022', '\\', '\n', '\026', 'm', 'a', 'x', -'_', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '_', 'k', 'b', '\030', '\035', ' ', '\001', '(', '\013', -'2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', -'V', 'a', 'l', 'u', 'e', 'B', '\t', '\372', 'B', '\006', '*', '\004', '\030', '`', ' ', '\000', 'R', '\023', 'm', 'a', 'x', 'R', 'e', 'q', 'u', -'e', 's', 't', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'K', 'b', '\022', 'R', '\n', '\023', 's', 't', 'r', 'e', 'a', 'm', '_', 'i', 'd', -'l', 'e', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\030', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', -'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\007', '\212', '\223', '\267', '*', '\002', -'\010', '\001', 'R', '\021', 's', 't', 'r', 'e', 'a', 'm', 'I', 'd', 'l', 'e', 'T', 'i', 'm', 'e', 'o', 'u', 't', '\022', 'K', '\n', '\017', -'r', 'e', 'q', 'u', 'e', 's', 't', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\034', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', -'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\007', -'\212', '\223', '\267', '*', '\002', '\010', '\001', 'R', '\016', 'r', 'e', 'q', 'u', 'e', 's', 't', 'T', 'i', 'm', 'e', 'o', 'u', 't', '\022', '>', -'\n', '\r', 'd', 'r', 'a', 'i', 'n', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\014', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', -'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\014', -'d', 'r', 'a', 'i', 'n', 'T', 'i', 'm', 'e', 'o', 'u', 't', '\022', 'M', '\n', '\025', 'd', 'e', 'l', 'a', 'y', 'e', 'd', '_', 'c', -'l', 'o', 's', 'e', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\032', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', -'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\023', 'd', 'e', 'l', -'a', 'y', 'e', 'd', 'C', 'l', 'o', 's', 'e', 'T', 'i', 'm', 'e', 'o', 'u', 't', '\022', 'C', '\n', '\n', 'a', 'c', 'c', 'e', 's', -'s', '_', 'l', 'o', 'g', '\030', '\r', ' ', '\003', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', -'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'A', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 'R', -'\t', 'a', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', '\022', 'Q', '\n', '\022', 'u', 's', 'e', '_', 'r', 'e', 'm', 'o', 't', 'e', '_', -'a', 'd', 'd', 'r', 'e', 's', 's', '\030', '\016', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', -'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'B', '\007', '\212', '\223', '\267', '*', '\002', '\010', '\001', -'R', '\020', 'u', 's', 'e', 'R', 'e', 'm', 'o', 't', 'e', 'A', 'd', 'd', 'r', 'e', 's', 's', '\022', '/', '\n', '\024', 'x', 'f', 'f', -'_', 'n', 'u', 'm', '_', 't', 'r', 'u', 's', 't', 'e', 'd', '_', 'h', 'o', 'p', 's', '\030', '\023', ' ', '\001', '(', '\r', 'R', '\021', -'x', 'f', 'f', 'N', 'u', 'm', 'T', 'r', 'u', 's', 't', 'e', 'd', 'H', 'o', 'p', 's', '\022', '\240', '\001', '\n', '\027', 'i', 'n', 't', -'e', 'r', 'n', 'a', 'l', '_', 'a', 'd', 'd', 'r', 'e', 's', 's', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\031', ' ', '\001', '(', -'\013', '2', 'h', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', +'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '3', '.', 'H', 't', 't', 'p', 'C', 'o', +'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'M', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'C', 'o', 'd', 'e', 'c', 'T', 'y', 'p', 'e', +'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\t', 'c', 'o', 'd', 'e', 'c', 'T', 'y', 'p', 'e', '\022', '(', '\n', '\013', +'s', 't', 'a', 't', '_', 'p', 'r', 'e', 'f', 'i', 'x', '\030', '\002', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', +'\001', 'R', '\n', 's', 't', 'a', 't', 'P', 'r', 'e', 'f', 'i', 'x', '\022', 'T', '\n', '\003', 'r', 'd', 's', '\030', '\003', ' ', '\001', '(', +'\013', '2', '@', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', -'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '3', '.', 'H', 't', 't', 'p', 'C', 'o', 'n', 'n', 'e', 'c', 't', -'i', 'o', 'n', 'M', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'I', 'n', 't', 'e', 'r', 'n', 'a', 'l', 'A', 'd', 'd', 'r', 'e', 's', -'s', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\025', 'i', 'n', 't', 'e', 'r', 'n', 'a', 'l', 'A', 'd', 'd', 'r', 'e', 's', 's', 'C', -'o', 'n', 'f', 'i', 'g', '\022', '&', '\n', '\017', 's', 'k', 'i', 'p', '_', 'x', 'f', 'f', '_', 'a', 'p', 'p', 'e', 'n', 'd', '\030', -'\025', ' ', '\001', '(', '\010', 'R', '\r', 's', 'k', 'i', 'p', 'X', 'f', 'f', 'A', 'p', 'p', 'e', 'n', 'd', '\022', '\020', '\n', '\003', 'v', -'i', 'a', '\030', '\026', ' ', '\001', '(', '\t', 'R', '\003', 'v', 'i', 'a', '\022', 'J', '\n', '\023', 'g', 'e', 'n', 'e', 'r', 'a', 't', 'e', -'_', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'i', 'd', '\030', '\017', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', -'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\021', 'g', 'e', 'n', -'e', 'r', 'a', 't', 'e', 'R', 'e', 'q', 'u', 'e', 's', 't', 'I', 'd', '\022', '?', '\n', '\034', 'p', 'r', 'e', 's', 'e', 'r', 'v', -'e', '_', 'e', 'x', 't', 'e', 'r', 'n', 'a', 'l', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'i', 'd', '\030', ' ', ' ', '\001', -'(', '\010', 'R', '\031', 'p', 'r', 'e', 's', 'e', 'r', 'v', 'e', 'E', 'x', 't', 'e', 'r', 'n', 'a', 'l', 'R', 'e', 'q', 'u', 'e', -'s', 't', 'I', 'd', '\022', 'G', '\n', '!', 'a', 'l', 'w', 'a', 'y', 's', '_', 's', 'e', 't', '_', 'r', 'e', 'q', 'u', 'e', 's', -'t', '_', 'i', 'd', '_', 'i', 'n', '_', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '\030', '%', ' ', '\001', '(', '\010', 'R', '\034', 'a', -'l', 'w', 'a', 'y', 's', 'S', 'e', 't', 'R', 'e', 'q', 'u', 'e', 's', 't', 'I', 'd', 'I', 'n', 'R', 'e', 's', 'p', 'o', 'n', -'s', 'e', '\022', '\264', '\001', '\n', '\033', 'f', 'o', 'r', 'w', 'a', 'r', 'd', '_', 'c', 'l', 'i', 'e', 'n', 't', '_', 'c', 'e', 'r', -'t', '_', 'd', 'e', 't', 'a', 'i', 'l', 's', '\030', '\020', ' ', '\001', '(', '\016', '2', 'k', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', +'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '3', '.', 'R', 'd', 's', 'H', '\000', 'R', '\003', 'r', 'd', 's', '\022', +'N', '\n', '\014', 'r', 'o', 'u', 't', 'e', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\004', ' ', '\001', '(', '\013', '2', ')', '.', 'e', +'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'o', 'u', 't', +'e', 'C', 'o', 'n', 'f', 'i', 'g', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'H', '\000', 'R', '\013', 'r', 'o', 'u', 't', 'e', 'C', 'o', +'n', 'f', 'i', 'g', '\022', 'p', '\n', '\r', 's', 'c', 'o', 'p', 'e', 'd', '_', 'r', 'o', 'u', 't', 'e', 's', '\030', '\037', ' ', '\001', +'(', '\013', '2', 'I', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', +'t', 'e', 'r', 's', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', +'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '3', '.', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', +'e', 's', 'H', '\000', 'R', '\014', 's', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 's', '\022', 'j', '\n', '\014', 'h', 't', 't', +'p', '_', 'f', 'i', 'l', 't', 'e', 'r', 's', '\030', '\005', ' ', '\003', '(', '\013', '2', 'G', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', +'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', +'.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', +'v', '3', '.', 'H', 't', 't', 'p', 'F', 'i', 'l', 't', 'e', 'r', 'R', '\013', 'h', 't', 't', 'p', 'F', 'i', 'l', 't', 'e', 'r', +'s', '\022', '@', '\n', '\016', 'a', 'd', 'd', '_', 'u', 's', 'e', 'r', '_', 'a', 'g', 'e', 'n', 't', '\030', '\006', ' ', '\001', '(', '\013', +'2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', +'l', 'u', 'e', 'R', '\014', 'a', 'd', 'd', 'U', 's', 'e', 'r', 'A', 'g', 'e', 'n', 't', '\022', 't', '\n', '\007', 't', 'r', 'a', 'c', +'i', 'n', 'g', '\030', '\007', ' ', '\001', '(', '\013', '2', 'Z', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', +'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', +'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '3', '.', 'H', 't', 't', +'p', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'M', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'T', 'r', 'a', 'c', 'i', 'n', +'g', 'R', '\007', 't', 'r', 'a', 'c', 'i', 'n', 'g', '\022', 's', '\n', '\034', 'c', 'o', 'm', 'm', 'o', 'n', '_', 'h', 't', 't', 'p', +'_', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '_', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '#', ' ', '\001', '(', '\013', '2', ')', +'.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 't', 't', +'p', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', 'B', '\007', '\212', '\223', '\267', '*', '\002', '\010', '\001', +'R', '\031', 'c', 'o', 'm', 'm', 'o', 'n', 'H', 't', 't', 'p', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', +'n', 's', '\022', '^', '\n', '\025', 'h', 't', 't', 'p', '_', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '_', 'o', 'p', 't', 'i', 'o', +'n', 's', '\030', '\010', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', +'o', 'r', 'e', '.', 'v', '3', '.', 'H', 't', 't', 'p', '1', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', +'n', 's', 'R', '\023', 'h', 't', 't', 'p', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', 'i', +'\n', '\026', 'h', 't', 't', 'p', '2', '_', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '_', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', +'\t', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', +'.', 'v', '3', '.', 'H', 't', 't', 'p', '2', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', 't', 'i', 'o', 'n', 's', 'B', +'\007', '\212', '\223', '\267', '*', '\002', '\010', '\001', 'R', '\024', 'h', 't', 't', 'p', '2', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'O', 'p', +'t', 'i', 'o', 'n', 's', '\022', ',', '\n', '\013', 's', 'e', 'r', 'v', 'e', 'r', '_', 'n', 'a', 'm', 'e', '\030', '\n', ' ', '\001', '(', +'\t', 'B', '\013', '\372', 'B', '\010', 'r', '\006', '\300', '\001', '\002', '\310', '\001', '\000', 'R', '\n', 's', 'e', 'r', 'v', 'e', 'r', 'N', 'a', 'm', +'e', '\022', '\271', '\001', '\n', '\034', 's', 'e', 'r', 'v', 'e', 'r', '_', 'h', 'e', 'a', 'd', 'e', 'r', '_', 't', 'r', 'a', 'n', 's', +'f', 'o', 'r', 'm', 'a', 't', 'i', 'o', 'n', '\030', '\"', ' ', '\001', '(', '\016', '2', 'm', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '3', '.', 'H', 't', 't', 'p', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'M', 'a', 'n', 'a', 'g', 'e', 'r', '.', -'F', 'o', 'r', 'w', 'a', 'r', 'd', 'C', 'l', 'i', 'e', 'n', 't', 'C', 'e', 'r', 't', 'D', 'e', 't', 'a', 'i', 'l', 's', 'B', -'\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\030', 'f', 'o', 'r', 'w', 'a', 'r', 'd', 'C', 'l', 'i', 'e', 'n', 't', 'C', -'e', 'r', 't', 'D', 'e', 't', 'a', 'i', 'l', 's', '\022', '\264', '\001', '\n', '\037', 's', 'e', 't', '_', 'c', 'u', 'r', 'r', 'e', 'n', -'t', '_', 'c', 'l', 'i', 'e', 'n', 't', '_', 'c', 'e', 'r', 't', '_', 'd', 'e', 't', 'a', 'i', 'l', 's', '\030', '\021', ' ', '\001', -'(', '\013', '2', 'n', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', -'t', 'e', 'r', 's', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', -'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '3', '.', 'H', 't', 't', 'p', 'C', 'o', 'n', 'n', 'e', 'c', -'t', 'i', 'o', 'n', 'M', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'S', 'e', 't', 'C', 'u', 'r', 'r', 'e', 'n', 't', 'C', 'l', 'i', -'e', 'n', 't', 'C', 'e', 'r', 't', 'D', 'e', 't', 'a', 'i', 'l', 's', 'R', '\033', 's', 'e', 't', 'C', 'u', 'r', 'r', 'e', 'n', -'t', 'C', 'l', 'i', 'e', 'n', 't', 'C', 'e', 'r', 't', 'D', 'e', 't', 'a', 'i', 'l', 's', '\022', ',', '\n', '\022', 'p', 'r', 'o', -'x', 'y', '_', '1', '0', '0', '_', 'c', 'o', 'n', 't', 'i', 'n', 'u', 'e', '\030', '\022', ' ', '\001', '(', '\010', 'R', '\020', 'p', 'r', -'o', 'x', 'y', '1', '0', '0', 'C', 'o', 'n', 't', 'i', 'n', 'u', 'e', '\022', 'e', '\n', '1', 'r', 'e', 'p', 'r', 'e', 's', 'e', -'n', 't', '_', 'i', 'p', 'v', '4', '_', 'r', 'e', 'm', 'o', 't', 'e', '_', 'a', 'd', 'd', 'r', 'e', 's', 's', '_', 'a', 's', -'_', 'i', 'p', 'v', '4', '_', 'm', 'a', 'p', 'p', 'e', 'd', '_', 'i', 'p', 'v', '6', '\030', '\024', ' ', '\001', '(', '\010', 'R', '*', -'r', 'e', 'p', 'r', 'e', 's', 'e', 'n', 't', 'I', 'p', 'v', '4', 'R', 'e', 'm', 'o', 't', 'e', 'A', 'd', 'd', 'r', 'e', 's', -'s', 'A', 's', 'I', 'p', 'v', '4', 'M', 'a', 'p', 'p', 'e', 'd', 'I', 'p', 'v', '6', '\022', '\211', '\001', '\n', '\017', 'u', 'p', 'g', -'r', 'a', 'd', 'e', '_', 'c', 'o', 'n', 'f', 'i', 'g', 's', '\030', '\027', ' ', '\003', '(', '\013', '2', '`', '.', 'e', 'n', 'v', 'o', -'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'n', 'e', 't', 'w', -'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', -'e', 'r', '.', 'v', '3', '.', 'H', 't', 't', 'p', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'M', 'a', 'n', 'a', 'g', -'e', 'r', '.', 'U', 'p', 'g', 'r', 'a', 'd', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\016', 'u', 'p', 'g', 'r', 'a', 'd', 'e', -'C', 'o', 'n', 'f', 'i', 'g', 's', '\022', 'A', '\n', '\016', 'n', 'o', 'r', 'm', 'a', 'l', 'i', 'z', 'e', '_', 'p', 'a', 't', 'h', -'\030', '\036', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', -'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\r', 'n', 'o', 'r', 'm', 'a', 'l', 'i', 'z', 'e', 'P', 'a', 't', 'h', '\022', -'#', '\n', '\r', 'm', 'e', 'r', 'g', 'e', '_', 's', 'l', 'a', 's', 'h', 'e', 's', '\030', '!', ' ', '\001', '(', '\010', 'R', '\014', 'm', -'e', 'r', 'g', 'e', 'S', 'l', 'a', 's', 'h', 'e', 's', '\022', '\201', '\001', '\n', '\024', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'i', -'d', '_', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '\030', '$', ' ', '\001', '(', '\013', '2', 'O', '.', 'e', 'n', 'v', 'o', 'y', -'.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'n', 'e', 't', 'w', 'o', -'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', -'r', '.', 'v', '3', '.', 'R', 'e', 'q', 'u', 'e', 's', 't', 'I', 'D', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'R', '\022', -'r', 'e', 'q', 'u', 'e', 's', 't', 'I', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '\022', '{', '\n', '\022', 'l', 'o', 'c', -'a', 'l', '_', 'r', 'e', 'p', 'l', 'y', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '&', ' ', '\001', '(', '\013', '2', 'M', '.', 'e', -'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'n', -'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', -'n', 'a', 'g', 'e', 'r', '.', 'v', '3', '.', 'L', 'o', 'c', 'a', 'l', 'R', 'e', 'p', 'l', 'y', 'C', 'o', 'n', 'f', 'i', 'g', -'R', '\020', 'l', 'o', 'c', 'a', 'l', 'R', 'e', 'p', 'l', 'y', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '7', '\n', '\030', 's', 't', 'r', -'i', 'p', '_', 'm', 'a', 't', 'c', 'h', 'i', 'n', 'g', '_', 'h', 'o', 's', 't', '_', 'p', 'o', 'r', 't', '\030', '\'', ' ', '\001', -'(', '\010', 'R', '\025', 's', 't', 'r', 'i', 'p', 'M', 'a', 't', 'c', 'h', 'i', 'n', 'g', 'H', 'o', 's', 't', 'P', 'o', 'r', 't', -'\022', 'i', '\n', '$', 's', 't', 'r', 'e', 'a', 'm', '_', 'e', 'r', 'r', 'o', 'r', '_', 'o', 'n', '_', 'i', 'n', 'v', 'a', 'l', -'i', 'd', '_', 'h', 't', 't', 'p', '_', 'm', 'e', 's', 's', 'a', 'g', 'e', '\030', '(', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', -'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', -'\037', 's', 't', 'r', 'e', 'a', 'm', 'E', 'r', 'r', 'o', 'r', 'O', 'n', 'I', 'n', 'v', 'a', 'l', 'i', 'd', 'H', 't', 't', 'p', -'M', 'e', 's', 's', 'a', 'g', 'e', '\032', '\366', '\004', '\n', '\007', 'T', 'r', 'a', 'c', 'i', 'n', 'g', '\022', '?', '\n', '\017', 'c', 'l', -'i', 'e', 'n', 't', '_', 's', 'a', 'm', 'p', 'l', 'i', 'n', 'g', '\030', '\003', ' ', '\001', '(', '\013', '2', '\026', '.', 'e', 'n', 'v', -'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', '\016', 'c', 'l', 'i', 'e', 'n', -'t', 'S', 'a', 'm', 'p', 'l', 'i', 'n', 'g', '\022', '?', '\n', '\017', 'r', 'a', 'n', 'd', 'o', 'm', '_', 's', 'a', 'm', 'p', 'l', -'i', 'n', 'g', '\030', '\004', ' ', '\001', '(', '\013', '2', '\026', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', -'.', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', '\016', 'r', 'a', 'n', 'd', 'o', 'm', 'S', 'a', 'm', 'p', 'l', 'i', 'n', 'g', '\022', -'A', '\n', '\020', 'o', 'v', 'e', 'r', 'a', 'l', 'l', '_', 's', 'a', 'm', 'p', 'l', 'i', 'n', 'g', '\030', '\005', ' ', '\001', '(', '\013', -'2', '\026', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', -'\017', 'o', 'v', 'e', 'r', 'a', 'l', 'l', 'S', 'a', 'm', 'p', 'l', 'i', 'n', 'g', '\022', '\030', '\n', '\007', 'v', 'e', 'r', 'b', 'o', -'s', 'e', '\030', '\006', ' ', '\001', '(', '\010', 'R', '\007', 'v', 'e', 'r', 'b', 'o', 's', 'e', '\022', 'K', '\n', '\023', 'm', 'a', 'x', '_', -'p', 'a', 't', 'h', '_', 't', 'a', 'g', '_', 'l', 'e', 'n', 'g', 't', 'h', '\030', '\007', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', +'S', 'e', 'r', 'v', 'e', 'r', 'H', 'e', 'a', 'd', 'e', 'r', 'T', 'r', 'a', 'n', 's', 'f', 'o', 'r', 'm', 'a', 't', 'i', 'o', +'n', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\032', 's', 'e', 'r', 'v', 'e', 'r', 'H', 'e', 'a', 'd', 'e', 'r', +'T', 'r', 'a', 'n', 's', 'f', 'o', 'r', 'm', 'a', 't', 'i', 'o', 'n', '\022', '\\', '\n', '\026', 'm', 'a', 'x', '_', 'r', 'e', 'q', +'u', 'e', 's', 't', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '_', 'k', 'b', '\030', '\035', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', -'e', 'R', '\020', 'm', 'a', 'x', 'P', 'a', 't', 'h', 'T', 'a', 'g', 'L', 'e', 'n', 'g', 't', 'h', '\022', 'A', '\n', '\013', 'c', 'u', -'s', 't', 'o', 'm', '_', 't', 'a', 'g', 's', '\030', '\010', ' ', '\003', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', -'y', 'p', 'e', '.', 't', 'r', 'a', 'c', 'i', 'n', 'g', '.', 'v', '3', '.', 'C', 'u', 's', 't', 'o', 'm', 'T', 'a', 'g', 'R', -'\n', 'c', 'u', 's', 't', 'o', 'm', 'T', 'a', 'g', 's', '\022', '?', '\n', '\010', 'p', 'r', 'o', 'v', 'i', 'd', 'e', 'r', '\030', '\t', -' ', '\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'r', 'a', 'c', 'e', -'.', 'v', '3', '.', 'T', 'r', 'a', 'c', 'i', 'n', 'g', '.', 'H', 't', 't', 'p', 'R', '\010', 'p', 'r', 'o', 'v', 'i', 'd', 'e', -'r', '\"', '(', '\n', '\r', 'O', 'p', 'e', 'r', 'a', 't', 'i', 'o', 'n', 'N', 'a', 'm', 'e', '\022', '\013', '\n', '\007', 'I', 'N', 'G', -'R', 'E', 'S', 'S', '\020', '\000', '\022', '\n', '\n', '\006', 'E', 'G', 'R', 'E', 'S', 'S', '\020', '\001', ':', '[', '\232', '\305', '\210', '\036', 'V', -'\n', 'T', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'n', 'e', 't', -'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', -'g', 'e', 'r', '.', 'v', '2', '.', 'H', 't', 't', 'p', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'M', 'a', 'n', 'a', -'g', 'e', 'r', '.', 'T', 'r', 'a', 'c', 'i', 'n', 'g', 'J', '\004', '\010', '\001', '\020', '\002', 'J', '\004', '\010', '\002', '\020', '\003', 'R', '\016', -'o', 'p', 'e', 'r', 'a', 't', 'i', 'o', 'n', '_', 'n', 'a', 'm', 'e', 'R', '\030', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'h', -'e', 'a', 'd', 'e', 'r', 's', '_', 'f', 'o', 'r', '_', 't', 'a', 'g', 's', '\032', '\245', '\001', '\n', '\025', 'I', 'n', 't', 'e', 'r', -'n', 'a', 'l', 'A', 'd', 'd', 'r', 'e', 's', 's', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '!', '\n', '\014', 'u', 'n', 'i', 'x', '_', -'s', 'o', 'c', 'k', 'e', 't', 's', '\030', '\001', ' ', '\001', '(', '\010', 'R', '\013', 'u', 'n', 'i', 'x', 'S', 'o', 'c', 'k', 'e', 't', -'s', ':', 'i', '\232', '\305', '\210', '\036', 'd', '\n', 'b', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', -'l', 't', 'e', 'r', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', -'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '2', '.', 'H', 't', 't', 'p', 'C', 'o', 'n', 'n', 'e', 'c', -'t', 'i', 'o', 'n', 'M', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'I', 'n', 't', 'e', 'r', 'n', 'a', 'l', 'A', 'd', 'd', 'r', 'e', -'s', 's', 'C', 'o', 'n', 'f', 'i', 'g', '\032', '\230', '\002', '\n', '\033', 'S', 'e', 't', 'C', 'u', 'r', 'r', 'e', 'n', 't', 'C', 'l', -'i', 'e', 'n', 't', 'C', 'e', 'r', 't', 'D', 'e', 't', 'a', 'i', 'l', 's', '\022', '4', '\n', '\007', 's', 'u', 'b', 'j', 'e', 'c', -'t', '\030', '\001', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', -'.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\007', 's', 'u', 'b', 'j', 'e', 'c', 't', '\022', '\022', '\n', '\004', 'c', 'e', -'r', 't', '\030', '\003', ' ', '\001', '(', '\010', 'R', '\004', 'c', 'e', 'r', 't', '\022', '\024', '\n', '\005', 'c', 'h', 'a', 'i', 'n', '\030', '\006', -' ', '\001', '(', '\010', 'R', '\005', 'c', 'h', 'a', 'i', 'n', '\022', '\020', '\n', '\003', 'd', 'n', 's', '\030', '\004', ' ', '\001', '(', '\010', 'R', -'\003', 'd', 'n', 's', '\022', '\020', '\n', '\003', 'u', 'r', 'i', '\030', '\005', ' ', '\001', '(', '\010', 'R', '\003', 'u', 'r', 'i', ':', 'o', '\232', -'\305', '\210', '\036', 'j', '\n', 'h', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', -'.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', -'m', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '2', '.', 'H', 't', 't', 'p', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', -'M', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'S', 'e', 't', 'C', 'u', 'r', 'r', 'e', 'n', 't', 'C', 'l', 'i', 'e', 'n', 't', 'C', -'e', 'r', 't', 'D', 'e', 't', 'a', 'i', 'l', 's', 'J', '\004', '\010', '\002', '\020', '\003', '\032', '\256', '\002', '\n', '\r', 'U', 'p', 'g', 'r', -'a', 'd', 'e', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '!', '\n', '\014', 'u', 'p', 'g', 'r', 'a', 'd', 'e', '_', 't', 'y', 'p', 'e', -'\030', '\001', ' ', '\001', '(', '\t', 'R', '\013', 'u', 'p', 'g', 'r', 'a', 'd', 'e', 'T', 'y', 'p', 'e', '\022', 'a', '\n', '\007', 'f', 'i', -'l', 't', 'e', 'r', 's', '\030', '\002', ' ', '\003', '(', '\013', '2', 'G', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', +'e', 'B', '\t', '\372', 'B', '\006', '*', '\004', '\030', '`', ' ', '\000', 'R', '\023', 'm', 'a', 'x', 'R', 'e', 'q', 'u', 'e', 's', 't', 'H', +'e', 'a', 'd', 'e', 'r', 's', 'K', 'b', '\022', 'R', '\n', '\023', 's', 't', 'r', 'e', 'a', 'm', '_', 'i', 'd', 'l', 'e', '_', 't', +'i', 'm', 'e', 'o', 'u', 't', '\030', '\030', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', +'t', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\007', '\212', '\223', '\267', '*', '\002', '\010', '\001', 'R', '\021', +'s', 't', 'r', 'e', 'a', 'm', 'I', 'd', 'l', 'e', 'T', 'i', 'm', 'e', 'o', 'u', 't', '\022', 'K', '\n', '\017', 'r', 'e', 'q', 'u', +'e', 's', 't', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\034', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', +'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\007', '\212', '\223', '\267', '*', +'\002', '\010', '\001', 'R', '\016', 'r', 'e', 'q', 'u', 'e', 's', 't', 'T', 'i', 'm', 'e', 'o', 'u', 't', '\022', 'b', '\n', '\027', 'r', 'e', +'q', 'u', 'e', 's', 't', '_', 'h', 'e', 'a', 'd', 'e', 'r', 's', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', ')', ' ', '\001', +'(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', +'t', 'i', 'o', 'n', 'B', '\017', '\372', 'B', '\005', '\252', '\001', '\002', '2', '\000', '\212', '\223', '\267', '*', '\002', '\010', '\001', 'R', '\025', 'r', 'e', +'q', 'u', 'e', 's', 't', 'H', 'e', 'a', 'd', 'e', 'r', 's', 'T', 'i', 'm', 'e', 'o', 'u', 't', '\022', '>', '\n', '\r', 'd', 'r', +'a', 'i', 'n', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\014', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', +'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\014', 'd', 'r', 'a', 'i', +'n', 'T', 'i', 'm', 'e', 'o', 'u', 't', '\022', 'M', '\n', '\025', 'd', 'e', 'l', 'a', 'y', 'e', 'd', '_', 'c', 'l', 'o', 's', 'e', +'_', 't', 'i', 'm', 'e', 'o', 'u', 't', '\030', '\032', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', +'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'R', '\023', 'd', 'e', 'l', 'a', 'y', 'e', 'd', +'C', 'l', 'o', 's', 'e', 'T', 'i', 'm', 'e', 'o', 'u', 't', '\022', 'C', '\n', '\n', 'a', 'c', 'c', 'e', 's', 's', '_', 'l', 'o', +'g', '\030', '\r', ' ', '\003', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', +'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'A', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 'R', '\t', 'a', 'c', 'c', +'e', 's', 's', 'L', 'o', 'g', '\022', 'Q', '\n', '\022', 'u', 's', 'e', '_', 'r', 'e', 'm', 'o', 't', 'e', '_', 'a', 'd', 'd', 'r', +'e', 's', 's', '\030', '\016', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', +'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'B', '\007', '\212', '\223', '\267', '*', '\002', '\010', '\001', 'R', '\020', 'u', 's', +'e', 'R', 'e', 'm', 'o', 't', 'e', 'A', 'd', 'd', 'r', 'e', 's', 's', '\022', '/', '\n', '\024', 'x', 'f', 'f', '_', 'n', 'u', 'm', +'_', 't', 'r', 'u', 's', 't', 'e', 'd', '_', 'h', 'o', 'p', 's', '\030', '\023', ' ', '\001', '(', '\r', 'R', '\021', 'x', 'f', 'f', 'N', +'u', 'm', 'T', 'r', 'u', 's', 't', 'e', 'd', 'H', 'o', 'p', 's', '\022', '\240', '\001', '\n', '\027', 'i', 'n', 't', 'e', 'r', 'n', 'a', +'l', '_', 'a', 'd', 'd', 'r', 'e', 's', 's', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\031', ' ', '\001', '(', '\013', '2', 'h', '.', +'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', +'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', +'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '3', '.', 'H', 't', 't', 'p', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'M', +'a', 'n', 'a', 'g', 'e', 'r', '.', 'I', 'n', 't', 'e', 'r', 'n', 'a', 'l', 'A', 'd', 'd', 'r', 'e', 's', 's', 'C', 'o', 'n', +'f', 'i', 'g', 'R', '\025', 'i', 'n', 't', 'e', 'r', 'n', 'a', 'l', 'A', 'd', 'd', 'r', 'e', 's', 's', 'C', 'o', 'n', 'f', 'i', +'g', '\022', '&', '\n', '\017', 's', 'k', 'i', 'p', '_', 'x', 'f', 'f', '_', 'a', 'p', 'p', 'e', 'n', 'd', '\030', '\025', ' ', '\001', '(', +'\010', 'R', '\r', 's', 'k', 'i', 'p', 'X', 'f', 'f', 'A', 'p', 'p', 'e', 'n', 'd', '\022', '\020', '\n', '\003', 'v', 'i', 'a', '\030', '\026', +' ', '\001', '(', '\t', 'R', '\003', 'v', 'i', 'a', '\022', 'J', '\n', '\023', 'g', 'e', 'n', 'e', 'r', 'a', 't', 'e', '_', 'r', 'e', 'q', +'u', 'e', 's', 't', '_', 'i', 'd', '\030', '\017', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', +'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\021', 'g', 'e', 'n', 'e', 'r', 'a', 't', +'e', 'R', 'e', 'q', 'u', 'e', 's', 't', 'I', 'd', '\022', '?', '\n', '\034', 'p', 'r', 'e', 's', 'e', 'r', 'v', 'e', '_', 'e', 'x', +'t', 'e', 'r', 'n', 'a', 'l', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'i', 'd', '\030', ' ', ' ', '\001', '(', '\010', 'R', '\031', +'p', 'r', 'e', 's', 'e', 'r', 'v', 'e', 'E', 'x', 't', 'e', 'r', 'n', 'a', 'l', 'R', 'e', 'q', 'u', 'e', 's', 't', 'I', 'd', +'\022', 'G', '\n', '!', 'a', 'l', 'w', 'a', 'y', 's', '_', 's', 'e', 't', '_', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'i', 'd', +'_', 'i', 'n', '_', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '\030', '%', ' ', '\001', '(', '\010', 'R', '\034', 'a', 'l', 'w', 'a', 'y', +'s', 'S', 'e', 't', 'R', 'e', 'q', 'u', 'e', 's', 't', 'I', 'd', 'I', 'n', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', '\022', '\264', +'\001', '\n', '\033', 'f', 'o', 'r', 'w', 'a', 'r', 'd', '_', 'c', 'l', 'i', 'e', 'n', 't', '_', 'c', 'e', 'r', 't', '_', 'd', 'e', +'t', 'a', 'i', 'l', 's', '\030', '\020', ' ', '\001', '(', '\016', '2', 'k', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '3', '.', 'H', -'t', 't', 'p', 'F', 'i', 'l', 't', 'e', 'r', 'R', '\007', 'f', 'i', 'l', 't', 'e', 'r', 's', '\022', '4', '\n', '\007', 'e', 'n', 'a', -'b', 'l', 'e', 'd', '\030', '\003', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', -'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\007', 'e', 'n', 'a', 'b', 'l', 'e', 'd', ':', 'a', '\232', -'\305', '\210', '\036', '\\', '\n', 'Z', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', +'t', 't', 'p', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'M', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'F', 'o', 'r', 'w', +'a', 'r', 'd', 'C', 'l', 'i', 'e', 'n', 't', 'C', 'e', 'r', 't', 'D', 'e', 't', 'a', 'i', 'l', 's', 'B', '\010', '\372', 'B', '\005', +'\202', '\001', '\002', '\020', '\001', 'R', '\030', 'f', 'o', 'r', 'w', 'a', 'r', 'd', 'C', 'l', 'i', 'e', 'n', 't', 'C', 'e', 'r', 't', 'D', +'e', 't', 'a', 'i', 'l', 's', '\022', '\264', '\001', '\n', '\037', 's', 'e', 't', '_', 'c', 'u', 'r', 'r', 'e', 'n', 't', '_', 'c', 'l', +'i', 'e', 'n', 't', '_', 'c', 'e', 'r', 't', '_', 'd', 'e', 't', 'a', 'i', 'l', 's', '\030', '\021', ' ', '\001', '(', '\013', '2', 'n', +'.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', -'m', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '2', '.', 'H', 't', 't', 'p', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', -'M', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'U', 'p', 'g', 'r', 'a', 'd', 'e', 'C', 'o', 'n', 'f', 'i', 'g', '\"', '6', '\n', '\t', -'C', 'o', 'd', 'e', 'c', 'T', 'y', 'p', 'e', '\022', '\010', '\n', '\004', 'A', 'U', 'T', 'O', '\020', '\000', '\022', '\t', '\n', '\005', 'H', 'T', -'T', 'P', '1', '\020', '\001', '\022', '\t', '\n', '\005', 'H', 'T', 'T', 'P', '2', '\020', '\002', '\022', '\t', '\n', '\005', 'H', 'T', 'T', 'P', '3', -'\020', '\003', '\"', 'S', '\n', '\032', 'S', 'e', 'r', 'v', 'e', 'r', 'H', 'e', 'a', 'd', 'e', 'r', 'T', 'r', 'a', 'n', 's', 'f', 'o', -'r', 'm', 'a', 't', 'i', 'o', 'n', '\022', '\r', '\n', '\t', 'O', 'V', 'E', 'R', 'W', 'R', 'I', 'T', 'E', '\020', '\000', '\022', '\024', '\n', -'\020', 'A', 'P', 'P', 'E', 'N', 'D', '_', 'I', 'F', '_', 'A', 'B', 'S', 'E', 'N', 'T', '\020', '\001', '\022', '\020', '\n', '\014', 'P', 'A', -'S', 'S', '_', 'T', 'H', 'R', 'O', 'U', 'G', 'H', '\020', '\002', '\"', 'y', '\n', '\030', 'F', 'o', 'r', 'w', 'a', 'r', 'd', 'C', 'l', -'i', 'e', 'n', 't', 'C', 'e', 'r', 't', 'D', 'e', 't', 'a', 'i', 'l', 's', '\022', '\014', '\n', '\010', 'S', 'A', 'N', 'I', 'T', 'I', -'Z', 'E', '\020', '\000', '\022', '\020', '\n', '\014', 'F', 'O', 'R', 'W', 'A', 'R', 'D', '_', 'O', 'N', 'L', 'Y', '\020', '\001', '\022', '\022', '\n', -'\016', 'A', 'P', 'P', 'E', 'N', 'D', '_', 'F', 'O', 'R', 'W', 'A', 'R', 'D', '\020', '\002', '\022', '\020', '\n', '\014', 'S', 'A', 'N', 'I', -'T', 'I', 'Z', 'E', '_', 'S', 'E', 'T', '\020', '\003', '\022', '\027', '\n', '\023', 'A', 'L', 'W', 'A', 'Y', 'S', '_', 'F', 'O', 'R', 'W', -'A', 'R', 'D', '_', 'O', 'N', 'L', 'Y', '\020', '\004', ':', 'S', '\232', '\305', '\210', '\036', 'N', '\n', 'L', 'e', 'n', 'v', 'o', 'y', '.', -'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', -'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '2', '.', 'H', -'t', 't', 'p', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'M', 'a', 'n', 'a', 'g', 'e', 'r', 'B', '\026', '\n', '\017', 'r', -'o', 'u', 't', 'e', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', '\001', 'J', '\004', '\010', '\033', '\020', '\034', -'J', '\004', '\010', '\013', '\020', '\014', 'R', '\014', 'i', 'd', 'l', 'e', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '\"', '\312', '\001', '\n', '\020', -'L', 'o', 'c', 'a', 'l', 'R', 'e', 'p', 'l', 'y', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'e', '\n', '\007', 'm', 'a', 'p', 'p', 'e', -'r', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', 'K', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', -'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', -'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '3', '.', 'R', 'e', 's', 'p', -'o', 'n', 's', 'e', 'M', 'a', 'p', 'p', 'e', 'r', 'R', '\007', 'm', 'a', 'p', 'p', 'e', 'r', 's', '\022', 'O', '\n', '\013', 'b', 'o', -'d', 'y', '_', 'f', 'o', 'r', 'm', 'a', 't', '\030', '\002', ' ', '\001', '(', '\013', '2', '.', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', -'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'S', 'u', 'b', 's', 't', 'i', 't', 'u', 't', 'i', 'o', -'n', 'F', 'o', 'r', 'm', 'a', 't', 'S', 't', 'r', 'i', 'n', 'g', 'R', '\n', 'b', 'o', 'd', 'y', 'F', 'o', 'r', 'm', 'a', 't', -'\"', '\234', '\003', '\n', '\016', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'M', 'a', 'p', 'p', 'e', 'r', '\022', 'L', '\n', '\006', 'f', 'i', -'l', 't', 'e', 'r', '\030', '\001', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', -'.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', 'v', '3', '.', 'A', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 'F', 'i', -'l', 't', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\006', 'f', 'i', 'l', 't', 'e', 'r', '\022', 'J', '\n', -'\013', 's', 't', 'a', 't', 'u', 's', '_', 'c', 'o', 'd', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', -'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\013', -'\372', 'B', '\010', '*', '\006', '\020', '\330', '\004', '(', '\310', '\001', 'R', '\n', 's', 't', 'a', 't', 'u', 's', 'C', 'o', 'd', 'e', '\022', '4', -'\n', '\004', 'b', 'o', 'd', 'y', '\030', '\003', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', -'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', 'R', '\004', 'b', 'o', -'d', 'y', '\022', '`', '\n', '\024', 'b', 'o', 'd', 'y', '_', 'f', 'o', 'r', 'm', 'a', 't', '_', 'o', 'v', 'e', 'r', 'r', 'i', 'd', -'e', '\030', '\004', ' ', '\001', '(', '\013', '2', '.', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', -'r', 'e', '.', 'v', '3', '.', 'S', 'u', 'b', 's', 't', 'i', 't', 'u', 't', 'i', 'o', 'n', 'F', 'o', 'r', 'm', 'a', 't', 'S', -'t', 'r', 'i', 'n', 'g', 'R', '\022', 'b', 'o', 'd', 'y', 'F', 'o', 'r', 'm', 'a', 't', 'O', 'v', 'e', 'r', 'r', 'i', 'd', 'e', -'\022', 'X', '\n', '\016', 'h', 'e', 'a', 'd', 'e', 'r', 's', '_', 't', 'o', '_', 'a', 'd', 'd', '\030', '\005', ' ', '\003', '(', '\013', '2', -'\'', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 'e', -'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'O', 'p', 't', 'i', 'o', 'n', 'B', '\t', '\372', 'B', '\006', '\222', '\001', '\003', '\020', '\350', -'\007', 'R', '\014', 'h', 'e', 'a', 'd', 'e', 'r', 's', 'T', 'o', 'A', 'd', 'd', '\"', '\310', '\002', '\n', '\003', 'R', 'd', 's', '\022', 'Q', -'\n', '\r', 'c', 'o', 'n', 'f', 'i', 'g', '_', 's', 'o', 'u', 'r', 'c', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '\"', '.', 'e', -'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'C', 'o', 'n', 'f', 'i', -'g', 'S', 'o', 'u', 'r', 'c', 'e', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\014', 'c', 'o', 'n', 'f', 'i', 'g', -'S', 'o', 'u', 'r', 'c', 'e', '\022', 'B', '\n', '\021', 'r', 'o', 'u', 't', 'e', '_', 'c', 'o', 'n', 'f', 'i', 'g', '_', 'n', 'a', -'m', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'B', '\026', '\362', '\230', '\376', '\217', '\005', '\020', '\022', '\016', 'n', 'a', 'm', 'e', '_', 's', 'p', -'e', 'c', 'i', 'f', 'i', 'e', 'r', 'R', '\017', 'r', 'o', 'u', 't', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 'N', 'a', 'm', 'e', '\022', -'g', '\n', '\024', 'r', 'd', 's', '_', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', '_', 'l', 'o', 'c', 'a', 't', 'o', 'r', '\030', '\003', -' ', '\001', '(', '\013', '2', '\035', '.', 'u', 'd', 'p', 'a', '.', 'c', 'o', 'r', 'e', '.', 'v', '1', '.', 'R', 'e', 's', 'o', 'u', -'r', 'c', 'e', 'L', 'o', 'c', 'a', 't', 'o', 'r', 'B', '\026', '\362', '\230', '\376', '\217', '\005', '\020', '\022', '\016', 'n', 'a', 'm', 'e', '_', -'s', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'R', '\022', 'r', 'd', 's', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', 'L', 'o', 'c', -'a', 't', 'o', 'r', ':', 'A', '\232', '\305', '\210', '\036', '<', '\n', ':', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', -'.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', -'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '2', '.', 'R', 'd', 's', '\"', '\367', '\001', '\n', -'\035', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 'u', 'r', 'a', 't', 'i', 'o', 'n', -'s', 'L', 'i', 's', 't', '\022', 'y', '\n', '\033', 's', 'c', 'o', 'p', 'e', 'd', '_', 'r', 'o', 'u', 't', 'e', '_', 'c', 'o', 'n', -'f', 'i', 'g', 'u', 'r', 'a', 't', 'i', 'o', 'n', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '/', '.', 'e', 'n', 'v', 'o', 'y', -'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'o', -'u', 't', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', -'\001', 'R', '\031', 's', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 'u', 'r', 'a', 't', 'i', -'o', 'n', 's', ':', '[', '\232', '\305', '\210', '\036', 'V', '\n', 'T', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', -'f', 'i', 'l', 't', 'e', 'r', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', -'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '2', '.', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'o', -'u', 't', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 'u', 'r', 'a', 't', 'i', 'o', 'n', 's', 'L', 'i', 's', 't', '\"', '\351', '\016', '\n', -'\014', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 's', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', -'(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '\217', '\001', '\n', '\021', 's', 'c', 'o', -'p', 'e', '_', 'k', 'e', 'y', '_', 'b', 'u', 'i', 'l', 'd', 'e', 'r', '\030', '\002', ' ', '\001', '(', '\013', '2', 'Y', '.', 'e', 'n', -'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'n', 'e', -'t', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', -'a', 'g', 'e', 'r', '.', 'v', '3', '.', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 's', '.', 'S', 'c', 'o', 'p', -'e', 'K', 'e', 'y', 'B', 'u', 'i', 'l', 'd', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\017', 's', 'c', -'o', 'p', 'e', 'K', 'e', 'y', 'B', 'u', 'i', 'l', 'd', 'e', 'r', '\022', 'X', '\n', '\021', 'r', 'd', 's', '_', 'c', 'o', 'n', 'f', -'i', 'g', '_', 's', 'o', 'u', 'r', 'c', 'e', '\030', '\003', ' ', '\001', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', -'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', -'e', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\017', 'r', 'd', 's', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', -'r', 'c', 'e', '\022', '\245', '\001', '\n', ' ', 's', 'c', 'o', 'p', 'e', 'd', '_', 'r', 'o', 'u', 't', 'e', '_', 'c', 'o', 'n', 'f', -'i', 'g', 'u', 'r', 'a', 't', 'i', 'o', 'n', 's', '_', 'l', 'i', 's', 't', '\030', '\004', ' ', '\001', '(', '\013', '2', 'Z', '.', 'e', -'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'n', -'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', -'n', 'a', 'g', 'e', 'r', '.', 'v', '3', '.', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 'C', 'o', 'n', 'f', 'i', -'g', 'u', 'r', 'a', 't', 'i', 'o', 'n', 's', 'L', 'i', 's', 't', 'H', '\000', 'R', '\035', 's', 'c', 'o', 'p', 'e', 'd', 'R', 'o', -'u', 't', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 'u', 'r', 'a', 't', 'i', 'o', 'n', 's', 'L', 'i', 's', 't', '\022', 'g', '\n', '\n', -'s', 'c', 'o', 'p', 'e', 'd', '_', 'r', 'd', 's', '\030', '\005', ' ', '\001', '(', '\013', '2', 'F', '.', 'e', 'n', 'v', 'o', 'y', '.', -'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'n', 'e', 't', 'w', 'o', 'r', -'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', -'.', 'v', '3', '.', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'd', 's', 'H', '\000', 'R', '\t', 's', 'c', 'o', 'p', 'e', 'd', 'R', 'd', -'s', '\032', '\331', '\t', '\n', '\017', 'S', 'c', 'o', 'p', 'e', 'K', 'e', 'y', 'B', 'u', 'i', 'l', 'd', 'e', 'r', '\022', '\221', '\001', '\n', -'\t', 'f', 'r', 'a', 'g', 'm', 'e', 'n', 't', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', 'i', '.', 'e', 'n', 'v', 'o', 'y', '.', -'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'n', 'e', 't', 'w', 'o', 'r', -'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', -'.', 'v', '3', '.', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 's', '.', 'S', 'c', 'o', 'p', 'e', 'K', 'e', 'y', -'B', 'u', 'i', 'l', 'd', 'e', 'r', '.', 'F', 'r', 'a', 'g', 'm', 'e', 'n', 't', 'B', 'u', 'i', 'l', 'd', 'e', 'r', 'B', '\010', -'\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', 'R', '\t', 'f', 'r', 'a', 'g', 'm', 'e', 'n', 't', 's', '\032', '\325', '\007', '\n', '\017', 'F', -'r', 'a', 'g', 'm', 'e', 'n', 't', 'B', 'u', 'i', 'l', 'd', 'e', 'r', '\022', '\266', '\001', '\n', '\026', 'h', 'e', 'a', 'd', 'e', 'r', -'_', 'v', 'a', 'l', 'u', 'e', '_', 'e', 'x', 't', 'r', 'a', 'c', 't', 'o', 'r', '\030', '\001', ' ', '\001', '(', '\013', '2', '~', '.', +'m', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '3', '.', 'H', 't', 't', 'p', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', +'M', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'S', 'e', 't', 'C', 'u', 'r', 'r', 'e', 'n', 't', 'C', 'l', 'i', 'e', 'n', 't', 'C', +'e', 'r', 't', 'D', 'e', 't', 'a', 'i', 'l', 's', 'R', '\033', 's', 'e', 't', 'C', 'u', 'r', 'r', 'e', 'n', 't', 'C', 'l', 'i', +'e', 'n', 't', 'C', 'e', 'r', 't', 'D', 'e', 't', 'a', 'i', 'l', 's', '\022', ',', '\n', '\022', 'p', 'r', 'o', 'x', 'y', '_', '1', +'0', '0', '_', 'c', 'o', 'n', 't', 'i', 'n', 'u', 'e', '\030', '\022', ' ', '\001', '(', '\010', 'R', '\020', 'p', 'r', 'o', 'x', 'y', '1', +'0', '0', 'C', 'o', 'n', 't', 'i', 'n', 'u', 'e', '\022', 'e', '\n', '1', 'r', 'e', 'p', 'r', 'e', 's', 'e', 'n', 't', '_', 'i', +'p', 'v', '4', '_', 'r', 'e', 'm', 'o', 't', 'e', '_', 'a', 'd', 'd', 'r', 'e', 's', 's', '_', 'a', 's', '_', 'i', 'p', 'v', +'4', '_', 'm', 'a', 'p', 'p', 'e', 'd', '_', 'i', 'p', 'v', '6', '\030', '\024', ' ', '\001', '(', '\010', 'R', '*', 'r', 'e', 'p', 'r', +'e', 's', 'e', 'n', 't', 'I', 'p', 'v', '4', 'R', 'e', 'm', 'o', 't', 'e', 'A', 'd', 'd', 'r', 'e', 's', 's', 'A', 's', 'I', +'p', 'v', '4', 'M', 'a', 'p', 'p', 'e', 'd', 'I', 'p', 'v', '6', '\022', '\211', '\001', '\n', '\017', 'u', 'p', 'g', 'r', 'a', 'd', 'e', +'_', 'c', 'o', 'n', 'f', 'i', 'g', 's', '\030', '\027', ' ', '\003', '(', '\013', '2', '`', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', +'t', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', +'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', +'3', '.', 'H', 't', 't', 'p', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'M', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'U', +'p', 'g', 'r', 'a', 'd', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\016', 'u', 'p', 'g', 'r', 'a', 'd', 'e', 'C', 'o', 'n', 'f', +'i', 'g', 's', '\022', 'A', '\n', '\016', 'n', 'o', 'r', 'm', 'a', 'l', 'i', 'z', 'e', '_', 'p', 'a', 't', 'h', '\030', '\036', ' ', '\001', +'(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', +'V', 'a', 'l', 'u', 'e', 'R', '\r', 'n', 'o', 'r', 'm', 'a', 'l', 'i', 'z', 'e', 'P', 'a', 't', 'h', '\022', '#', '\n', '\r', 'm', +'e', 'r', 'g', 'e', '_', 's', 'l', 'a', 's', 'h', 'e', 's', '\030', '!', ' ', '\001', '(', '\010', 'R', '\014', 'm', 'e', 'r', 'g', 'e', +'S', 'l', 'a', 's', 'h', 'e', 's', '\022', '\201', '\001', '\n', '\024', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'i', 'd', '_', 'e', 'x', +'t', 'e', 'n', 's', 'i', 'o', 'n', '\030', '$', ' ', '\001', '(', '\013', '2', 'O', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', +'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', +'t', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '3', +'.', 'R', 'e', 'q', 'u', 'e', 's', 't', 'I', 'D', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'R', '\022', 'r', 'e', 'q', 'u', +'e', 's', 't', 'I', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '\022', '{', '\n', '\022', 'l', 'o', 'c', 'a', 'l', '_', 'r', +'e', 'p', 'l', 'y', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '&', ' ', '\001', '(', '\013', '2', 'M', '.', 'e', 'n', 'v', 'o', 'y', +'.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'n', 'e', 't', 'w', 'o', +'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', +'r', '.', 'v', '3', '.', 'L', 'o', 'c', 'a', 'l', 'R', 'e', 'p', 'l', 'y', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\020', 'l', 'o', +'c', 'a', 'l', 'R', 'e', 'p', 'l', 'y', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'P', '\n', '\030', 's', 't', 'r', 'i', 'p', '_', 'm', +'a', 't', 'c', 'h', 'i', 'n', 'g', '_', 'h', 'o', 's', 't', '_', 'p', 'o', 'r', 't', '\030', '\'', ' ', '\001', '(', '\010', 'B', '\027', +'\362', '\230', '\376', '\217', '\005', '\021', '\022', '\017', 's', 't', 'r', 'i', 'p', '_', 'p', 'o', 'r', 't', '_', 'm', 'o', 'd', 'e', 'R', '\025', +'s', 't', 'r', 'i', 'p', 'M', 'a', 't', 'c', 'h', 'i', 'n', 'g', 'H', 'o', 's', 't', 'P', 'o', 'r', 't', '\022', '/', '\n', '\023', +'s', 't', 'r', 'i', 'p', '_', 'a', 'n', 'y', '_', 'h', 'o', 's', 't', '_', 'p', 'o', 'r', 't', '\030', '*', ' ', '\001', '(', '\010', +'H', '\001', 'R', '\020', 's', 't', 'r', 'i', 'p', 'A', 'n', 'y', 'H', 'o', 's', 't', 'P', 'o', 'r', 't', '\022', 'i', '\n', '$', 's', +'t', 'r', 'e', 'a', 'm', '_', 'e', 'r', 'r', 'o', 'r', '_', 'o', 'n', '_', 'i', 'n', 'v', 'a', 'l', 'i', 'd', '_', 'h', 't', +'t', 'p', '_', 'm', 'e', 's', 's', 'a', 'g', 'e', '\030', '(', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', +'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\037', 's', 't', 'r', 'e', +'a', 'm', 'E', 'r', 'r', 'o', 'r', 'O', 'n', 'I', 'n', 'v', 'a', 'l', 'i', 'd', 'H', 't', 't', 'p', 'M', 'e', 's', 's', 'a', +'g', 'e', '\032', '\366', '\004', '\n', '\007', 'T', 'r', 'a', 'c', 'i', 'n', 'g', '\022', '?', '\n', '\017', 'c', 'l', 'i', 'e', 'n', 't', '_', +'s', 'a', 'm', 'p', 'l', 'i', 'n', 'g', '\030', '\003', ' ', '\001', '(', '\013', '2', '\026', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', +'p', 'e', '.', 'v', '3', '.', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', '\016', 'c', 'l', 'i', 'e', 'n', 't', 'S', 'a', 'm', 'p', +'l', 'i', 'n', 'g', '\022', '?', '\n', '\017', 'r', 'a', 'n', 'd', 'o', 'm', '_', 's', 'a', 'm', 'p', 'l', 'i', 'n', 'g', '\030', '\004', +' ', '\001', '(', '\013', '2', '\026', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'P', 'e', 'r', 'c', +'e', 'n', 't', 'R', '\016', 'r', 'a', 'n', 'd', 'o', 'm', 'S', 'a', 'm', 'p', 'l', 'i', 'n', 'g', '\022', 'A', '\n', '\020', 'o', 'v', +'e', 'r', 'a', 'l', 'l', '_', 's', 'a', 'm', 'p', 'l', 'i', 'n', 'g', '\030', '\005', ' ', '\001', '(', '\013', '2', '\026', '.', 'e', 'n', +'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '.', 'P', 'e', 'r', 'c', 'e', 'n', 't', 'R', '\017', 'o', 'v', 'e', 'r', +'a', 'l', 'l', 'S', 'a', 'm', 'p', 'l', 'i', 'n', 'g', '\022', '\030', '\n', '\007', 'v', 'e', 'r', 'b', 'o', 's', 'e', '\030', '\006', ' ', +'\001', '(', '\010', 'R', '\007', 'v', 'e', 'r', 'b', 'o', 's', 'e', '\022', 'K', '\n', '\023', 'm', 'a', 'x', '_', 'p', 'a', 't', 'h', '_', +'t', 'a', 'g', '_', 'l', 'e', 'n', 'g', 't', 'h', '\030', '\007', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', +'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\020', 'm', 'a', +'x', 'P', 'a', 't', 'h', 'T', 'a', 'g', 'L', 'e', 'n', 'g', 't', 'h', '\022', 'A', '\n', '\013', 'c', 'u', 's', 't', 'o', 'm', '_', +'t', 'a', 'g', 's', '\030', '\010', ' ', '\003', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 't', +'r', 'a', 'c', 'i', 'n', 'g', '.', 'v', '3', '.', 'C', 'u', 's', 't', 'o', 'm', 'T', 'a', 'g', 'R', '\n', 'c', 'u', 's', 't', +'o', 'm', 'T', 'a', 'g', 's', '\022', '?', '\n', '\010', 'p', 'r', 'o', 'v', 'i', 'd', 'e', 'r', '\030', '\t', ' ', '\001', '(', '\013', '2', +'#', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 't', 'r', 'a', 'c', 'e', '.', 'v', '3', '.', 'T', +'r', 'a', 'c', 'i', 'n', 'g', '.', 'H', 't', 't', 'p', 'R', '\010', 'p', 'r', 'o', 'v', 'i', 'd', 'e', 'r', '\"', '(', '\n', '\r', +'O', 'p', 'e', 'r', 'a', 't', 'i', 'o', 'n', 'N', 'a', 'm', 'e', '\022', '\013', '\n', '\007', 'I', 'N', 'G', 'R', 'E', 'S', 'S', '\020', +'\000', '\022', '\n', '\n', '\006', 'E', 'G', 'R', 'E', 'S', 'S', '\020', '\001', ':', '[', '\232', '\305', '\210', '\036', 'V', '\n', 'T', 'e', 'n', 'v', +'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', +'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', +'2', '.', 'H', 't', 't', 'p', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'M', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'T', +'r', 'a', 'c', 'i', 'n', 'g', 'J', '\004', '\010', '\001', '\020', '\002', 'J', '\004', '\010', '\002', '\020', '\003', 'R', '\016', 'o', 'p', 'e', 'r', 'a', +'t', 'i', 'o', 'n', '_', 'n', 'a', 'm', 'e', 'R', '\030', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 'h', 'e', 'a', 'd', 'e', 'r', +'s', '_', 'f', 'o', 'r', '_', 't', 'a', 'g', 's', '\032', '\245', '\001', '\n', '\025', 'I', 'n', 't', 'e', 'r', 'n', 'a', 'l', 'A', 'd', +'d', 'r', 'e', 's', 's', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '!', '\n', '\014', 'u', 'n', 'i', 'x', '_', 's', 'o', 'c', 'k', 'e', +'t', 's', '\030', '\001', ' ', '\001', '(', '\010', 'R', '\013', 'u', 'n', 'i', 'x', 'S', 'o', 'c', 'k', 'e', 't', 's', ':', 'i', '\232', '\305', +'\210', '\036', 'd', '\n', 'b', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', +'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', +'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '2', '.', 'H', 't', 't', 'p', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'M', +'a', 'n', 'a', 'g', 'e', 'r', '.', 'I', 'n', 't', 'e', 'r', 'n', 'a', 'l', 'A', 'd', 'd', 'r', 'e', 's', 's', 'C', 'o', 'n', +'f', 'i', 'g', '\032', '\230', '\002', '\n', '\033', 'S', 'e', 't', 'C', 'u', 'r', 'r', 'e', 'n', 't', 'C', 'l', 'i', 'e', 'n', 't', 'C', +'e', 'r', 't', 'D', 'e', 't', 'a', 'i', 'l', 's', '\022', '4', '\n', '\007', 's', 'u', 'b', 'j', 'e', 'c', 't', '\030', '\001', ' ', '\001', +'(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', +'V', 'a', 'l', 'u', 'e', 'R', '\007', 's', 'u', 'b', 'j', 'e', 'c', 't', '\022', '\022', '\n', '\004', 'c', 'e', 'r', 't', '\030', '\003', ' ', +'\001', '(', '\010', 'R', '\004', 'c', 'e', 'r', 't', '\022', '\024', '\n', '\005', 'c', 'h', 'a', 'i', 'n', '\030', '\006', ' ', '\001', '(', '\010', 'R', +'\005', 'c', 'h', 'a', 'i', 'n', '\022', '\020', '\n', '\003', 'd', 'n', 's', '\030', '\004', ' ', '\001', '(', '\010', 'R', '\003', 'd', 'n', 's', '\022', +'\020', '\n', '\003', 'u', 'r', 'i', '\030', '\005', ' ', '\001', '(', '\010', 'R', '\003', 'u', 'r', 'i', ':', 'o', '\232', '\305', '\210', '\036', 'j', '\n', +'h', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'n', 'e', 't', 'w', +'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', +'e', 'r', '.', 'v', '2', '.', 'H', 't', 't', 'p', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'M', 'a', 'n', 'a', 'g', +'e', 'r', '.', 'S', 'e', 't', 'C', 'u', 'r', 'r', 'e', 'n', 't', 'C', 'l', 'i', 'e', 'n', 't', 'C', 'e', 'r', 't', 'D', 'e', +'t', 'a', 'i', 'l', 's', 'J', '\004', '\010', '\002', '\020', '\003', '\032', '\256', '\002', '\n', '\r', 'U', 'p', 'g', 'r', 'a', 'd', 'e', 'C', 'o', +'n', 'f', 'i', 'g', '\022', '!', '\n', '\014', 'u', 'p', 'g', 'r', 'a', 'd', 'e', '_', 't', 'y', 'p', 'e', '\030', '\001', ' ', '\001', '(', +'\t', 'R', '\013', 'u', 'p', 'g', 'r', 'a', 'd', 'e', 'T', 'y', 'p', 'e', '\022', 'a', '\n', '\007', 'f', 'i', 'l', 't', 'e', 'r', 's', +'\030', '\002', ' ', '\003', '(', '\013', '2', 'G', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', +'.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', +'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '3', '.', 'H', 't', 't', 'p', 'F', 'i', +'l', 't', 'e', 'r', 'R', '\007', 'f', 'i', 'l', 't', 'e', 'r', 's', '\022', '4', '\n', '\007', 'e', 'n', 'a', 'b', 'l', 'e', 'd', '\030', +'\003', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', +'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '\007', 'e', 'n', 'a', 'b', 'l', 'e', 'd', ':', 'a', '\232', '\305', '\210', '\036', '\\', '\n', +'Z', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'n', 'e', 't', 'w', +'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', +'e', 'r', '.', 'v', '2', '.', 'H', 't', 't', 'p', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'M', 'a', 'n', 'a', 'g', +'e', 'r', '.', 'U', 'p', 'g', 'r', 'a', 'd', 'e', 'C', 'o', 'n', 'f', 'i', 'g', '\"', '6', '\n', '\t', 'C', 'o', 'd', 'e', 'c', +'T', 'y', 'p', 'e', '\022', '\010', '\n', '\004', 'A', 'U', 'T', 'O', '\020', '\000', '\022', '\t', '\n', '\005', 'H', 'T', 'T', 'P', '1', '\020', '\001', +'\022', '\t', '\n', '\005', 'H', 'T', 'T', 'P', '2', '\020', '\002', '\022', '\t', '\n', '\005', 'H', 'T', 'T', 'P', '3', '\020', '\003', '\"', 'S', '\n', +'\032', 'S', 'e', 'r', 'v', 'e', 'r', 'H', 'e', 'a', 'd', 'e', 'r', 'T', 'r', 'a', 'n', 's', 'f', 'o', 'r', 'm', 'a', 't', 'i', +'o', 'n', '\022', '\r', '\n', '\t', 'O', 'V', 'E', 'R', 'W', 'R', 'I', 'T', 'E', '\020', '\000', '\022', '\024', '\n', '\020', 'A', 'P', 'P', 'E', +'N', 'D', '_', 'I', 'F', '_', 'A', 'B', 'S', 'E', 'N', 'T', '\020', '\001', '\022', '\020', '\n', '\014', 'P', 'A', 'S', 'S', '_', 'T', 'H', +'R', 'O', 'U', 'G', 'H', '\020', '\002', '\"', 'y', '\n', '\030', 'F', 'o', 'r', 'w', 'a', 'r', 'd', 'C', 'l', 'i', 'e', 'n', 't', 'C', +'e', 'r', 't', 'D', 'e', 't', 'a', 'i', 'l', 's', '\022', '\014', '\n', '\010', 'S', 'A', 'N', 'I', 'T', 'I', 'Z', 'E', '\020', '\000', '\022', +'\020', '\n', '\014', 'F', 'O', 'R', 'W', 'A', 'R', 'D', '_', 'O', 'N', 'L', 'Y', '\020', '\001', '\022', '\022', '\n', '\016', 'A', 'P', 'P', 'E', +'N', 'D', '_', 'F', 'O', 'R', 'W', 'A', 'R', 'D', '\020', '\002', '\022', '\020', '\n', '\014', 'S', 'A', 'N', 'I', 'T', 'I', 'Z', 'E', '_', +'S', 'E', 'T', '\020', '\003', '\022', '\027', '\n', '\023', 'A', 'L', 'W', 'A', 'Y', 'S', '_', 'F', 'O', 'R', 'W', 'A', 'R', 'D', '_', 'O', +'N', 'L', 'Y', '\020', '\004', ':', 'S', '\232', '\305', '\210', '\036', 'N', '\n', 'L', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', +'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', +'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '2', '.', 'H', 't', 't', 'p', 'C', 'o', +'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'M', 'a', 'n', 'a', 'g', 'e', 'r', 'B', '\026', '\n', '\017', 'r', 'o', 'u', 't', 'e', '_', +'s', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', '\001', 'B', '\021', '\n', '\017', 's', 't', 'r', 'i', 'p', '_', 'p', +'o', 'r', 't', '_', 'm', 'o', 'd', 'e', 'J', '\004', '\010', '\033', '\020', '\034', 'J', '\004', '\010', '\013', '\020', '\014', 'R', '\014', 'i', 'd', 'l', +'e', '_', 't', 'i', 'm', 'e', 'o', 'u', 't', '\"', '\312', '\001', '\n', '\020', 'L', 'o', 'c', 'a', 'l', 'R', 'e', 'p', 'l', 'y', 'C', +'o', 'n', 'f', 'i', 'g', '\022', 'e', '\n', '\007', 'm', 'a', 'p', 'p', 'e', 'r', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', 'K', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', -'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '3', '.', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 's', '.', 'S', 'c', -'o', 'p', 'e', 'K', 'e', 'y', 'B', 'u', 'i', 'l', 'd', 'e', 'r', '.', 'F', 'r', 'a', 'g', 'm', 'e', 'n', 't', 'B', 'u', 'i', -'l', 'd', 'e', 'r', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'E', 'x', 't', 'r', 'a', 'c', 't', 'o', 'r', -'H', '\000', 'R', '\024', 'h', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'E', 'x', 't', 'r', 'a', 'c', 't', 'o', 'r', '\032', -'\217', '\005', '\n', '\024', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'E', 'x', 't', 'r', 'a', 'c', 't', 'o', 'r', '\022', -'\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', -'a', 'm', 'e', '\022', '+', '\n', '\021', 'e', 'l', 'e', 'm', 'e', 'n', 't', '_', 's', 'e', 'p', 'a', 'r', 'a', 't', 'o', 'r', '\030', -'\002', ' ', '\001', '(', '\t', 'R', '\020', 'e', 'l', 'e', 'm', 'e', 'n', 't', 'S', 'e', 'p', 'a', 'r', 'a', 't', 'o', 'r', '\022', '\026', -'\n', '\005', 'i', 'n', 'd', 'e', 'x', '\030', '\003', ' ', '\001', '(', '\r', 'H', '\000', 'R', '\005', 'i', 'n', 'd', 'e', 'x', '\022', '\245', '\001', -'\n', '\007', 'e', 'l', 'e', 'm', 'e', 'n', 't', '\030', '\004', ' ', '\001', '(', '\013', '2', '\210', '\001', '.', 'e', 'n', 'v', 'o', 'y', '.', -'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'n', 'e', 't', 'w', 'o', 'r', -'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', -'.', 'v', '3', '.', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 's', '.', 'S', 'c', 'o', 'p', 'e', 'K', 'e', 'y', -'B', 'u', 'i', 'l', 'd', 'e', 'r', '.', 'F', 'r', 'a', 'g', 'm', 'e', 'n', 't', 'B', 'u', 'i', 'l', 'd', 'e', 'r', '.', 'H', -'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'E', 'x', 't', 'r', 'a', 'c', 't', 'o', 'r', '.', 'K', 'v', 'E', 'l', 'e', -'m', 'e', 'n', 't', 'H', '\000', 'R', '\007', 'e', 'l', 'e', 'm', 'e', 'n', 't', '\032', '\333', '\001', '\n', '\t', 'K', 'v', 'E', 'l', 'e', -'m', 'e', 'n', 't', '\022', '%', '\n', '\t', 's', 'e', 'p', 'a', 'r', 'a', 't', 'o', 'r', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', -'\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\t', 's', 'e', 'p', 'a', 'r', 'a', 't', 'o', 'r', '\022', '\031', '\n', '\003', 'k', 'e', 'y', -'\030', '\002', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\003', 'k', 'e', 'y', ':', '\213', '\001', '\232', '\305', -'\210', '\036', '\205', '\001', '\n', '\202', '\001', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', -'r', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', -'_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '2', '.', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 's', '.', -'S', 'c', 'o', 'p', 'e', 'K', 'e', 'y', 'B', 'u', 'i', 'l', 'd', 'e', 'r', '.', 'F', 'r', 'a', 'g', 'm', 'e', 'n', 't', 'B', -'u', 'i', 'l', 'd', 'e', 'r', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'E', 'x', 't', 'r', 'a', 'c', 't', -'o', 'r', '.', 'K', 'v', 'E', 'l', 'e', 'm', 'e', 'n', 't', ':', '\177', '\232', '\305', '\210', '\036', 'z', '\n', 'x', 'e', 'n', 'v', 'o', -'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', -'t', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '2', -'.', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 's', '.', 'S', 'c', 'o', 'p', 'e', 'K', 'e', 'y', 'B', 'u', 'i', -'l', 'd', 'e', 'r', '.', 'F', 'r', 'a', 'g', 'm', 'e', 'n', 't', 'B', 'u', 'i', 'l', 'd', 'e', 'r', '.', 'H', 'e', 'a', 'd', -'e', 'r', 'V', 'a', 'l', 'u', 'e', 'E', 'x', 't', 'r', 'a', 'c', 't', 'o', 'r', 'B', '\016', '\n', '\014', 'e', 'x', 't', 'r', 'a', -'c', 't', '_', 't', 'y', 'p', 'e', ':', 'j', '\232', '\305', '\210', '\036', 'e', '\n', 'c', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', -'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', -'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '2', '.', 'S', 'c', 'o', 'p', -'e', 'd', 'R', 'o', 'u', 't', 'e', 's', '.', 'S', 'c', 'o', 'p', 'e', 'K', 'e', 'y', 'B', 'u', 'i', 'l', 'd', 'e', 'r', '.', -'F', 'r', 'a', 'g', 'm', 'e', 'n', 't', 'B', 'u', 'i', 'l', 'd', 'e', 'r', 'B', '\013', '\n', '\004', 't', 'y', 'p', 'e', '\022', '\003', -'\370', 'B', '\001', ':', 'Z', '\232', '\305', '\210', '\036', 'U', '\n', 'S', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', -'f', 'i', 'l', 't', 'e', 'r', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', -'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '2', '.', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'o', -'u', 't', 'e', 's', '.', 'S', 'c', 'o', 'p', 'e', 'K', 'e', 'y', 'B', 'u', 'i', 'l', 'd', 'e', 'r', ':', 'J', '\232', '\305', '\210', -'\036', 'E', '\n', 'C', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'n', -'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', -'n', 'a', 'g', 'e', 'r', '.', 'v', '2', '.', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 's', 'B', '\027', '\n', '\020', -'c', 'o', 'n', 'f', 'i', 'g', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', '\001', '\"', '\273', '\001', '\n', -'\t', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'd', 's', '\022', 'e', '\n', '\030', 's', 'c', 'o', 'p', 'e', 'd', '_', 'r', 'd', 's', '_', -'c', 'o', 'n', 'f', 'i', 'g', '_', 's', 'o', 'u', 'r', 'c', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', -'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'C', 'o', 'n', 'f', 'i', 'g', 'S', -'o', 'u', 'r', 'c', 'e', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\025', 's', 'c', 'o', 'p', 'e', 'd', 'R', 'd', -'s', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', ':', 'G', '\232', '\305', '\210', '\036', 'B', '\n', '@', 'e', 'n', 'v', +'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '3', '.', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', 'M', 'a', 'p', 'p', 'e', 'r', 'R', +'\007', 'm', 'a', 'p', 'p', 'e', 'r', 's', '\022', 'O', '\n', '\013', 'b', 'o', 'd', 'y', '_', 'f', 'o', 'r', 'm', 'a', 't', '\030', '\002', +' ', '\001', '(', '\013', '2', '.', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', +'v', '3', '.', 'S', 'u', 'b', 's', 't', 'i', 't', 'u', 't', 'i', 'o', 'n', 'F', 'o', 'r', 'm', 'a', 't', 'S', 't', 'r', 'i', +'n', 'g', 'R', '\n', 'b', 'o', 'd', 'y', 'F', 'o', 'r', 'm', 'a', 't', '\"', '\234', '\003', '\n', '\016', 'R', 'e', 's', 'p', 'o', 'n', +'s', 'e', 'M', 'a', 'p', 'p', 'e', 'r', '\022', 'L', '\n', '\006', 'f', 'i', 'l', 't', 'e', 'r', '\030', '\001', ' ', '\001', '(', '\013', '2', +'*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'a', 'c', 'c', 'e', 's', 's', 'l', 'o', 'g', '.', +'v', '3', '.', 'A', 'c', 'c', 'e', 's', 's', 'L', 'o', 'g', 'F', 'i', 'l', 't', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\212', '\001', +'\002', '\020', '\001', 'R', '\006', 'f', 'i', 'l', 't', 'e', 'r', '\022', 'J', '\n', '\013', 's', 't', 'a', 't', 'u', 's', '_', 'c', 'o', 'd', +'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', +'.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'B', '\013', '\372', 'B', '\010', '*', '\006', '\020', '\330', '\004', '(', '\310', '\001', +'R', '\n', 's', 't', 'a', 't', 'u', 's', 'C', 'o', 'd', 'e', '\022', '4', '\n', '\004', 'b', 'o', 'd', 'y', '\030', '\003', ' ', '\001', '(', +'\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', +'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', 'R', '\004', 'b', 'o', 'd', 'y', '\022', '`', '\n', '\024', 'b', 'o', 'd', 'y', '_', +'f', 'o', 'r', 'm', 'a', 't', '_', 'o', 'v', 'e', 'r', 'r', 'i', 'd', 'e', '\030', '\004', ' ', '\001', '(', '\013', '2', '.', '.', 'e', +'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'S', 'u', 'b', 's', 't', +'i', 't', 'u', 't', 'i', 'o', 'n', 'F', 'o', 'r', 'm', 'a', 't', 'S', 't', 'r', 'i', 'n', 'g', 'R', '\022', 'b', 'o', 'd', 'y', +'F', 'o', 'r', 'm', 'a', 't', 'O', 'v', 'e', 'r', 'r', 'i', 'd', 'e', '\022', 'X', '\n', '\016', 'h', 'e', 'a', 'd', 'e', 'r', 's', +'_', 't', 'o', '_', 'a', 'd', 'd', '\030', '\005', ' ', '\003', '(', '\013', '2', '\'', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', +'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'O', 'p', +'t', 'i', 'o', 'n', 'B', '\t', '\372', 'B', '\006', '\222', '\001', '\003', '\020', '\350', '\007', 'R', '\014', 'h', 'e', 'a', 'd', 'e', 'r', 's', 'T', +'o', 'A', 'd', 'd', '\"', '\307', '\001', '\n', '\003', 'R', 'd', 's', '\022', 'Q', '\n', '\r', 'c', 'o', 'n', 'f', 'i', 'g', '_', 's', 'o', +'u', 'r', 'c', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', +'.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', 'B', '\010', '\372', 'B', +'\005', '\212', '\001', '\002', '\020', '\001', 'R', '\014', 'c', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', '\022', '*', '\n', '\021', 'r', +'o', 'u', 't', 'e', '_', 'c', 'o', 'n', 'f', 'i', 'g', '_', 'n', 'a', 'm', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\017', 'r', +'o', 'u', 't', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 'N', 'a', 'm', 'e', ':', 'A', '\232', '\305', '\210', '\036', '<', '\n', ':', 'e', 'n', +'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', +'.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', +'v', '2', '.', 'R', 'd', 's', '\"', '\367', '\001', '\n', '\035', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 'C', 'o', 'n', +'f', 'i', 'g', 'u', 'r', 'a', 't', 'i', 'o', 'n', 's', 'L', 'i', 's', 't', '\022', 'y', '\n', '\033', 's', 'c', 'o', 'p', 'e', 'd', +'_', 'r', 'o', 'u', 't', 'e', '_', 'c', 'o', 'n', 'f', 'i', 'g', 'u', 'r', 'a', 't', 'i', 'o', 'n', 's', '\030', '\001', ' ', '\003', +'(', '\013', '2', '/', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', +'3', '.', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 'u', 'r', 'a', 't', 'i', 'o', +'n', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', 'R', '\031', 's', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 'C', +'o', 'n', 'f', 'i', 'g', 'u', 'r', 'a', 't', 'i', 'o', 'n', 's', ':', '[', '\232', '\305', '\210', '\036', 'V', '\n', 'T', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', -'2', '.', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'd', 's', '\"', '\253', '\002', '\n', '\n', 'H', 't', 't', 'p', 'F', 'i', 'l', 't', 'e', -'r', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', -'\004', 'n', 'a', 'm', 'e', '\022', '9', '\n', '\014', 't', 'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\004', ' ', '\001', -'(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'H', -'\000', 'R', '\013', 't', 'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'X', '\n', '\020', 'c', 'o', 'n', 'f', 'i', 'g', '_', -'d', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', '\030', '\005', ' ', '\001', '(', '\013', '2', '+', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', -'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', -'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', 'H', '\000', 'R', '\017', 'c', 'o', 'n', 'f', 'i', 'g', 'D', 'i', 's', 'c', 'o', -'v', 'e', 'r', 'y', ':', 'H', '\232', '\305', '\210', '\036', 'C', '\n', 'A', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', -'.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', -'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '2', '.', 'H', 't', 't', 'p', 'F', 'i', 'l', -'t', 'e', 'r', 'B', '\r', '\n', '\013', 'c', 'o', 'n', 'f', 'i', 'g', '_', 't', 'y', 'p', 'e', 'J', '\004', '\010', '\003', '\020', '\004', 'J', -'\004', '\010', '\002', '\020', '\003', 'R', '\006', 'c', 'o', 'n', 'f', 'i', 'g', '\"', '\237', '\001', '\n', '\022', 'R', 'e', 'q', 'u', 'e', 's', 't', -'I', 'D', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '\022', '7', '\n', '\014', 't', 'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', -'i', 'g', '\030', '\001', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', -'f', '.', 'A', 'n', 'y', 'R', '\013', 't', 'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', ':', 'P', '\232', '\305', '\210', '\036', 'K', -'\n', 'I', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'n', 'e', 't', -'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', -'g', 'e', 'r', '.', 'v', '2', '.', 'R', 'e', 'q', 'u', 'e', 's', 't', 'I', 'D', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', -'B', 'q', '\n', 'I', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', -'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', -'.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', -'v', '3', 'B', '\032', 'H', 't', 't', 'p', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'M', 'a', 'n', 'a', 'g', 'e', 'r', -'P', 'r', 'o', 't', 'o', 'P', '\001', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +'2', '.', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 'u', 'r', 'a', 't', 'i', 'o', +'n', 's', 'L', 'i', 's', 't', '\"', '\351', '\016', '\n', '\014', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 's', '\022', '\033', +'\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', +'m', 'e', '\022', '\217', '\001', '\n', '\021', 's', 'c', 'o', 'p', 'e', '_', 'k', 'e', 'y', '_', 'b', 'u', 'i', 'l', 'd', 'e', 'r', '\030', +'\002', ' ', '\001', '(', '\013', '2', 'Y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', +'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', +'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '3', '.', 'S', 'c', 'o', 'p', 'e', 'd', 'R', +'o', 'u', 't', 'e', 's', '.', 'S', 'c', 'o', 'p', 'e', 'K', 'e', 'y', 'B', 'u', 'i', 'l', 'd', 'e', 'r', 'B', '\010', '\372', 'B', +'\005', '\212', '\001', '\002', '\020', '\001', 'R', '\017', 's', 'c', 'o', 'p', 'e', 'K', 'e', 'y', 'B', 'u', 'i', 'l', 'd', 'e', 'r', '\022', 'X', +'\n', '\021', 'r', 'd', 's', '_', 'c', 'o', 'n', 'f', 'i', 'g', '_', 's', 'o', 'u', 'r', 'c', 'e', '\030', '\003', ' ', '\001', '(', '\013', +'2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'C', +'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\017', 'r', 'd', +'s', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', '\022', '\245', '\001', '\n', ' ', 's', 'c', 'o', 'p', 'e', 'd', '_', +'r', 'o', 'u', 't', 'e', '_', 'c', 'o', 'n', 'f', 'i', 'g', 'u', 'r', 'a', 't', 'i', 'o', 'n', 's', '_', 'l', 'i', 's', 't', +'\030', '\004', ' ', '\001', '(', '\013', '2', 'Z', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', +'.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', +'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '3', '.', 'S', 'c', 'o', 'p', 'e', 'd', +'R', 'o', 'u', 't', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 'u', 'r', 'a', 't', 'i', 'o', 'n', 's', 'L', 'i', 's', 't', 'H', '\000', +'R', '\035', 's', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 'u', 'r', 'a', 't', 'i', 'o', +'n', 's', 'L', 'i', 's', 't', '\022', 'g', '\n', '\n', 's', 'c', 'o', 'p', 'e', 'd', '_', 'r', 'd', 's', '\030', '\005', ' ', '\001', '(', +'\013', '2', 'F', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', +'e', 'r', 's', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', +'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '3', '.', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'd', 's', 'H', '\000', +'R', '\t', 's', 'c', 'o', 'p', 'e', 'd', 'R', 'd', 's', '\032', '\331', '\t', '\n', '\017', 'S', 'c', 'o', 'p', 'e', 'K', 'e', 'y', 'B', +'u', 'i', 'l', 'd', 'e', 'r', '\022', '\221', '\001', '\n', '\t', 'f', 'r', 'a', 'g', 'm', 'e', 'n', 't', 's', '\030', '\001', ' ', '\003', '(', +'\013', '2', 'i', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', +'e', 'r', 's', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', +'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '3', '.', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', +'s', '.', 'S', 'c', 'o', 'p', 'e', 'K', 'e', 'y', 'B', 'u', 'i', 'l', 'd', 'e', 'r', '.', 'F', 'r', 'a', 'g', 'm', 'e', 'n', +'t', 'B', 'u', 'i', 'l', 'd', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', 'R', '\t', 'f', 'r', 'a', 'g', 'm', +'e', 'n', 't', 's', '\032', '\325', '\007', '\n', '\017', 'F', 'r', 'a', 'g', 'm', 'e', 'n', 't', 'B', 'u', 'i', 'l', 'd', 'e', 'r', '\022', +'\266', '\001', '\n', '\026', 'h', 'e', 'a', 'd', 'e', 'r', '_', 'v', 'a', 'l', 'u', 'e', '_', 'e', 'x', 't', 'r', 'a', 'c', 't', 'o', +'r', '\030', '\001', ' ', '\001', '(', '\013', '2', '~', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', +'s', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', +'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '3', '.', 'S', 'c', 'o', 'p', 'e', +'d', 'R', 'o', 'u', 't', 'e', 's', '.', 'S', 'c', 'o', 'p', 'e', 'K', 'e', 'y', 'B', 'u', 'i', 'l', 'd', 'e', 'r', '.', 'F', +'r', 'a', 'g', 'm', 'e', 'n', 't', 'B', 'u', 'i', 'l', 'd', 'e', 'r', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', +'e', 'E', 'x', 't', 'r', 'a', 'c', 't', 'o', 'r', 'H', '\000', 'R', '\024', 'h', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', +'E', 'x', 't', 'r', 'a', 'c', 't', 'o', 'r', '\032', '\217', '\005', '\n', '\024', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', +'E', 'x', 't', 'r', 'a', 'c', 't', 'o', 'r', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', +'\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '+', '\n', '\021', 'e', 'l', 'e', 'm', 'e', 'n', 't', '_', +'s', 'e', 'p', 'a', 'r', 'a', 't', 'o', 'r', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\020', 'e', 'l', 'e', 'm', 'e', 'n', 't', 'S', +'e', 'p', 'a', 'r', 'a', 't', 'o', 'r', '\022', '\026', '\n', '\005', 'i', 'n', 'd', 'e', 'x', '\030', '\003', ' ', '\001', '(', '\r', 'H', '\000', +'R', '\005', 'i', 'n', 'd', 'e', 'x', '\022', '\245', '\001', '\n', '\007', 'e', 'l', 'e', 'm', 'e', 'n', 't', '\030', '\004', ' ', '\001', '(', '\013', +'2', '\210', '\001', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 'f', 'i', 'l', 't', +'e', 'r', 's', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', +'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '3', '.', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', +'s', '.', 'S', 'c', 'o', 'p', 'e', 'K', 'e', 'y', 'B', 'u', 'i', 'l', 'd', 'e', 'r', '.', 'F', 'r', 'a', 'g', 'm', 'e', 'n', +'t', 'B', 'u', 'i', 'l', 'd', 'e', 'r', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'E', 'x', 't', 'r', 'a', +'c', 't', 'o', 'r', '.', 'K', 'v', 'E', 'l', 'e', 'm', 'e', 'n', 't', 'H', '\000', 'R', '\007', 'e', 'l', 'e', 'm', 'e', 'n', 't', +'\032', '\333', '\001', '\n', '\t', 'K', 'v', 'E', 'l', 'e', 'm', 'e', 'n', 't', '\022', '%', '\n', '\t', 's', 'e', 'p', 'a', 'r', 'a', 't', +'o', 'r', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\t', 's', 'e', 'p', 'a', 'r', 'a', +'t', 'o', 'r', '\022', '\031', '\n', '\003', 'k', 'e', 'y', '\030', '\002', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', +'R', '\003', 'k', 'e', 'y', ':', '\213', '\001', '\232', '\305', '\210', '\036', '\205', '\001', '\n', '\202', '\001', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', +'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', +'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '2', '.', 'S', 'c', 'o', +'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 's', '.', 'S', 'c', 'o', 'p', 'e', 'K', 'e', 'y', 'B', 'u', 'i', 'l', 'd', 'e', 'r', +'.', 'F', 'r', 'a', 'g', 'm', 'e', 'n', 't', 'B', 'u', 'i', 'l', 'd', 'e', 'r', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', +'l', 'u', 'e', 'E', 'x', 't', 'r', 'a', 'c', 't', 'o', 'r', '.', 'K', 'v', 'E', 'l', 'e', 'm', 'e', 'n', 't', ':', '\177', '\232', +'\305', '\210', '\036', 'z', '\n', 'x', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', +'.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', +'m', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '2', '.', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 's', '.', 'S', +'c', 'o', 'p', 'e', 'K', 'e', 'y', 'B', 'u', 'i', 'l', 'd', 'e', 'r', '.', 'F', 'r', 'a', 'g', 'm', 'e', 'n', 't', 'B', 'u', +'i', 'l', 'd', 'e', 'r', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 'E', 'x', 't', 'r', 'a', 'c', 't', 'o', +'r', 'B', '\016', '\n', '\014', 'e', 'x', 't', 'r', 'a', 'c', 't', '_', 't', 'y', 'p', 'e', ':', 'j', '\232', '\305', '\210', '\036', 'e', '\n', +'c', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'n', 'e', 't', 'w', +'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', +'e', 'r', '.', 'v', '2', '.', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 's', '.', 'S', 'c', 'o', 'p', 'e', 'K', +'e', 'y', 'B', 'u', 'i', 'l', 'd', 'e', 'r', '.', 'F', 'r', 'a', 'g', 'm', 'e', 'n', 't', 'B', 'u', 'i', 'l', 'd', 'e', 'r', +'B', '\013', '\n', '\004', 't', 'y', 'p', 'e', '\022', '\003', '\370', 'B', '\001', ':', 'Z', '\232', '\305', '\210', '\036', 'U', '\n', 'S', 'e', 'n', 'v', +'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', +'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', +'2', '.', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 's', '.', 'S', 'c', 'o', 'p', 'e', 'K', 'e', 'y', 'B', 'u', +'i', 'l', 'd', 'e', 'r', ':', 'J', '\232', '\305', '\210', '\036', 'E', '\n', 'C', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', +'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', +'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '2', '.', 'S', 'c', 'o', 'p', 'e', 'd', +'R', 'o', 'u', 't', 'e', 's', 'B', '\027', '\n', '\020', 'c', 'o', 'n', 'f', 'i', 'g', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', +'r', '\022', '\003', '\370', 'B', '\001', '\"', '\273', '\001', '\n', '\t', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'd', 's', '\022', 'e', '\n', '\030', 's', +'c', 'o', 'p', 'e', 'd', '_', 'r', 'd', 's', '_', 'c', 'o', 'n', 'f', 'i', 'g', '_', 's', 'o', 'u', 'r', 'c', 'e', '\030', '\001', +' ', '\001', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', +'v', '3', '.', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', +'R', '\025', 's', 'c', 'o', 'p', 'e', 'd', 'R', 'd', 's', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', ':', 'G', +'\232', '\305', '\210', '\036', 'B', '\n', '@', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', +'r', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', +'_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '2', '.', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'd', 's', '\"', '\314', '\002', '\n', +'\n', 'H', 't', 't', 'p', 'F', 'i', 'l', 't', 'e', 'r', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', +'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '9', '\n', '\014', 't', 'y', 'p', 'e', 'd', '_', +'c', 'o', 'n', 'f', 'i', 'g', '\030', '\004', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', +'t', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'H', '\000', 'R', '\013', 't', 'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', '\022', +'X', '\n', '\020', 'c', 'o', 'n', 'f', 'i', 'g', '_', 'd', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', '\030', '\005', ' ', '\001', '(', '\013', +'2', '+', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'E', +'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', 'H', '\000', 'R', '\017', 'c', +'o', 'n', 'f', 'i', 'g', 'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', '\022', '\037', '\n', '\013', 'i', 's', '_', 'o', 'p', 't', 'i', +'o', 'n', 'a', 'l', '\030', '\006', ' ', '\001', '(', '\010', 'R', '\n', 'i', 's', 'O', 'p', 't', 'i', 'o', 'n', 'a', 'l', ':', 'H', '\232', +'\305', '\210', '\036', 'C', '\n', 'A', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', +'.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', +'m', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '2', '.', 'H', 't', 't', 'p', 'F', 'i', 'l', 't', 'e', 'r', 'B', '\r', '\n', '\013', +'c', 'o', 'n', 'f', 'i', 'g', '_', 't', 'y', 'p', 'e', 'J', '\004', '\010', '\003', '\020', '\004', 'J', '\004', '\010', '\002', '\020', '\003', 'R', '\006', +'c', 'o', 'n', 'f', 'i', 'g', '\"', '\237', '\001', '\n', '\022', 'R', 'e', 'q', 'u', 'e', 's', 't', 'I', 'D', 'E', 'x', 't', 'e', 'n', +'s', 'i', 'o', 'n', '\022', '7', '\n', '\014', 't', 'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\001', ' ', '\001', '(', +'\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'R', '\013', +'t', 'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', ':', 'P', '\232', '\305', '\210', '\036', 'K', '\n', 'I', 'e', 'n', 'v', 'o', 'y', +'.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'f', 'i', 'l', 't', 'e', 'r', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', +'t', 'p', '_', 'c', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '2', '.', +'R', 'e', 'q', 'u', 'e', 's', 't', 'I', 'D', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'B', 'q', '\n', 'I', 'i', 'o', '.', +'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', +'n', 's', '.', 'f', 'i', 'l', 't', 'e', 'r', 's', '.', 'n', 'e', 't', 'w', 'o', 'r', 'k', '.', 'h', 't', 't', 'p', '_', 'c', +'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', '_', 'm', 'a', 'n', 'a', 'g', 'e', 'r', '.', 'v', '3', 'B', '\032', 'H', 't', 't', +'p', 'C', 'o', 'n', 'n', 'e', 'c', 't', 'i', 'o', 'n', 'M', 'a', 'n', 'a', 'g', 'e', 'r', 'P', 'r', 'o', 't', 'o', 'P', '\001', +'\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; -static upb_def_init *deps[23] = { +static upb_def_init *deps[20] = { &envoy_config_accesslog_v3_accesslog_proto_upbdefinit, &envoy_config_core_v3_base_proto_upbdefinit, &envoy_config_core_v3_config_source_proto_upbdefinit, @@ -491,10 +488,7 @@ static upb_def_init *deps[23] = { &envoy_type_v3_percent_proto_upbdefinit, &google_protobuf_any_proto_upbdefinit, &google_protobuf_duration_proto_upbdefinit, - &google_protobuf_struct_proto_upbdefinit, &google_protobuf_wrappers_proto_upbdefinit, - &udpa_core_v1_resource_locator_proto_upbdefinit, - &envoy_annotations_deprecation_proto_upbdefinit, &udpa_annotations_migrate_proto_upbdefinit, &udpa_annotations_security_proto_upbdefinit, &udpa_annotations_status_proto_upbdefinit, @@ -507,5 +501,5 @@ upb_def_init envoy_extensions_filters_network_http_connection_manager_v3_http_co deps, layouts, "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.proto", - UPB_STRVIEW_INIT(descriptor, 10148) + UPB_STRVIEW_INIT(descriptor, 10141) }; diff --git a/grpc/src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c b/grpc/src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c index 93d43620..c5af2614 100644 --- a/grpc/src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c +++ b/grpc/src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.c @@ -9,31 +9,27 @@ #include "upb/def.h" #include "envoy/extensions/transport_sockets/tls/v3/cert.upbdefs.h" -extern upb_def_init udpa_annotations_status_proto_upbdefinit; extern upb_def_init envoy_extensions_transport_sockets_tls_v3_common_proto_upbdefinit; extern upb_def_init envoy_extensions_transport_sockets_tls_v3_secret_proto_upbdefinit; extern upb_def_init envoy_extensions_transport_sockets_tls_v3_tls_proto_upbdefinit; -static const char descriptor[379] = {'\n', '4', 'e', 'n', 'v', 'o', 'y', '/', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '/', 't', 'r', 'a', 'n', 's', 'p', +static const char descriptor[348] = {'\n', '4', 'e', 'n', 'v', 'o', 'y', '/', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '/', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '/', 't', 'l', 's', '/', 'v', '3', '/', 'c', 'e', 'r', 't', '.', 'p', 'r', 'o', 't', 'o', '\022', ')', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', -'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '.', 't', 'l', 's', '.', 'v', '3', '\032', '\035', 'u', -'d', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', +'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '.', 't', 'l', 's', '.', 'v', '3', '\032', '6', 'e', +'n', 'v', 'o', 'y', '/', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '/', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', +'_', 's', 'o', 'c', 'k', 'e', 't', 's', '/', 't', 'l', 's', '/', 'v', '3', '/', 'c', 'o', 'm', 'm', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\032', '6', 'e', 'n', 'v', 'o', 'y', '/', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '/', 't', 'r', 'a', -'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '/', 't', 'l', 's', '/', 'v', '3', '/', 'c', 'o', 'm', -'m', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\032', '6', 'e', 'n', 'v', 'o', 'y', '/', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', +'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '/', 't', 'l', 's', '/', 'v', '3', '/', 's', 'e', 'c', +'r', 'e', 't', '.', 'p', 'r', 'o', 't', 'o', '\032', '3', 'e', 'n', 'v', 'o', 'y', '/', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '/', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '/', 't', 'l', 's', '/', -'v', '3', '/', 's', 'e', 'c', 'r', 'e', 't', '.', 'p', 'r', 'o', 't', 'o', '\032', '3', 'e', 'n', 'v', 'o', 'y', '/', 'e', 'x', -'t', 'e', 'n', 's', 'i', 'o', 'n', 's', '/', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', -'s', '/', 't', 'l', 's', '/', 'v', '3', '/', 't', 'l', 's', '.', 'p', 'r', 'o', 't', 'o', 'B', 'F', '\n', '7', 'i', 'o', '.', -'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', -'n', 's', '.', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '.', 't', 'l', 's', '.', -'v', '3', 'B', '\t', 'C', 'e', 'r', 't', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'P', '\001', 'P', '\002', 'P', '\003', 'b', '\006', 'p', 'r', -'o', 't', 'o', '3', +'v', '3', '/', 't', 'l', 's', '.', 'p', 'r', 'o', 't', 'o', 'B', 'F', '\n', '7', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', +'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', +'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '.', 't', 'l', 's', '.', 'v', '3', 'B', '\t', 'C', 'e', +'r', 't', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'P', '\000', 'P', '\001', 'P', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; -static upb_def_init *deps[5] = { - &udpa_annotations_status_proto_upbdefinit, +static upb_def_init *deps[4] = { &envoy_extensions_transport_sockets_tls_v3_common_proto_upbdefinit, &envoy_extensions_transport_sockets_tls_v3_secret_proto_upbdefinit, &envoy_extensions_transport_sockets_tls_v3_tls_proto_upbdefinit, @@ -44,5 +40,5 @@ upb_def_init envoy_extensions_transport_sockets_tls_v3_cert_proto_upbdefinit = { deps, NULL, "envoy/extensions/transport_sockets/tls/v3/cert.proto", - UPB_STRVIEW_INIT(descriptor, 379) + UPB_STRVIEW_INIT(descriptor, 348) }; diff --git a/grpc/src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c b/grpc/src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c index 76b13487..dbf238cb 100644 --- a/grpc/src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c +++ b/grpc/src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/common.upbdefs.c @@ -12,7 +12,6 @@ extern upb_def_init envoy_config_core_v3_base_proto_upbdefinit; extern upb_def_init envoy_type_matcher_v3_string_proto_upbdefinit; extern upb_def_init google_protobuf_any_proto_upbdefinit; -extern upb_def_init google_protobuf_struct_proto_upbdefinit; extern upb_def_init google_protobuf_wrappers_proto_upbdefinit; extern upb_def_init udpa_annotations_sensitive_proto_upbdefinit; extern upb_def_init udpa_annotations_status_proto_upbdefinit; @@ -32,124 +31,129 @@ static const upb_msglayout *layouts[5] = { &envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_msginit, }; -static const char descriptor[2774] = {'\n', '6', 'e', 'n', 'v', 'o', 'y', '/', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '/', 't', 'r', 'a', 'n', 's', 'p', +static const char descriptor[2914] = {'\n', '6', 'e', 'n', 'v', 'o', 'y', '/', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '/', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '/', 't', 'l', 's', '/', 'v', '3', '/', 'c', 'o', 'm', 'm', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\022', ')', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '.', 't', 'l', 's', '.', 'v', '3', '\032', '\037', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'b', 'a', 's', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', '\"', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 's', 't', 'r', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\031', 'g', 'o', 'o', 'g', 'l', -'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'a', 'n', 'y', '.', 'p', 'r', 'o', 't', 'o', '\032', '\034', 'g', 'o', 'o', -'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 's', 't', 'r', 'u', 'c', 't', '.', 'p', 'r', 'o', 't', 'o', -'\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'w', 'r', 'a', 'p', 'p', 'e', 'r', -'s', '.', 'p', 'r', 'o', 't', 'o', '\032', ' ', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', -'/', 's', 'e', 'n', 's', 'i', 't', 'i', 'v', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', -'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '!', 'u', -'d', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', -'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', -'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '\362', '\003', '\n', '\r', 'T', 'l', 's', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 's', -'\022', '\217', '\001', '\n', '\034', 't', 'l', 's', '_', 'm', 'i', 'n', 'i', 'm', 'u', 'm', '_', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', -'_', 'v', 'e', 'r', 's', 'i', 'o', 'n', '\030', '\001', ' ', '\001', '(', '\016', '2', 'D', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', -'t', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', -'s', '.', 't', 'l', 's', '.', 'v', '3', '.', 'T', 'l', 's', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 's', '.', 'T', 'l', -'s', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\031', 't', 'l', 's', 'M', -'i', 'n', 'i', 'm', 'u', 'm', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'V', 'e', 'r', 's', 'i', 'o', 'n', '\022', '\217', '\001', '\n', -'\034', 't', 'l', 's', '_', 'm', 'a', 'x', 'i', 'm', 'u', 'm', '_', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '_', 'v', 'e', 'r', -'s', 'i', 'o', 'n', '\030', '\002', ' ', '\001', '(', '\016', '2', 'D', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', -'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '.', 't', 'l', -'s', '.', 'v', '3', '.', 'T', 'l', 's', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 's', '.', 'T', 'l', 's', 'P', 'r', 'o', -'t', 'o', 'c', 'o', 'l', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\031', 't', 'l', 's', 'M', 'a', 'x', 'i', 'm', -'u', 'm', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'V', 'e', 'r', 's', 'i', 'o', 'n', '\022', '#', '\n', '\r', 'c', 'i', 'p', 'h', -'e', 'r', '_', 's', 'u', 'i', 't', 'e', 's', '\030', '\003', ' ', '\003', '(', '\t', 'R', '\014', 'c', 'i', 'p', 'h', 'e', 'r', 'S', 'u', -'i', 't', 'e', 's', '\022', '\037', '\n', '\013', 'e', 'c', 'd', 'h', '_', 'c', 'u', 'r', 'v', 'e', 's', '\030', '\004', ' ', '\003', '(', '\t', -'R', '\n', 'e', 'c', 'd', 'h', 'C', 'u', 'r', 'v', 'e', 's', '\"', 'O', '\n', '\013', 'T', 'l', 's', 'P', 'r', 'o', 't', 'o', 'c', -'o', 'l', '\022', '\014', '\n', '\010', 'T', 'L', 'S', '_', 'A', 'U', 'T', 'O', '\020', '\000', '\022', '\013', '\n', '\007', 'T', 'L', 'S', 'v', '1', -'_', '0', '\020', '\001', '\022', '\013', '\n', '\007', 'T', 'L', 'S', 'v', '1', '_', '1', '\020', '\002', '\022', '\013', '\n', '\007', 'T', 'L', 'S', 'v', -'1', '_', '2', '\020', '\003', '\022', '\013', '\n', '\007', 'T', 'L', 'S', 'v', '1', '_', '3', '\020', '\004', ':', '&', '\232', '\305', '\210', '\036', '!', -'\n', '\037', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'a', 'u', 't', 'h', '.', 'T', 'l', 's', 'P', 'a', -'r', 'a', 'm', 'e', 't', 'e', 'r', 's', '\"', '\317', '\001', '\n', '\022', 'P', 'r', 'i', 'v', 'a', 't', 'e', 'K', 'e', 'y', 'P', 'r', -'o', 'v', 'i', 'd', 'e', 'r', '\022', ',', '\n', '\r', 'p', 'r', 'o', 'v', 'i', 'd', 'e', 'r', '_', 'n', 'a', 'm', 'e', '\030', '\001', -' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\014', 'p', 'r', 'o', 'v', 'i', 'd', 'e', 'r', 'N', 'a', -'m', 'e', '\022', 'A', '\n', '\014', 't', 'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\003', ' ', '\001', '(', '\013', '2', -'\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'B', '\006', '\270', '\267', -'\213', '\244', '\002', '\001', 'H', '\000', 'R', '\013', 't', 'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', ':', '+', '\232', '\305', '\210', '\036', -'&', '\n', '$', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'a', 'u', 't', 'h', '.', 'P', 'r', 'i', 'v', -'a', 't', 'e', 'K', 'e', 'y', 'P', 'r', 'o', 'v', 'i', 'd', 'e', 'r', 'B', '\r', '\n', '\013', 'c', 'o', 'n', 'f', 'i', 'g', '_', -'t', 'y', 'p', 'e', 'J', '\004', '\010', '\002', '\020', '\003', 'R', '\006', 'c', 'o', 'n', 'f', 'i', 'g', '\"', '\261', '\004', '\n', '\016', 'T', 'l', -'s', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '\022', 'M', '\n', '\021', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', -'t', 'e', '_', 'c', 'h', 'a', 'i', 'n', '\030', '\001', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', -'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', 'R', '\020', -'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'C', 'h', 'a', 'i', 'n', '\022', 'I', '\n', '\013', 'p', 'r', 'i', 'v', 'a', -'t', 'e', '_', 'k', 'e', 'y', '\030', '\002', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', -'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', 'B', '\006', '\270', '\267', -'\213', '\244', '\002', '\001', 'R', '\n', 'p', 'r', 'i', 'v', 'a', 't', 'e', 'K', 'e', 'y', '\022', 'o', '\n', '\024', 'p', 'r', 'i', 'v', 'a', -'t', 'e', '_', 'k', 'e', 'y', '_', 'p', 'r', 'o', 'v', 'i', 'd', 'e', 'r', '\030', '\006', ' ', '\001', '(', '\013', '2', '=', '.', 'e', -'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', -'_', 's', 'o', 'c', 'k', 'e', 't', 's', '.', 't', 'l', 's', '.', 'v', '3', '.', 'P', 'r', 'i', 'v', 'a', 't', 'e', 'K', 'e', -'y', 'P', 'r', 'o', 'v', 'i', 'd', 'e', 'r', 'R', '\022', 'p', 'r', 'i', 'v', 'a', 't', 'e', 'K', 'e', 'y', 'P', 'r', 'o', 'v', -'i', 'd', 'e', 'r', '\022', 'D', '\n', '\010', 'p', 'a', 's', 's', 'w', 'o', 'r', 'd', '\030', '\003', ' ', '\001', '(', '\013', '2', ' ', '.', -'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'D', 'a', 't', 'a', -'S', 'o', 'u', 'r', 'c', 'e', 'B', '\006', '\270', '\267', '\213', '\244', '\002', '\001', 'R', '\010', 'p', 'a', 's', 's', 'w', 'o', 'r', 'd', '\022', -'A', '\n', '\013', 'o', 'c', 's', 'p', '_', 's', 't', 'a', 'p', 'l', 'e', '\030', '\004', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', -'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'D', 'a', 't', 'a', 'S', 'o', -'u', 'r', 'c', 'e', 'R', '\n', 'o', 'c', 's', 'p', 'S', 't', 'a', 'p', 'l', 'e', '\022', 'b', '\n', '\034', 's', 'i', 'g', 'n', 'e', -'d', '_', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '_', 't', 'i', 'm', 'e', 's', 't', 'a', 'm', 'p', '\030', '\005', -' ', '\003', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', -'v', '3', '.', 'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', 'R', '\032', 's', 'i', 'g', 'n', 'e', 'd', 'C', 'e', 'r', 't', -'i', 'f', 'i', 'c', 'a', 't', 'e', 'T', 'i', 'm', 'e', 's', 't', 'a', 'm', 'p', ':', '\'', '\232', '\305', '\210', '\036', '\"', '\n', ' ', -'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'a', 'u', 't', 'h', '.', 'T', 'l', 's', 'C', 'e', 'r', 't', -'i', 'f', 'i', 'c', 'a', 't', 'e', '\"', '\213', '\001', '\n', '\024', 'T', 'l', 's', 'S', 'e', 's', 's', 'i', 'o', 'n', 'T', 'i', 'c', -'k', 'e', 't', 'K', 'e', 'y', 's', '\022', 'D', '\n', '\004', 'k', 'e', 'y', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', ' ', '.', 'e', -'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'D', 'a', 't', 'a', 'S', -'o', 'u', 'r', 'c', 'e', 'B', '\016', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', '\270', '\267', '\213', '\244', '\002', '\001', 'R', '\004', 'k', 'e', -'y', 's', ':', '-', '\232', '\305', '\210', '\036', '(', '\n', '&', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'a', -'u', 't', 'h', '.', 'T', 'l', 's', 'S', 'e', 's', 's', 'i', 'o', 'n', 'T', 'i', 'c', 'k', 'e', 't', 'K', 'e', 'y', 's', '\"', -'\362', '\006', '\n', '\034', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'V', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', -'C', 'o', 'n', 't', 'e', 'x', 't', '\022', '?', '\n', '\n', 't', 'r', 'u', 's', 't', 'e', 'd', '_', 'c', 'a', '\030', '\001', ' ', '\001', +'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'a', 'n', 'y', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', 'o', +'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'w', 'r', 'a', 'p', 'p', 'e', 'r', 's', '.', 'p', 'r', 'o', +'t', 'o', '\032', ' ', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 'e', 'n', 's', +'i', 't', 'i', 'v', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', +'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '!', 'u', 'd', 'p', 'a', '/', 'a', +'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', +'t', 'o', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', +'t', 'o', '\"', '\362', '\003', '\n', '\r', 'T', 'l', 's', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 's', '\022', '\217', '\001', '\n', '\034', +'t', 'l', 's', '_', 'm', 'i', 'n', 'i', 'm', 'u', 'm', '_', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '_', 'v', 'e', 'r', 's', +'i', 'o', 'n', '\030', '\001', ' ', '\001', '(', '\016', '2', 'D', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', +'o', 'n', 's', '.', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '.', 't', 'l', 's', +'.', 'v', '3', '.', 'T', 'l', 's', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 's', '.', 'T', 'l', 's', 'P', 'r', 'o', 't', +'o', 'c', 'o', 'l', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\031', 't', 'l', 's', 'M', 'i', 'n', 'i', 'm', 'u', +'m', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 'V', 'e', 'r', 's', 'i', 'o', 'n', '\022', '\217', '\001', '\n', '\034', 't', 'l', 's', '_', +'m', 'a', 'x', 'i', 'm', 'u', 'm', '_', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', '_', 'v', 'e', 'r', 's', 'i', 'o', 'n', '\030', +'\002', ' ', '\001', '(', '\016', '2', 'D', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', +'t', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '.', 't', 'l', 's', '.', 'v', '3', '.', +'T', 'l', 's', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 's', '.', 'T', 'l', 's', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', +'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\031', 't', 'l', 's', 'M', 'a', 'x', 'i', 'm', 'u', 'm', 'P', 'r', 'o', +'t', 'o', 'c', 'o', 'l', 'V', 'e', 'r', 's', 'i', 'o', 'n', '\022', '#', '\n', '\r', 'c', 'i', 'p', 'h', 'e', 'r', '_', 's', 'u', +'i', 't', 'e', 's', '\030', '\003', ' ', '\003', '(', '\t', 'R', '\014', 'c', 'i', 'p', 'h', 'e', 'r', 'S', 'u', 'i', 't', 'e', 's', '\022', +'\037', '\n', '\013', 'e', 'c', 'd', 'h', '_', 'c', 'u', 'r', 'v', 'e', 's', '\030', '\004', ' ', '\003', '(', '\t', 'R', '\n', 'e', 'c', 'd', +'h', 'C', 'u', 'r', 'v', 'e', 's', '\"', 'O', '\n', '\013', 'T', 'l', 's', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', '\022', '\014', '\n', +'\010', 'T', 'L', 'S', '_', 'A', 'U', 'T', 'O', '\020', '\000', '\022', '\013', '\n', '\007', 'T', 'L', 'S', 'v', '1', '_', '0', '\020', '\001', '\022', +'\013', '\n', '\007', 'T', 'L', 'S', 'v', '1', '_', '1', '\020', '\002', '\022', '\013', '\n', '\007', 'T', 'L', 'S', 'v', '1', '_', '2', '\020', '\003', +'\022', '\013', '\n', '\007', 'T', 'L', 'S', 'v', '1', '_', '3', '\020', '\004', ':', '&', '\232', '\305', '\210', '\036', '!', '\n', '\037', 'e', 'n', 'v', +'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'a', 'u', 't', 'h', '.', 'T', 'l', 's', 'P', 'a', 'r', 'a', 'm', 'e', 't', +'e', 'r', 's', '\"', '\317', '\001', '\n', '\022', 'P', 'r', 'i', 'v', 'a', 't', 'e', 'K', 'e', 'y', 'P', 'r', 'o', 'v', 'i', 'd', 'e', +'r', '\022', ',', '\n', '\r', 'p', 'r', 'o', 'v', 'i', 'd', 'e', 'r', '_', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', +'\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\014', 'p', 'r', 'o', 'v', 'i', 'd', 'e', 'r', 'N', 'a', 'm', 'e', '\022', 'A', '\n', +'\014', 't', 'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\003', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', +'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'B', '\006', '\270', '\267', '\213', '\244', '\002', '\001', 'H', +'\000', 'R', '\013', 't', 'y', 'p', 'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', ':', '+', '\232', '\305', '\210', '\036', '&', '\n', '$', 'e', 'n', +'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'a', 'u', 't', 'h', '.', 'P', 'r', 'i', 'v', 'a', 't', 'e', 'K', 'e', +'y', 'P', 'r', 'o', 'v', 'i', 'd', 'e', 'r', 'B', '\r', '\n', '\013', 'c', 'o', 'n', 'f', 'i', 'g', '_', 't', 'y', 'p', 'e', 'J', +'\004', '\010', '\002', '\020', '\003', 'R', '\006', 'c', 'o', 'n', 'f', 'i', 'g', '\"', '\206', '\005', '\n', '\016', 'T', 'l', 's', 'C', 'e', 'r', 't', +'i', 'f', 'i', 'c', 'a', 't', 'e', '\022', 'M', '\n', '\021', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '_', 'c', 'h', +'a', 'i', 'n', '\030', '\001', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', +'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', 'R', '\020', 'c', 'e', 'r', 't', 'i', +'f', 'i', 'c', 'a', 't', 'e', 'C', 'h', 'a', 'i', 'n', '\022', 'I', '\n', '\013', 'p', 'r', 'i', 'v', 'a', 't', 'e', '_', 'k', 'e', +'y', '\030', '\002', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', +'r', 'e', '.', 'v', '3', '.', 'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', 'B', '\006', '\270', '\267', '\213', '\244', '\002', '\001', 'R', +'\n', 'p', 'r', 'i', 'v', 'a', 't', 'e', 'K', 'e', 'y', '\022', 'S', '\n', '\021', 'w', 'a', 't', 'c', 'h', 'e', 'd', '_', 'd', 'i', +'r', 'e', 'c', 't', 'o', 'r', 'y', '\030', '\007', ' ', '\001', '(', '\013', '2', '&', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', +'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'W', 'a', 't', 'c', 'h', 'e', 'd', 'D', 'i', 'r', 'e', 'c', 't', +'o', 'r', 'y', 'R', '\020', 'w', 'a', 't', 'c', 'h', 'e', 'd', 'D', 'i', 'r', 'e', 'c', 't', 'o', 'r', 'y', '\022', 'o', '\n', '\024', +'p', 'r', 'i', 'v', 'a', 't', 'e', '_', 'k', 'e', 'y', '_', 'p', 'r', 'o', 'v', 'i', 'd', 'e', 'r', '\030', '\006', ' ', '\001', '(', +'\013', '2', '=', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'n', +'s', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '.', 't', 'l', 's', '.', 'v', '3', '.', 'P', 'r', 'i', 'v', +'a', 't', 'e', 'K', 'e', 'y', 'P', 'r', 'o', 'v', 'i', 'd', 'e', 'r', 'R', '\022', 'p', 'r', 'i', 'v', 'a', 't', 'e', 'K', 'e', +'y', 'P', 'r', 'o', 'v', 'i', 'd', 'e', 'r', '\022', 'D', '\n', '\010', 'p', 'a', 's', 's', 'w', 'o', 'r', 'd', '\030', '\003', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', -'.', 'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', 'R', '\t', 't', 'r', 'u', 's', 't', 'e', 'd', 'C', 'a', '\022', 'F', '\n', -'\027', 'v', 'e', 'r', 'i', 'f', 'y', '_', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '_', 's', 'p', 'k', 'i', '\030', -'\003', ' ', '\003', '(', '\t', 'B', '\016', '\372', 'B', '\013', '\222', '\001', '\010', '\"', '\006', 'r', '\004', '\020', ',', '(', ',', 'R', '\025', 'v', 'e', -'r', 'i', 'f', 'y', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'S', 'p', 'k', 'i', '\022', 'F', '\n', '\027', 'v', 'e', -'r', 'i', 'f', 'y', '_', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '_', 'h', 'a', 's', 'h', '\030', '\002', ' ', '\003', -'(', '\t', 'B', '\016', '\372', 'B', '\013', '\222', '\001', '\010', '\"', '\006', 'r', '\004', '\020', '@', '(', '_', 'R', '\025', 'v', 'e', 'r', 'i', 'f', -'y', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'H', 'a', 's', 'h', '\022', '[', '\n', '\027', 'm', 'a', 't', 'c', 'h', -'_', 's', 'u', 'b', 'j', 'e', 'c', 't', '_', 'a', 'l', 't', '_', 'n', 'a', 'm', 'e', 's', '\030', '\t', ' ', '\003', '(', '\013', '2', -'$', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'S', -'t', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'R', '\024', 'm', 'a', 't', 'c', 'h', 'S', 'u', 'b', 'j', 'e', 'c', -'t', 'A', 'l', 't', 'N', 'a', 'm', 'e', 's', '\022', 'k', '\n', '$', 'r', 'e', 'q', 'u', 'i', 'r', 'e', '_', 's', 'i', 'g', 'n', -'e', 'd', '_', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '_', 't', 'i', 'm', 'e', 's', 't', 'a', 'm', 'p', '\030', -'\006', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', -'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '!', 'r', 'e', 'q', 'u', 'i', 'r', 'e', 'S', 'i', 'g', 'n', 'e', 'd', 'C', 'e', -'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'T', 'i', 'm', 'e', 's', 't', 'a', 'm', 'p', '\022', '2', '\n', '\003', 'c', 'r', 'l', -'\030', '\007', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', -'e', '.', 'v', '3', '.', 'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', 'R', '\003', 'c', 'r', 'l', '\022', ':', '\n', '\031', 'a', -'l', 'l', 'o', 'w', '_', 'e', 'x', 'p', 'i', 'r', 'e', 'd', '_', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '\030', -'\010', ' ', '\001', '(', '\010', 'R', '\027', 'a', 'l', 'l', 'o', 'w', 'E', 'x', 'p', 'i', 'r', 'e', 'd', 'C', 'e', 'r', 't', 'i', 'f', -'i', 'c', 'a', 't', 'e', '\022', '\242', '\001', '\n', '\030', 't', 'r', 'u', 's', 't', '_', 'c', 'h', 'a', 'i', 'n', '_', 'v', 'e', 'r', -'i', 'f', 'i', 'c', 'a', 't', 'i', 'o', 'n', '\030', '\n', ' ', '\001', '(', '\016', '2', '^', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', -'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', -'t', 's', '.', 't', 'l', 's', '.', 'v', '3', '.', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'V', 'a', 'l', 'i', -'d', 'a', 't', 'i', 'o', 'n', 'C', 'o', 'n', 't', 'e', 'x', 't', '.', 'T', 'r', 'u', 's', 't', 'C', 'h', 'a', 'i', 'n', 'V', -'e', 'r', 'i', 'f', 'i', 'c', 'a', 't', 'i', 'o', 'n', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\026', 't', 'r', -'u', 's', 't', 'C', 'h', 'a', 'i', 'n', 'V', 'e', 'r', 'i', 'f', 'i', 'c', 'a', 't', 'i', 'o', 'n', '\"', 'F', '\n', '\026', 'T', -'r', 'u', 's', 't', 'C', 'h', 'a', 'i', 'n', 'V', 'e', 'r', 'i', 'f', 'i', 'c', 'a', 't', 'i', 'o', 'n', '\022', '\026', '\n', '\022', -'V', 'E', 'R', 'I', 'F', 'Y', '_', 'T', 'R', 'U', 'S', 'T', '_', 'C', 'H', 'A', 'I', 'N', '\020', '\000', '\022', '\024', '\n', '\020', 'A', -'C', 'C', 'E', 'P', 'T', '_', 'U', 'N', 'T', 'R', 'U', 'S', 'T', 'E', 'D', '\020', '\001', ':', '5', '\232', '\305', '\210', '\036', '0', '\n', -'.', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'a', 'u', 't', 'h', '.', 'C', 'e', 'r', 't', 'i', 'f', -'i', 'c', 'a', 't', 'e', 'V', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', 'C', 'o', 'n', 't', 'e', 'x', 't', 'J', '\004', '\010', -'\004', '\020', '\005', 'J', '\004', '\010', '\005', '\020', '\006', 'R', '\027', 'v', 'e', 'r', 'i', 'f', 'y', '_', 's', 'u', 'b', 'j', 'e', 'c', 't', -'_', 'a', 'l', 't', '_', 'n', 'a', 'm', 'e', 'B', 'P', '\n', '7', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', -'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'n', 's', 'p', -'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '.', 't', 'l', 's', '.', 'v', '3', 'B', '\013', 'C', 'o', 'm', 'm', 'o', -'n', 'P', 'r', 'o', 't', 'o', 'P', '\001', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +'.', 'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', 'B', '\006', '\270', '\267', '\213', '\244', '\002', '\001', 'R', '\010', 'p', 'a', 's', 's', +'w', 'o', 'r', 'd', '\022', 'A', '\n', '\013', 'o', 'c', 's', 'p', '_', 's', 't', 'a', 'p', 'l', 'e', '\030', '\004', ' ', '\001', '(', '\013', +'2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'D', +'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', 'R', '\n', 'o', 'c', 's', 'p', 'S', 't', 'a', 'p', 'l', 'e', '\022', 'b', '\n', '\034', +'s', 'i', 'g', 'n', 'e', 'd', '_', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '_', 't', 'i', 'm', 'e', 's', 't', +'a', 'm', 'p', '\030', '\005', ' ', '\003', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', +'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', 'R', '\032', 's', 'i', 'g', 'n', 'e', +'d', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'T', 'i', 'm', 'e', 's', 't', 'a', 'm', 'p', ':', '\'', '\232', '\305', +'\210', '\036', '\"', '\n', ' ', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'a', 'u', 't', 'h', '.', 'T', 'l', +'s', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '\"', '\213', '\001', '\n', '\024', 'T', 'l', 's', 'S', 'e', 's', 's', 'i', +'o', 'n', 'T', 'i', 'c', 'k', 'e', 't', 'K', 'e', 'y', 's', '\022', 'D', '\n', '\004', 'k', 'e', 'y', 's', '\030', '\001', ' ', '\003', '(', +'\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', +'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', 'B', '\016', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', '\270', '\267', '\213', '\244', '\002', +'\001', 'R', '\004', 'k', 'e', 'y', 's', ':', '-', '\232', '\305', '\210', '\036', '(', '\n', '&', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', +'.', 'v', '2', '.', 'a', 'u', 't', 'h', '.', 'T', 'l', 's', 'S', 'e', 's', 's', 'i', 'o', 'n', 'T', 'i', 'c', 'k', 'e', 't', +'K', 'e', 'y', 's', '\"', '\307', '\007', '\n', '\034', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'V', 'a', 'l', 'i', 'd', +'a', 't', 'i', 'o', 'n', 'C', 'o', 'n', 't', 'e', 'x', 't', '\022', '?', '\n', '\n', 't', 'r', 'u', 's', 't', 'e', 'd', '_', 'c', +'a', '\030', '\001', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', +'r', 'e', '.', 'v', '3', '.', 'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', 'R', '\t', 't', 'r', 'u', 's', 't', 'e', 'd', +'C', 'a', '\022', 'S', '\n', '\021', 'w', 'a', 't', 'c', 'h', 'e', 'd', '_', 'd', 'i', 'r', 'e', 'c', 't', 'o', 'r', 'y', '\030', '\013', +' ', '\001', '(', '\013', '2', '&', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', +'v', '3', '.', 'W', 'a', 't', 'c', 'h', 'e', 'd', 'D', 'i', 'r', 'e', 'c', 't', 'o', 'r', 'y', 'R', '\020', 'w', 'a', 't', 'c', +'h', 'e', 'd', 'D', 'i', 'r', 'e', 'c', 't', 'o', 'r', 'y', '\022', 'F', '\n', '\027', 'v', 'e', 'r', 'i', 'f', 'y', '_', 'c', 'e', +'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '_', 's', 'p', 'k', 'i', '\030', '\003', ' ', '\003', '(', '\t', 'B', '\016', '\372', 'B', '\013', +'\222', '\001', '\010', '\"', '\006', 'r', '\004', '\020', ',', '(', ',', 'R', '\025', 'v', 'e', 'r', 'i', 'f', 'y', 'C', 'e', 'r', 't', 'i', 'f', +'i', 'c', 'a', 't', 'e', 'S', 'p', 'k', 'i', '\022', 'F', '\n', '\027', 'v', 'e', 'r', 'i', 'f', 'y', '_', 'c', 'e', 'r', 't', 'i', +'f', 'i', 'c', 'a', 't', 'e', '_', 'h', 'a', 's', 'h', '\030', '\002', ' ', '\003', '(', '\t', 'B', '\016', '\372', 'B', '\013', '\222', '\001', '\010', +'\"', '\006', 'r', '\004', '\020', '@', '(', '_', 'R', '\025', 'v', 'e', 'r', 'i', 'f', 'y', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', +'t', 'e', 'H', 'a', 's', 'h', '\022', '[', '\n', '\027', 'm', 'a', 't', 'c', 'h', '_', 's', 'u', 'b', 'j', 'e', 'c', 't', '_', 'a', +'l', 't', '_', 'n', 'a', 'm', 'e', 's', '\030', '\t', ' ', '\003', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', +'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'S', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', +'e', 'r', 'R', '\024', 'm', 'a', 't', 'c', 'h', 'S', 'u', 'b', 'j', 'e', 'c', 't', 'A', 'l', 't', 'N', 'a', 'm', 'e', 's', '\022', +'k', '\n', '$', 'r', 'e', 'q', 'u', 'i', 'r', 'e', '_', 's', 'i', 'g', 'n', 'e', 'd', '_', 'c', 'e', 'r', 't', 'i', 'f', 'i', +'c', 'a', 't', 'e', '_', 't', 'i', 'm', 'e', 's', 't', 'a', 'm', 'p', '\030', '\006', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', +'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', 'R', '!', +'r', 'e', 'q', 'u', 'i', 'r', 'e', 'S', 'i', 'g', 'n', 'e', 'd', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'T', +'i', 'm', 'e', 's', 't', 'a', 'm', 'p', '\022', '2', '\n', '\003', 'c', 'r', 'l', '\030', '\007', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', +'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'D', 'a', 't', 'a', 'S', +'o', 'u', 'r', 'c', 'e', 'R', '\003', 'c', 'r', 'l', '\022', ':', '\n', '\031', 'a', 'l', 'l', 'o', 'w', '_', 'e', 'x', 'p', 'i', 'r', +'e', 'd', '_', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '\030', '\010', ' ', '\001', '(', '\010', 'R', '\027', 'a', 'l', 'l', +'o', 'w', 'E', 'x', 'p', 'i', 'r', 'e', 'd', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '\022', '\242', '\001', '\n', '\030', +'t', 'r', 'u', 's', 't', '_', 'c', 'h', 'a', 'i', 'n', '_', 'v', 'e', 'r', 'i', 'f', 'i', 'c', 'a', 't', 'i', 'o', 'n', '\030', +'\n', ' ', '\001', '(', '\016', '2', '^', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', +'t', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '.', 't', 'l', 's', '.', 'v', '3', '.', +'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'V', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', 'C', 'o', 'n', 't', +'e', 'x', 't', '.', 'T', 'r', 'u', 's', 't', 'C', 'h', 'a', 'i', 'n', 'V', 'e', 'r', 'i', 'f', 'i', 'c', 'a', 't', 'i', 'o', +'n', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\026', 't', 'r', 'u', 's', 't', 'C', 'h', 'a', 'i', 'n', 'V', 'e', +'r', 'i', 'f', 'i', 'c', 'a', 't', 'i', 'o', 'n', '\"', 'F', '\n', '\026', 'T', 'r', 'u', 's', 't', 'C', 'h', 'a', 'i', 'n', 'V', +'e', 'r', 'i', 'f', 'i', 'c', 'a', 't', 'i', 'o', 'n', '\022', '\026', '\n', '\022', 'V', 'E', 'R', 'I', 'F', 'Y', '_', 'T', 'R', 'U', +'S', 'T', '_', 'C', 'H', 'A', 'I', 'N', '\020', '\000', '\022', '\024', '\n', '\020', 'A', 'C', 'C', 'E', 'P', 'T', '_', 'U', 'N', 'T', 'R', +'U', 'S', 'T', 'E', 'D', '\020', '\001', ':', '5', '\232', '\305', '\210', '\036', '0', '\n', '.', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', +'.', 'v', '2', '.', 'a', 'u', 't', 'h', '.', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'V', 'a', 'l', 'i', 'd', +'a', 't', 'i', 'o', 'n', 'C', 'o', 'n', 't', 'e', 'x', 't', 'J', '\004', '\010', '\004', '\020', '\005', 'J', '\004', '\010', '\005', '\020', '\006', 'R', +'\027', 'v', 'e', 'r', 'i', 'f', 'y', '_', 's', 'u', 'b', 'j', 'e', 'c', 't', '_', 'a', 'l', 't', '_', 'n', 'a', 'm', 'e', 'B', +'P', '\n', '7', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', +'t', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', +'s', '.', 't', 'l', 's', '.', 'v', '3', 'B', '\013', 'C', 'o', 'm', 'm', 'o', 'n', 'P', 'r', 'o', 't', 'o', 'P', '\001', '\272', '\200', +'\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; -static upb_def_init *deps[10] = { +static upb_def_init *deps[9] = { &envoy_config_core_v3_base_proto_upbdefinit, &envoy_type_matcher_v3_string_proto_upbdefinit, &google_protobuf_any_proto_upbdefinit, - &google_protobuf_struct_proto_upbdefinit, &google_protobuf_wrappers_proto_upbdefinit, &udpa_annotations_sensitive_proto_upbdefinit, &udpa_annotations_status_proto_upbdefinit, @@ -162,5 +166,5 @@ upb_def_init envoy_extensions_transport_sockets_tls_v3_common_proto_upbdefinit = deps, layouts, "envoy/extensions/transport_sockets/tls/v3/common.proto", - UPB_STRVIEW_INIT(descriptor, 2774) + UPB_STRVIEW_INIT(descriptor, 2914) }; diff --git a/grpc/src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.c b/grpc/src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.c index 7d6cfc4c..5623e1bc 100644 --- a/grpc/src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.c +++ b/grpc/src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/secret.upbdefs.c @@ -12,11 +12,10 @@ extern upb_def_init envoy_config_core_v3_base_proto_upbdefinit; extern upb_def_init envoy_config_core_v3_config_source_proto_upbdefinit; extern upb_def_init envoy_extensions_transport_sockets_tls_v3_common_proto_upbdefinit; -extern upb_def_init udpa_core_v1_resource_locator_proto_upbdefinit; -extern upb_def_init udpa_annotations_migrate_proto_upbdefinit; extern upb_def_init udpa_annotations_sensitive_proto_upbdefinit; extern upb_def_init udpa_annotations_status_proto_upbdefinit; extern upb_def_init udpa_annotations_versioning_proto_upbdefinit; +extern upb_def_init validate_validate_proto_upbdefinit; extern const upb_msglayout envoy_extensions_transport_sockets_tls_v3_GenericSecret_msginit; extern const upb_msglayout envoy_extensions_transport_sockets_tls_v3_SdsSecretConfig_msginit; extern const upb_msglayout envoy_extensions_transport_sockets_tls_v3_Secret_msginit; @@ -27,7 +26,7 @@ static const upb_msglayout *layouts[3] = { &envoy_extensions_transport_sockets_tls_v3_Secret_msginit, }; -static const char descriptor[1400] = {'\n', '6', 'e', 'n', 'v', 'o', 'y', '/', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '/', 't', 'r', 'a', 'n', 's', 'p', +static const char descriptor[1236] = {'\n', '6', 'e', 'n', 'v', 'o', 'y', '/', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '/', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '/', 't', 'l', 's', '/', 'v', '3', '/', 's', 'e', 'c', 'r', 'e', 't', '.', 'p', 'r', 'o', 't', 'o', '\022', ')', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '.', 't', 'l', 's', '.', 'v', '3', '\032', @@ -36,64 +35,57 @@ static const char descriptor[1400] = {'\n', '6', 'e', 'n', 'v', 'o', 'y', '/', ' 'e', '/', 'v', '3', '/', 'c', 'o', 'n', 'f', 'i', 'g', '_', 's', 'o', 'u', 'r', 'c', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', '6', 'e', 'n', 'v', 'o', 'y', '/', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '/', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '/', 't', 'l', 's', '/', 'v', '3', '/', 'c', 'o', 'm', 'm', 'o', 'n', '.', -'p', 'r', 'o', 't', 'o', '\032', '#', 'u', 'd', 'p', 'a', '/', 'c', 'o', 'r', 'e', '/', 'v', '1', '/', 'r', 'e', 's', 'o', 'u', -'r', 'c', 'e', '_', 'l', 'o', 'c', 'a', 't', 'o', 'r', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'u', 'd', 'p', 'a', '/', 'a', -'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'm', 'i', 'g', 'r', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', -' ', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 'e', 'n', 's', 'i', 't', 'i', -'v', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', -'s', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', -'t', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\"', -'y', '\n', '\r', 'G', 'e', 'n', 'e', 'r', 'i', 'c', 'S', 'e', 'c', 'r', 'e', 't', '\022', '@', '\n', '\006', 's', 'e', 'c', 'r', 'e', -'t', '\030', '\001', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', -'r', 'e', '.', 'v', '3', '.', 'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', 'B', '\006', '\270', '\267', '\213', '\244', '\002', '\001', 'R', -'\006', 's', 'e', 'c', 'r', 'e', 't', ':', '&', '\232', '\305', '\210', '\036', '!', '\n', '\037', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', -'.', 'v', '2', '.', 'a', 'u', 't', 'h', '.', 'G', 'e', 'n', 'e', 'r', 'i', 'c', 'S', 'e', 'c', 'r', 'e', 't', '\"', '\223', '\002', -'\n', '\017', 'S', 'd', 's', 'S', 'e', 'c', 'r', 'e', 't', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '*', '\n', '\004', 'n', 'a', 'm', 'e', -'\030', '\001', ' ', '\001', '(', '\t', 'B', '\026', '\362', '\230', '\376', '\217', '\005', '\020', '\022', '\016', 'n', 'a', 'm', 'e', '_', 's', 'p', 'e', 'c', -'i', 'f', 'i', 'e', 'r', 'R', '\004', 'n', 'a', 'm', 'e', '\022', 'g', '\n', '\024', 's', 'd', 's', '_', 'r', 'e', 's', 'o', 'u', 'r', -'c', 'e', '_', 'l', 'o', 'c', 'a', 't', 'o', 'r', '\030', '\003', ' ', '\001', '(', '\013', '2', '\035', '.', 'u', 'd', 'p', 'a', '.', 'c', -'o', 'r', 'e', '.', 'v', '1', '.', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', 'L', 'o', 'c', 'a', 't', 'o', 'r', 'B', '\026', '\362', -'\230', '\376', '\217', '\005', '\020', '\022', '\016', 'n', 'a', 'm', 'e', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'R', '\022', 's', 'd', -'s', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', 'L', 'o', 'c', 'a', 't', 'o', 'r', '\022', 'A', '\n', '\n', 's', 'd', 's', '_', 'c', -'o', 'n', 'f', 'i', 'g', '\030', '\002', ' ', '\001', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', -'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', 'R', '\t', 's', -'d', 's', 'C', 'o', 'n', 'f', 'i', 'g', ':', '(', '\232', '\305', '\210', '\036', '#', '\n', '!', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', -'i', '.', 'v', '2', '.', 'a', 'u', 't', 'h', '.', 'S', 'd', 's', 'S', 'e', 'c', 'r', 'e', 't', 'C', 'o', 'n', 'f', 'i', 'g', -'\"', '\373', '\003', '\n', '\006', 'S', 'e', 'c', 'r', 'e', 't', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', -'R', '\004', 'n', 'a', 'm', 'e', '\022', 'd', '\n', '\017', 't', 'l', 's', '_', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', -'\030', '\002', ' ', '\001', '(', '\013', '2', '9', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', -'.', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '.', 't', 'l', 's', '.', 'v', '3', -'.', 'T', 'l', 's', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'H', '\000', 'R', '\016', 't', 'l', 's', 'C', 'e', 'r', -'t', 'i', 'f', 'i', 'c', 'a', 't', 'e', '\022', 'q', '\n', '\023', 's', 'e', 's', 's', 'i', 'o', 'n', '_', 't', 'i', 'c', 'k', 'e', -'t', '_', 'k', 'e', 'y', 's', '\030', '\003', ' ', '\001', '(', '\013', '2', '?', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', +'p', 'r', 'o', 't', 'o', '\032', ' ', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', +'e', 'n', 's', 'i', 't', 'i', 'v', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', +'t', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '!', 'u', 'd', 'p', +'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', +'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', +'p', 'r', 'o', 't', 'o', '\"', 'y', '\n', '\r', 'G', 'e', 'n', 'e', 'r', 'i', 'c', 'S', 'e', 'c', 'r', 'e', 't', '\022', '@', '\n', +'\006', 's', 'e', 'c', 'r', 'e', 't', '\030', '\001', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', +'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'D', 'a', 't', 'a', 'S', 'o', 'u', 'r', 'c', 'e', 'B', '\006', '\270', +'\267', '\213', '\244', '\002', '\001', 'R', '\006', 's', 'e', 'c', 'r', 'e', 't', ':', '&', '\232', '\305', '\210', '\036', '!', '\n', '\037', 'e', 'n', 'v', +'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'a', 'u', 't', 'h', '.', 'G', 'e', 'n', 'e', 'r', 'i', 'c', 'S', 'e', 'c', +'r', 'e', 't', '\"', '\233', '\001', '\n', '\017', 'S', 'd', 's', 'S', 'e', 'c', 'r', 'e', 't', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '\033', +'\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', +'m', 'e', '\022', 'A', '\n', '\n', 's', 'd', 's', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\002', ' ', '\001', '(', '\013', '2', '\"', '.', +'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'C', 'o', 'n', 'f', +'i', 'g', 'S', 'o', 'u', 'r', 'c', 'e', 'R', '\t', 's', 'd', 's', 'C', 'o', 'n', 'f', 'i', 'g', ':', '(', '\232', '\305', '\210', '\036', +'#', '\n', '!', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'a', 'u', 't', 'h', '.', 'S', 'd', 's', 'S', +'e', 'c', 'r', 'e', 't', 'C', 'o', 'n', 'f', 'i', 'g', '\"', '\373', '\003', '\n', '\006', 'S', 'e', 'c', 'r', 'e', 't', '\022', '\022', '\n', +'\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', 'd', '\n', '\017', 't', 'l', 's', '_', +'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '9', '.', 'e', 'n', 'v', 'o', 'y', +'.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', +'k', 'e', 't', 's', '.', 't', 'l', 's', '.', 'v', '3', '.', 'T', 'l', 's', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', +'e', 'H', '\000', 'R', '\016', 't', 'l', 's', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '\022', 'q', '\n', '\023', 's', 'e', +'s', 's', 'i', 'o', 'n', '_', 't', 'i', 'c', 'k', 'e', 't', '_', 'k', 'e', 'y', 's', '\030', '\003', ' ', '\001', '(', '\013', '2', '?', +'.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'n', 's', 'p', 'o', +'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '.', 't', 'l', 's', '.', 'v', '3', '.', 'T', 'l', 's', 'S', 'e', 's', 's', +'i', 'o', 'n', 'T', 'i', 'c', 'k', 'e', 't', 'K', 'e', 'y', 's', 'H', '\000', 'R', '\021', 's', 'e', 's', 's', 'i', 'o', 'n', 'T', +'i', 'c', 'k', 'e', 't', 'K', 'e', 'y', 's', '\022', 'x', '\n', '\022', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', '_', 'c', +'o', 'n', 't', 'e', 'x', 't', '\030', '\004', ' ', '\001', '(', '\013', '2', 'G', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '.', -'t', 'l', 's', '.', 'v', '3', '.', 'T', 'l', 's', 'S', 'e', 's', 's', 'i', 'o', 'n', 'T', 'i', 'c', 'k', 'e', 't', 'K', 'e', -'y', 's', 'H', '\000', 'R', '\021', 's', 'e', 's', 's', 'i', 'o', 'n', 'T', 'i', 'c', 'k', 'e', 't', 'K', 'e', 'y', 's', '\022', 'x', -'\n', '\022', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', '_', 'c', 'o', 'n', 't', 'e', 'x', 't', '\030', '\004', ' ', '\001', '(', -'\013', '2', 'G', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'n', -'s', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '.', 't', 'l', 's', '.', 'v', '3', '.', 'C', 'e', 'r', 't', -'i', 'f', 'i', 'c', 'a', 't', 'e', 'V', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', 'C', 'o', 'n', 't', 'e', 'x', 't', 'H', -'\000', 'R', '\021', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', 'C', 'o', 'n', 't', 'e', 'x', 't', '\022', 'a', '\n', '\016', 'g', -'e', 'n', 'e', 'r', 'i', 'c', '_', 's', 'e', 'c', 'r', 'e', 't', '\030', '\005', ' ', '\001', '(', '\013', '2', '8', '.', 'e', 'n', 'v', -'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', -'o', 'c', 'k', 'e', 't', 's', '.', 't', 'l', 's', '.', 'v', '3', '.', 'G', 'e', 'n', 'e', 'r', 'i', 'c', 'S', 'e', 'c', 'r', -'e', 't', 'H', '\000', 'R', '\r', 'g', 'e', 'n', 'e', 'r', 'i', 'c', 'S', 'e', 'c', 'r', 'e', 't', ':', '\037', '\232', '\305', '\210', '\036', -'\032', '\n', '\030', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'a', 'u', 't', 'h', '.', 'S', 'e', 'c', 'r', -'e', 't', 'B', '\006', '\n', '\004', 't', 'y', 'p', 'e', 'B', 'P', '\n', '7', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', -'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'n', 's', -'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '.', 't', 'l', 's', '.', 'v', '3', 'B', '\013', 'S', 'e', 'c', 'r', -'e', 't', 'P', 'r', 'o', 't', 'o', 'P', '\001', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +'t', 'l', 's', '.', 'v', '3', '.', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'V', 'a', 'l', 'i', 'd', 'a', 't', +'i', 'o', 'n', 'C', 'o', 'n', 't', 'e', 'x', 't', 'H', '\000', 'R', '\021', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', 'C', +'o', 'n', 't', 'e', 'x', 't', '\022', 'a', '\n', '\016', 'g', 'e', 'n', 'e', 'r', 'i', 'c', '_', 's', 'e', 'c', 'r', 'e', 't', '\030', +'\005', ' ', '\001', '(', '\013', '2', '8', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', +'t', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '.', 't', 'l', 's', '.', 'v', '3', '.', +'G', 'e', 'n', 'e', 'r', 'i', 'c', 'S', 'e', 'c', 'r', 'e', 't', 'H', '\000', 'R', '\r', 'g', 'e', 'n', 'e', 'r', 'i', 'c', 'S', +'e', 'c', 'r', 'e', 't', ':', '\037', '\232', '\305', '\210', '\036', '\032', '\n', '\030', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', +'2', '.', 'a', 'u', 't', 'h', '.', 'S', 'e', 'c', 'r', 'e', 't', 'B', '\006', '\n', '\004', 't', 'y', 'p', 'e', 'B', 'P', '\n', '7', +'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', +'s', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '.', 't', +'l', 's', '.', 'v', '3', 'B', '\013', 'S', 'e', 'c', 'r', 'e', 't', 'P', 'r', 'o', 't', 'o', 'P', '\001', '\272', '\200', '\310', '\321', '\006', +'\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; -static upb_def_init *deps[9] = { +static upb_def_init *deps[8] = { &envoy_config_core_v3_base_proto_upbdefinit, &envoy_config_core_v3_config_source_proto_upbdefinit, &envoy_extensions_transport_sockets_tls_v3_common_proto_upbdefinit, - &udpa_core_v1_resource_locator_proto_upbdefinit, - &udpa_annotations_migrate_proto_upbdefinit, &udpa_annotations_sensitive_proto_upbdefinit, &udpa_annotations_status_proto_upbdefinit, &udpa_annotations_versioning_proto_upbdefinit, + &validate_validate_proto_upbdefinit, NULL }; @@ -101,5 +93,5 @@ upb_def_init envoy_extensions_transport_sockets_tls_v3_secret_proto_upbdefinit = deps, layouts, "envoy/extensions/transport_sockets/tls/v3/secret.proto", - UPB_STRVIEW_INIT(descriptor, 1400) + UPB_STRVIEW_INIT(descriptor, 1236) }; diff --git a/grpc/src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c b/grpc/src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c index 97532f25..a4651fcd 100644 --- a/grpc/src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c +++ b/grpc/src/core/ext/upbdefs-generated/envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.c @@ -12,7 +12,6 @@ extern upb_def_init envoy_config_core_v3_extension_proto_upbdefinit; extern upb_def_init envoy_extensions_transport_sockets_tls_v3_common_proto_upbdefinit; extern upb_def_init envoy_extensions_transport_sockets_tls_v3_secret_proto_upbdefinit; -extern upb_def_init google_protobuf_any_proto_upbdefinit; extern upb_def_init google_protobuf_duration_proto_upbdefinit; extern upb_def_init google_protobuf_wrappers_proto_upbdefinit; extern upb_def_init udpa_annotations_migrate_proto_upbdefinit; @@ -35,7 +34,7 @@ static const upb_msglayout *layouts[6] = { &envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CombinedCertificateValidationContext_msginit, }; -static const char descriptor[4734] = {'\n', '3', 'e', 'n', 'v', 'o', 'y', '/', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '/', 't', 'r', 'a', 'n', 's', 'p', +static const char descriptor[4707] = {'\n', '3', 'e', 'n', 'v', 'o', 'y', '/', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '/', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '/', 't', 'l', 's', '/', 'v', '3', '/', 't', 'l', 's', '.', 'p', 'r', 'o', 't', 'o', '\022', ')', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '.', 't', 'l', 's', '.', 'v', '3', '\032', '$', 'e', 'n', @@ -44,194 +43,192 @@ static const char descriptor[4734] = {'\n', '3', 'e', 'n', 'v', 'o', 'y', '/', ' 'n', 's', '/', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '/', 't', 'l', 's', '/', 'v', '3', '/', 'c', 'o', 'm', 'm', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\032', '6', 'e', 'n', 'v', 'o', 'y', '/', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '/', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', -'s', '/', 't', 'l', 's', '/', 'v', '3', '/', 's', 'e', 'c', 'r', 'e', 't', '.', 'p', 'r', 'o', 't', 'o', '\032', '\031', 'g', 'o', -'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'a', 'n', 'y', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', -'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', '.', -'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'w', 'r', -'a', 'p', 'p', 'e', 'r', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', -'t', 'i', 'o', 'n', 's', '/', 'm', 'i', 'g', 'r', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', '\035', 'u', 'd', 'p', 'a', -'/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', -'\032', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', -'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', -'d', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '\301', '\002', '\n', '\022', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'T', 'l', -'s', 'C', 'o', 'n', 't', 'e', 'x', 't', '\022', 'i', '\n', '\022', 'c', 'o', 'm', 'm', 'o', 'n', '_', 't', 'l', 's', '_', 'c', 'o', -'n', 't', 'e', 'x', 't', '\030', '\001', ' ', '\001', '(', '\013', '2', ';', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', -'s', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '.', 't', -'l', 's', '.', 'v', '3', '.', 'C', 'o', 'm', 'm', 'o', 'n', 'T', 'l', 's', 'C', 'o', 'n', 't', 'e', 'x', 't', 'R', '\020', 'c', -'o', 'm', 'm', 'o', 'n', 'T', 'l', 's', 'C', 'o', 'n', 't', 'e', 'x', 't', '\022', '\032', '\n', '\003', 's', 'n', 'i', '\030', '\002', ' ', -'\001', '(', '\t', 'B', '\010', '\372', 'B', '\005', 'r', '\003', '(', '\377', '\001', 'R', '\003', 's', 'n', 'i', '\022', '/', '\n', '\023', 'a', 'l', 'l', -'o', 'w', '_', 'r', 'e', 'n', 'e', 'g', 'o', 't', 'i', 'a', 't', 'i', 'o', 'n', '\030', '\003', ' ', '\001', '(', '\010', 'R', '\022', 'a', -'l', 'l', 'o', 'w', 'R', 'e', 'n', 'e', 'g', 'o', 't', 'i', 'a', 't', 'i', 'o', 'n', '\022', 'F', '\n', '\020', 'm', 'a', 'x', '_', -'s', 'e', 's', 's', 'i', 'o', 'n', '_', 'k', 'e', 'y', 's', '\030', '\004', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', -'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\016', -'m', 'a', 'x', 'S', 'e', 's', 's', 'i', 'o', 'n', 'K', 'e', 'y', 's', ':', '+', '\232', '\305', '\210', '\036', '&', '\n', '$', 'e', 'n', -'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'a', 'u', 't', 'h', '.', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'T', -'l', 's', 'C', 'o', 'n', 't', 'e', 'x', 't', '\"', '\352', '\007', '\n', '\024', 'D', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', 'T', -'l', 's', 'C', 'o', 'n', 't', 'e', 'x', 't', '\022', 'i', '\n', '\022', 'c', 'o', 'm', 'm', 'o', 'n', '_', 't', 'l', 's', '_', 'c', -'o', 'n', 't', 'e', 'x', 't', '\030', '\001', ' ', '\001', '(', '\013', '2', ';', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', -'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '.', -'t', 'l', 's', '.', 'v', '3', '.', 'C', 'o', 'm', 'm', 'o', 'n', 'T', 'l', 's', 'C', 'o', 'n', 't', 'e', 'x', 't', 'R', '\020', -'c', 'o', 'm', 'm', 'o', 'n', 'T', 'l', 's', 'C', 'o', 'n', 't', 'e', 'x', 't', '\022', 'X', '\n', '\032', 'r', 'e', 'q', 'u', 'i', -'r', 'e', '_', 'c', 'l', 'i', 'e', 'n', 't', '_', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '\030', '\002', ' ', '\001', -'(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', -'V', 'a', 'l', 'u', 'e', 'R', '\030', 'r', 'e', 'q', 'u', 'i', 'r', 'e', 'C', 'l', 'i', 'e', 'n', 't', 'C', 'e', 'r', 't', 'i', -'f', 'i', 'c', 'a', 't', 'e', '\022', ';', '\n', '\013', 'r', 'e', 'q', 'u', 'i', 'r', 'e', '_', 's', 'n', 'i', '\030', '\003', ' ', '\001', -'(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', -'V', 'a', 'l', 'u', 'e', 'R', '\n', 'r', 'e', 'q', 'u', 'i', 'r', 'e', 'S', 'n', 'i', '\022', 'q', '\n', '\023', 's', 'e', 's', 's', -'i', 'o', 'n', '_', 't', 'i', 'c', 'k', 'e', 't', '_', 'k', 'e', 'y', 's', '\030', '\004', ' ', '\001', '(', '\013', '2', '?', '.', 'e', -'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', -'_', 's', 'o', 'c', 'k', 'e', 't', 's', '.', 't', 'l', 's', '.', 'v', '3', '.', 'T', 'l', 's', 'S', 'e', 's', 's', 'i', 'o', -'n', 'T', 'i', 'c', 'k', 'e', 't', 'K', 'e', 'y', 's', 'H', '\000', 'R', '\021', 's', 'e', 's', 's', 'i', 'o', 'n', 'T', 'i', 'c', -'k', 'e', 't', 'K', 'e', 'y', 's', '\022', '\215', '\001', '\n', '%', 's', 'e', 's', 's', 'i', 'o', 'n', '_', 't', 'i', 'c', 'k', 'e', -'t', '_', 'k', 'e', 'y', 's', '_', 's', 'd', 's', '_', 's', 'e', 'c', 'r', 'e', 't', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', -'\005', ' ', '\001', '(', '\013', '2', ':', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', -'t', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '.', 't', 'l', 's', '.', 'v', '3', '.', -'S', 'd', 's', 'S', 'e', 'c', 'r', 'e', 't', 'C', 'o', 'n', 'f', 'i', 'g', 'H', '\000', 'R', ' ', 's', 'e', 's', 's', 'i', 'o', -'n', 'T', 'i', 'c', 'k', 'e', 't', 'K', 'e', 'y', 's', 'S', 'd', 's', 'S', 'e', 'c', 'r', 'e', 't', 'C', 'o', 'n', 'f', 'i', -'g', '\022', 'Q', '\n', '$', 'd', 'i', 's', 'a', 'b', 'l', 'e', '_', 's', 't', 'a', 't', 'e', 'l', 'e', 's', 's', '_', 's', 'e', -'s', 's', 'i', 'o', 'n', '_', 'r', 'e', 's', 'u', 'm', 'p', 't', 'i', 'o', 'n', '\030', '\007', ' ', '\001', '(', '\010', 'H', '\000', 'R', -'!', 'd', 'i', 's', 'a', 'b', 'l', 'e', 'S', 't', 'a', 't', 'e', 'l', 'e', 's', 's', 'S', 'e', 's', 's', 'i', 'o', 'n', 'R', -'e', 's', 'u', 'm', 'p', 't', 'i', 'o', 'n', '\022', 'T', '\n', '\017', 's', 'e', 's', 's', 'i', 'o', 'n', '_', 't', 'i', 'm', 'e', -'o', 'u', 't', '\030', '\006', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', -'u', 'f', '.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\020', '\372', 'B', '\r', '\252', '\001', '\n', '\032', '\006', '\010', '\200', '\200', '\200', -'\200', '\020', '2', '\000', 'R', '\016', 's', 'e', 's', 's', 'i', 'o', 'n', 'T', 'i', 'm', 'e', 'o', 'u', 't', '\022', '\210', '\001', '\n', '\022', -'o', 'c', 's', 'p', '_', 's', 't', 'a', 'p', 'l', 'e', '_', 'p', 'o', 'l', 'i', 'c', 'y', '\030', '\010', ' ', '\001', '(', '\016', '2', -'P', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'n', 's', 'p', -'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '.', 't', 'l', 's', '.', 'v', '3', '.', 'D', 'o', 'w', 'n', 's', 't', -'r', 'e', 'a', 'm', 'T', 'l', 's', 'C', 'o', 'n', 't', 'e', 'x', 't', '.', 'O', 'c', 's', 'p', 'S', 't', 'a', 'p', 'l', 'e', -'P', 'o', 'l', 'i', 'c', 'y', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\020', 'o', 'c', 's', 'p', 'S', 't', 'a', -'p', 'l', 'e', 'P', 'o', 'l', 'i', 'c', 'y', '\"', 'N', '\n', '\020', 'O', 'c', 's', 'p', 'S', 't', 'a', 'p', 'l', 'e', 'P', 'o', -'l', 'i', 'c', 'y', '\022', '\024', '\n', '\020', 'L', 'E', 'N', 'I', 'E', 'N', 'T', '_', 'S', 'T', 'A', 'P', 'L', 'I', 'N', 'G', '\020', -'\000', '\022', '\023', '\n', '\017', 'S', 'T', 'R', 'I', 'C', 'T', '_', 'S', 'T', 'A', 'P', 'L', 'I', 'N', 'G', '\020', '\001', '\022', '\017', '\n', -'\013', 'M', 'U', 'S', 'T', '_', 'S', 'T', 'A', 'P', 'L', 'E', '\020', '\002', ':', '-', '\232', '\305', '\210', '\036', '(', '\n', '&', 'e', 'n', -'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'a', 'u', 't', 'h', '.', 'D', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', -'m', 'T', 'l', 's', 'C', 'o', 'n', 't', 'e', 'x', 't', 'B', '\032', '\n', '\030', 's', 'e', 's', 's', 'i', 'o', 'n', '_', 't', 'i', -'c', 'k', 'e', 't', '_', 'k', 'e', 'y', 's', '_', 't', 'y', 'p', 'e', '\"', '\247', '\026', '\n', '\020', 'C', 'o', 'm', 'm', 'o', 'n', -'T', 'l', 's', 'C', 'o', 'n', 't', 'e', 'x', 't', '\022', 'W', '\n', '\n', 't', 'l', 's', '_', 'p', 'a', 'r', 'a', 'm', 's', '\030', -'\001', ' ', '\001', '(', '\013', '2', '8', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', -'t', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '.', 't', 'l', 's', '.', 'v', '3', '.', -'T', 'l', 's', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 's', 'R', '\t', 't', 'l', 's', 'P', 'a', 'r', 'a', 'm', 's', '\022', -'d', '\n', '\020', 't', 'l', 's', '_', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 's', '\030', '\002', ' ', '\003', '(', '\013', -'2', '9', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'n', 's', -'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '.', 't', 'l', 's', '.', 'v', '3', '.', 'T', 'l', 's', 'C', 'e', -'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'R', '\017', 't', 'l', 's', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', -'s', '\022', '\220', '\001', '\n', '\"', 't', 'l', 's', '_', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '_', 's', 'd', 's', -'_', 's', 'e', 'c', 'r', 'e', 't', '_', 'c', 'o', 'n', 'f', 'i', 'g', 's', '\030', '\006', ' ', '\003', '(', '\013', '2', ':', '.', 'e', -'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', -'_', 's', 'o', 'c', 'k', 'e', 't', 's', '.', 't', 'l', 's', '.', 'v', '3', '.', 'S', 'd', 's', 'S', 'e', 'c', 'r', 'e', 't', -'C', 'o', 'n', 'f', 'i', 'g', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\020', '\001', 'R', '\036', 't', 'l', 's', 'C', 'e', 'r', 't', -'i', 'f', 'i', 'c', 'a', 't', 'e', 'S', 'd', 's', 'S', 'e', 'c', 'r', 'e', 't', 'C', 'o', 'n', 'f', 'i', 'g', 's', '\022', '\240', -'\001', '\n', '$', 't', 'l', 's', '_', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '_', 'c', 'e', 'r', 't', 'i', 'f', -'i', 'c', 'a', 't', 'e', '_', 'p', 'r', 'o', 'v', 'i', 'd', 'e', 'r', '\030', '\t', ' ', '\001', '(', '\013', '2', 'O', '.', 'e', 'n', -'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', -'s', 'o', 'c', 'k', 'e', 't', 's', '.', 't', 'l', 's', '.', 'v', '3', '.', 'C', 'o', 'm', 'm', 'o', 'n', 'T', 'l', 's', 'C', -'o', 'n', 't', 'e', 'x', 't', '.', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'v', 'i', 'd', 'e', -'r', 'R', '!', 't', 'l', 's', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', -'a', 't', 'e', 'P', 'r', 'o', 'v', 'i', 'd', 'e', 'r', '\022', '\271', '\001', '\n', '-', 't', 'l', 's', '_', 'c', 'e', 'r', 't', 'i', -'f', 'i', 'c', 'a', 't', 'e', '_', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '_', 'p', 'r', 'o', 'v', 'i', 'd', -'e', 'r', '_', 'i', 'n', 's', 't', 'a', 'n', 'c', 'e', '\030', '\013', ' ', '\001', '(', '\013', '2', 'W', '.', 'e', 'n', 'v', 'o', 'y', -'.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', -'k', 'e', 't', 's', '.', 't', 'l', 's', '.', 'v', '3', '.', 'C', 'o', 'm', 'm', 'o', 'n', 'T', 'l', 's', 'C', 'o', 'n', 't', -'e', 'x', 't', '.', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'v', 'i', 'd', 'e', 'r', 'I', 'n', -'s', 't', 'a', 'n', 'c', 'e', 'R', ')', 't', 'l', 's', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'C', 'e', 'r', -'t', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'v', 'i', 'd', 'e', 'r', 'I', 'n', 's', 't', 'a', 'n', 'c', 'e', '\022', -'x', '\n', '\022', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', '_', 'c', 'o', 'n', 't', 'e', 'x', 't', '\030', '\003', ' ', '\001', -'(', '\013', '2', 'G', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', -'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '.', 't', 'l', 's', '.', 'v', '3', '.', 'C', 'e', 'r', -'t', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'V', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', 'C', 'o', 'n', 't', 'e', 'x', 't', -'H', '\000', 'R', '\021', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', 'C', 'o', 'n', 't', 'e', 'x', 't', '\022', '\214', '\001', '\n', -'$', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', '_', 'c', 'o', 'n', 't', 'e', 'x', 't', '_', 's', 'd', 's', '_', 's', -'e', 'c', 'r', 'e', 't', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\007', ' ', '\001', '(', '\013', '2', ':', '.', 'e', 'n', 'v', 'o', +'s', '/', 't', 'l', 's', '/', 'v', '3', '/', 's', 'e', 'c', 'r', 'e', 't', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', +'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', '.', 'p', 'r', +'o', 't', 'o', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'w', 'r', 'a', 'p', +'p', 'e', 'r', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', +'o', 'n', 's', '/', 'm', 'i', 'g', 'r', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', +'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '!', +'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', +'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', +'t', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '\301', '\002', '\n', '\022', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'T', 'l', 's', 'C', +'o', 'n', 't', 'e', 'x', 't', '\022', 'i', '\n', '\022', 'c', 'o', 'm', 'm', 'o', 'n', '_', 't', 'l', 's', '_', 'c', 'o', 'n', 't', +'e', 'x', 't', '\030', '\001', ' ', '\001', '(', '\013', '2', ';', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', +'o', 'n', 's', '.', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '.', 't', 'l', 's', +'.', 'v', '3', '.', 'C', 'o', 'm', 'm', 'o', 'n', 'T', 'l', 's', 'C', 'o', 'n', 't', 'e', 'x', 't', 'R', '\020', 'c', 'o', 'm', +'m', 'o', 'n', 'T', 'l', 's', 'C', 'o', 'n', 't', 'e', 'x', 't', '\022', '\032', '\n', '\003', 's', 'n', 'i', '\030', '\002', ' ', '\001', '(', +'\t', 'B', '\010', '\372', 'B', '\005', 'r', '\003', '(', '\377', '\001', 'R', '\003', 's', 'n', 'i', '\022', '/', '\n', '\023', 'a', 'l', 'l', 'o', 'w', +'_', 'r', 'e', 'n', 'e', 'g', 'o', 't', 'i', 'a', 't', 'i', 'o', 'n', '\030', '\003', ' ', '\001', '(', '\010', 'R', '\022', 'a', 'l', 'l', +'o', 'w', 'R', 'e', 'n', 'e', 'g', 'o', 't', 'i', 'a', 't', 'i', 'o', 'n', '\022', 'F', '\n', '\020', 'm', 'a', 'x', '_', 's', 'e', +'s', 's', 'i', 'o', 'n', '_', 'k', 'e', 'y', 's', '\030', '\004', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', +'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', 'R', '\016', 'm', 'a', +'x', 'S', 'e', 's', 's', 'i', 'o', 'n', 'K', 'e', 'y', 's', ':', '+', '\232', '\305', '\210', '\036', '&', '\n', '$', 'e', 'n', 'v', 'o', +'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'a', 'u', 't', 'h', '.', 'U', 'p', 's', 't', 'r', 'e', 'a', 'm', 'T', 'l', 's', +'C', 'o', 'n', 't', 'e', 'x', 't', '\"', '\352', '\007', '\n', '\024', 'D', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', 'T', 'l', 's', +'C', 'o', 'n', 't', 'e', 'x', 't', '\022', 'i', '\n', '\022', 'c', 'o', 'm', 'm', 'o', 'n', '_', 't', 'l', 's', '_', 'c', 'o', 'n', +'t', 'e', 'x', 't', '\030', '\001', ' ', '\001', '(', '\013', '2', ';', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', +'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '.', 't', 'l', +'s', '.', 'v', '3', '.', 'C', 'o', 'm', 'm', 'o', 'n', 'T', 'l', 's', 'C', 'o', 'n', 't', 'e', 'x', 't', 'R', '\020', 'c', 'o', +'m', 'm', 'o', 'n', 'T', 'l', 's', 'C', 'o', 'n', 't', 'e', 'x', 't', '\022', 'X', '\n', '\032', 'r', 'e', 'q', 'u', 'i', 'r', 'e', +'_', 'c', 'l', 'i', 'e', 'n', 't', '_', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '\030', '\002', ' ', '\001', '(', '\013', +'2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', +'l', 'u', 'e', 'R', '\030', 'r', 'e', 'q', 'u', 'i', 'r', 'e', 'C', 'l', 'i', 'e', 'n', 't', 'C', 'e', 'r', 't', 'i', 'f', 'i', +'c', 'a', 't', 'e', '\022', ';', '\n', '\013', 'r', 'e', 'q', 'u', 'i', 'r', 'e', '_', 's', 'n', 'i', '\030', '\003', ' ', '\001', '(', '\013', +'2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'B', 'o', 'o', 'l', 'V', 'a', +'l', 'u', 'e', 'R', '\n', 'r', 'e', 'q', 'u', 'i', 'r', 'e', 'S', 'n', 'i', '\022', 'q', '\n', '\023', 's', 'e', 's', 's', 'i', 'o', +'n', '_', 't', 'i', 'c', 'k', 'e', 't', '_', 'k', 'e', 'y', 's', '\030', '\004', ' ', '\001', '(', '\013', '2', '?', '.', 'e', 'n', 'v', +'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', +'o', 'c', 'k', 'e', 't', 's', '.', 't', 'l', 's', '.', 'v', '3', '.', 'T', 'l', 's', 'S', 'e', 's', 's', 'i', 'o', 'n', 'T', +'i', 'c', 'k', 'e', 't', 'K', 'e', 'y', 's', 'H', '\000', 'R', '\021', 's', 'e', 's', 's', 'i', 'o', 'n', 'T', 'i', 'c', 'k', 'e', +'t', 'K', 'e', 'y', 's', '\022', '\215', '\001', '\n', '%', 's', 'e', 's', 's', 'i', 'o', 'n', '_', 't', 'i', 'c', 'k', 'e', 't', '_', +'k', 'e', 'y', 's', '_', 's', 'd', 's', '_', 's', 'e', 'c', 'r', 'e', 't', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\005', ' ', +'\001', '(', '\013', '2', ':', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', +'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '.', 't', 'l', 's', '.', 'v', '3', '.', 'S', 'd', +'s', 'S', 'e', 'c', 'r', 'e', 't', 'C', 'o', 'n', 'f', 'i', 'g', 'H', '\000', 'R', ' ', 's', 'e', 's', 's', 'i', 'o', 'n', 'T', +'i', 'c', 'k', 'e', 't', 'K', 'e', 'y', 's', 'S', 'd', 's', 'S', 'e', 'c', 'r', 'e', 't', 'C', 'o', 'n', 'f', 'i', 'g', '\022', +'Q', '\n', '$', 'd', 'i', 's', 'a', 'b', 'l', 'e', '_', 's', 't', 'a', 't', 'e', 'l', 'e', 's', 's', '_', 's', 'e', 's', 's', +'i', 'o', 'n', '_', 'r', 'e', 's', 'u', 'm', 'p', 't', 'i', 'o', 'n', '\030', '\007', ' ', '\001', '(', '\010', 'H', '\000', 'R', '!', 'd', +'i', 's', 'a', 'b', 'l', 'e', 'S', 't', 'a', 't', 'e', 'l', 'e', 's', 's', 'S', 'e', 's', 's', 'i', 'o', 'n', 'R', 'e', 's', +'u', 'm', 'p', 't', 'i', 'o', 'n', '\022', 'T', '\n', '\017', 's', 'e', 's', 's', 'i', 'o', 'n', '_', 't', 'i', 'm', 'e', 'o', 'u', +'t', '\030', '\006', ' ', '\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', +'.', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'B', '\020', '\372', 'B', '\r', '\252', '\001', '\n', '\032', '\006', '\010', '\200', '\200', '\200', '\200', '\020', +'2', '\000', 'R', '\016', 's', 'e', 's', 's', 'i', 'o', 'n', 'T', 'i', 'm', 'e', 'o', 'u', 't', '\022', '\210', '\001', '\n', '\022', 'o', 'c', +'s', 'p', '_', 's', 't', 'a', 'p', 'l', 'e', '_', 'p', 'o', 'l', 'i', 'c', 'y', '\030', '\010', ' ', '\001', '(', '\016', '2', 'P', '.', +'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', +'t', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '.', 't', 'l', 's', '.', 'v', '3', '.', 'D', 'o', 'w', 'n', 's', 't', 'r', 'e', +'a', 'm', 'T', 'l', 's', 'C', 'o', 'n', 't', 'e', 'x', 't', '.', 'O', 'c', 's', 'p', 'S', 't', 'a', 'p', 'l', 'e', 'P', 'o', +'l', 'i', 'c', 'y', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\020', 'o', 'c', 's', 'p', 'S', 't', 'a', 'p', 'l', +'e', 'P', 'o', 'l', 'i', 'c', 'y', '\"', 'N', '\n', '\020', 'O', 'c', 's', 'p', 'S', 't', 'a', 'p', 'l', 'e', 'P', 'o', 'l', 'i', +'c', 'y', '\022', '\024', '\n', '\020', 'L', 'E', 'N', 'I', 'E', 'N', 'T', '_', 'S', 'T', 'A', 'P', 'L', 'I', 'N', 'G', '\020', '\000', '\022', +'\023', '\n', '\017', 'S', 'T', 'R', 'I', 'C', 'T', '_', 'S', 'T', 'A', 'P', 'L', 'I', 'N', 'G', '\020', '\001', '\022', '\017', '\n', '\013', 'M', +'U', 'S', 'T', '_', 'S', 'T', 'A', 'P', 'L', 'E', '\020', '\002', ':', '-', '\232', '\305', '\210', '\036', '(', '\n', '&', 'e', 'n', 'v', 'o', +'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'a', 'u', 't', 'h', '.', 'D', 'o', 'w', 'n', 's', 't', 'r', 'e', 'a', 'm', 'T', +'l', 's', 'C', 'o', 'n', 't', 'e', 'x', 't', 'B', '\032', '\n', '\030', 's', 'e', 's', 's', 'i', 'o', 'n', '_', 't', 'i', 'c', 'k', +'e', 't', '_', 'k', 'e', 'y', 's', '_', 't', 'y', 'p', 'e', '\"', '\247', '\026', '\n', '\020', 'C', 'o', 'm', 'm', 'o', 'n', 'T', 'l', +'s', 'C', 'o', 'n', 't', 'e', 'x', 't', '\022', 'W', '\n', '\n', 't', 'l', 's', '_', 'p', 'a', 'r', 'a', 'm', 's', '\030', '\001', ' ', +'\001', '(', '\013', '2', '8', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', +'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '.', 't', 'l', 's', '.', 'v', '3', '.', 'T', 'l', +'s', 'P', 'a', 'r', 'a', 'm', 'e', 't', 'e', 'r', 's', 'R', '\t', 't', 'l', 's', 'P', 'a', 'r', 'a', 'm', 's', '\022', 'd', '\n', +'\020', 't', 'l', 's', '_', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 's', '\030', '\002', ' ', '\003', '(', '\013', '2', '9', +'.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'n', 's', 'p', 'o', +'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '.', 't', 'l', 's', '.', 'v', '3', '.', 'T', 'l', 's', 'C', 'e', 'r', 't', +'i', 'f', 'i', 'c', 'a', 't', 'e', 'R', '\017', 't', 'l', 's', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 's', '\022', +'\220', '\001', '\n', '\"', 't', 'l', 's', '_', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '_', 's', 'd', 's', '_', 's', +'e', 'c', 'r', 'e', 't', '_', 'c', 'o', 'n', 'f', 'i', 'g', 's', '\030', '\006', ' ', '\003', '(', '\013', '2', ':', '.', 'e', 'n', 'v', +'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', +'o', 'c', 'k', 'e', 't', 's', '.', 't', 'l', 's', '.', 'v', '3', '.', 'S', 'd', 's', 'S', 'e', 'c', 'r', 'e', 't', 'C', 'o', +'n', 'f', 'i', 'g', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\020', '\001', 'R', '\036', 't', 'l', 's', 'C', 'e', 'r', 't', 'i', 'f', +'i', 'c', 'a', 't', 'e', 'S', 'd', 's', 'S', 'e', 'c', 'r', 'e', 't', 'C', 'o', 'n', 'f', 'i', 'g', 's', '\022', '\240', '\001', '\n', +'$', 't', 'l', 's', '_', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '_', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', +'a', 't', 'e', '_', 'p', 'r', 'o', 'v', 'i', 'd', 'e', 'r', '\030', '\t', ' ', '\001', '(', '\013', '2', 'O', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', -'c', 'k', 'e', 't', 's', '.', 't', 'l', 's', '.', 'v', '3', '.', 'S', 'd', 's', 'S', 'e', 'c', 'r', 'e', 't', 'C', 'o', 'n', -'f', 'i', 'g', 'H', '\000', 'R', ' ', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', 'C', 'o', 'n', 't', 'e', 'x', 't', 'S', -'d', 's', 'S', 'e', 'c', 'r', 'e', 't', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '\242', '\001', '\n', '\033', 'c', 'o', 'm', 'b', 'i', 'n', -'e', 'd', '_', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', '_', 'c', 'o', 'n', 't', 'e', 'x', 't', '\030', '\010', ' ', '\001', -'(', '\013', '2', '`', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', +'c', 'k', 'e', 't', 's', '.', 't', 'l', 's', '.', 'v', '3', '.', 'C', 'o', 'm', 'm', 'o', 'n', 'T', 'l', 's', 'C', 'o', 'n', +'t', 'e', 'x', 't', '.', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'v', 'i', 'd', 'e', 'r', 'R', +'!', 't', 'l', 's', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', +'e', 'P', 'r', 'o', 'v', 'i', 'd', 'e', 'r', '\022', '\271', '\001', '\n', '-', 't', 'l', 's', '_', 'c', 'e', 'r', 't', 'i', 'f', 'i', +'c', 'a', 't', 'e', '_', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '_', 'p', 'r', 'o', 'v', 'i', 'd', 'e', 'r', +'_', 'i', 'n', 's', 't', 'a', 'n', 'c', 'e', '\030', '\013', ' ', '\001', '(', '\013', '2', 'W', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', +'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', +'t', 's', '.', 't', 'l', 's', '.', 'v', '3', '.', 'C', 'o', 'm', 'm', 'o', 'n', 'T', 'l', 's', 'C', 'o', 'n', 't', 'e', 'x', +'t', '.', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'v', 'i', 'd', 'e', 'r', 'I', 'n', 's', 't', +'a', 'n', 'c', 'e', 'R', ')', 't', 'l', 's', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'C', 'e', 'r', 't', 'i', +'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'v', 'i', 'd', 'e', 'r', 'I', 'n', 's', 't', 'a', 'n', 'c', 'e', '\022', 'x', '\n', +'\022', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', '_', 'c', 'o', 'n', 't', 'e', 'x', 't', '\030', '\003', ' ', '\001', '(', '\013', +'2', 'G', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'n', 's', +'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '.', 't', 'l', 's', '.', 'v', '3', '.', 'C', 'e', 'r', 't', 'i', +'f', 'i', 'c', 'a', 't', 'e', 'V', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', 'C', 'o', 'n', 't', 'e', 'x', 't', 'H', '\000', +'R', '\021', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', 'C', 'o', 'n', 't', 'e', 'x', 't', '\022', '\214', '\001', '\n', '$', 'v', +'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', '_', 'c', 'o', 'n', 't', 'e', 'x', 't', '_', 's', 'd', 's', '_', 's', 'e', 'c', +'r', 'e', 't', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\007', ' ', '\001', '(', '\013', '2', ':', '.', 'e', 'n', 'v', 'o', 'y', '.', +'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', +'e', 't', 's', '.', 't', 'l', 's', '.', 'v', '3', '.', 'S', 'd', 's', 'S', 'e', 'c', 'r', 'e', 't', 'C', 'o', 'n', 'f', 'i', +'g', 'H', '\000', 'R', ' ', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', 'C', 'o', 'n', 't', 'e', 'x', 't', 'S', 'd', 's', +'S', 'e', 'c', 'r', 'e', 't', 'C', 'o', 'n', 'f', 'i', 'g', '\022', '\242', '\001', '\n', '\033', 'c', 'o', 'm', 'b', 'i', 'n', 'e', 'd', +'_', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', '_', 'c', 'o', 'n', 't', 'e', 'x', 't', '\030', '\010', ' ', '\001', '(', '\013', +'2', '`', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'n', 's', +'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '.', 't', 'l', 's', '.', 'v', '3', '.', 'C', 'o', 'm', 'm', 'o', +'n', 'T', 'l', 's', 'C', 'o', 'n', 't', 'e', 'x', 't', '.', 'C', 'o', 'm', 'b', 'i', 'n', 'e', 'd', 'C', 'e', 'r', 't', 'i', +'f', 'i', 'c', 'a', 't', 'e', 'V', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', 'C', 'o', 'n', 't', 'e', 'x', 't', 'H', '\000', +'R', '\031', 'c', 'o', 'm', 'b', 'i', 'n', 'e', 'd', 'V', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', 'C', 'o', 'n', 't', 'e', +'x', 't', '\022', '\250', '\001', '\n', '\'', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', '_', 'c', 'o', 'n', 't', 'e', 'x', 't', +'_', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '_', 'p', 'r', 'o', 'v', 'i', 'd', 'e', 'r', '\030', '\n', ' ', '\001', +'(', '\013', '2', 'O', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '.', 't', 'l', 's', '.', 'v', '3', '.', 'C', 'o', 'm', -'m', 'o', 'n', 'T', 'l', 's', 'C', 'o', 'n', 't', 'e', 'x', 't', '.', 'C', 'o', 'm', 'b', 'i', 'n', 'e', 'd', 'C', 'e', 'r', -'t', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'V', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', 'C', 'o', 'n', 't', 'e', 'x', 't', -'H', '\000', 'R', '\031', 'c', 'o', 'm', 'b', 'i', 'n', 'e', 'd', 'V', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', 'C', 'o', 'n', -'t', 'e', 'x', 't', '\022', '\250', '\001', '\n', '\'', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', '_', 'c', 'o', 'n', 't', 'e', -'x', 't', '_', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '_', 'p', 'r', 'o', 'v', 'i', 'd', 'e', 'r', '\030', '\n', +'m', 'o', 'n', 'T', 'l', 's', 'C', 'o', 'n', 't', 'e', 'x', 't', '.', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', +'P', 'r', 'o', 'v', 'i', 'd', 'e', 'r', 'H', '\000', 'R', '$', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', 'C', 'o', 'n', +'t', 'e', 'x', 't', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'v', 'i', 'd', 'e', 'r', '\022', '\301', +'\001', '\n', '0', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', '_', 'c', 'o', 'n', 't', 'e', 'x', 't', '_', 'c', 'e', 'r', +'t', 'i', 'f', 'i', 'c', 'a', 't', 'e', '_', 'p', 'r', 'o', 'v', 'i', 'd', 'e', 'r', '_', 'i', 'n', 's', 't', 'a', 'n', 'c', +'e', '\030', '\014', ' ', '\001', '(', '\013', '2', 'W', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', +'s', '.', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '.', 't', 'l', 's', '.', 'v', +'3', '.', 'C', 'o', 'm', 'm', 'o', 'n', 'T', 'l', 's', 'C', 'o', 'n', 't', 'e', 'x', 't', '.', 'C', 'e', 'r', 't', 'i', 'f', +'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'v', 'i', 'd', 'e', 'r', 'I', 'n', 's', 't', 'a', 'n', 'c', 'e', 'H', '\000', 'R', ',', +'v', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', 'C', 'o', 'n', 't', 'e', 'x', 't', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', +'a', 't', 'e', 'P', 'r', 'o', 'v', 'i', 'd', 'e', 'r', 'I', 'n', 's', 't', 'a', 'n', 'c', 'e', '\022', '%', '\n', '\016', 'a', 'l', +'p', 'n', '_', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', 's', '\030', '\004', ' ', '\003', '(', '\t', 'R', '\r', 'a', 'l', 'p', 'n', 'P', +'r', 'o', 't', 'o', 'c', 'o', 'l', 's', '\022', 'W', '\n', '\021', 'c', 'u', 's', 't', 'o', 'm', '_', 'h', 'a', 'n', 'd', 's', 'h', +'a', 'k', 'e', 'r', '\030', '\r', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', +'.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', +'n', 'f', 'i', 'g', 'R', '\020', 'c', 'u', 's', 't', 'o', 'm', 'H', 'a', 'n', 'd', 's', 'h', 'a', 'k', 'e', 'r', '\032', '\222', '\001', +'\n', '\023', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'v', 'i', 'd', 'e', 'r', '\022', '\033', '\n', '\004', +'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', 'm', 'e', +'\022', 'O', '\n', '\014', 't', 'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\002', ' ', '\001', '(', '\013', '2', '*', '.', +'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', +'d', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'H', '\000', 'R', '\013', 't', 'y', 'p', 'e', 'd', +'C', 'o', 'n', 'f', 'i', 'g', 'B', '\r', '\n', '\006', 'c', 'o', 'n', 'f', 'i', 'g', '\022', '\003', '\370', 'B', '\001', '\032', 'm', '\n', '\033', +'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'v', 'i', 'd', 'e', 'r', 'I', 'n', 's', 't', 'a', 'n', +'c', 'e', '\022', '#', '\n', '\r', 'i', 'n', 's', 't', 'a', 'n', 'c', 'e', '_', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', +'R', '\014', 'i', 'n', 's', 't', 'a', 'n', 'c', 'e', 'N', 'a', 'm', 'e', '\022', ')', '\n', '\020', 'c', 'e', 'r', 't', 'i', 'f', 'i', +'c', 'a', 't', 'e', '_', 'n', 'a', 'm', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\017', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', +'a', 't', 'e', 'N', 'a', 'm', 'e', '\032', '\364', '\006', '\n', '$', 'C', 'o', 'm', 'b', 'i', 'n', 'e', 'd', 'C', 'e', 'r', 't', 'i', +'f', 'i', 'c', 'a', 't', 'e', 'V', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', 'C', 'o', 'n', 't', 'e', 'x', 't', '\022', '\217', +'\001', '\n', '\032', 'd', 'e', 'f', 'a', 'u', 'l', 't', '_', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', '_', 'c', 'o', 'n', +'t', 'e', 'x', 't', '\030', '\001', ' ', '\001', '(', '\013', '2', 'G', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', +'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '.', 't', 'l', +'s', '.', 'v', '3', '.', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'V', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', +'n', 'C', 'o', 'n', 't', 'e', 'x', 't', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\030', 'd', 'e', 'f', 'a', 'u', +'l', 't', 'V', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', 'C', 'o', 'n', 't', 'e', 'x', 't', '\022', '\266', '\001', '\n', '$', 'v', +'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', '_', 'c', 'o', 'n', 't', 'e', 'x', 't', '_', 's', 'd', 's', '_', 's', 'e', 'c', +'r', 'e', 't', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\002', ' ', '\001', '(', '\013', '2', ':', '.', 'e', 'n', 'v', 'o', 'y', '.', +'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', +'e', 't', 's', '.', 't', 'l', 's', '.', 'v', '3', '.', 'S', 'd', 's', 'S', 'e', 'c', 'r', 'e', 't', 'C', 'o', 'n', 'f', 'i', +'g', 'B', '*', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', '\362', '\230', '\376', '\217', '\005', '\034', '\022', '\032', 'd', 'y', 'n', 'a', 'm', 'i', +'c', '_', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', '_', 'c', 'o', 'n', 't', 'e', 'x', 't', 'R', ' ', 'v', 'a', 'l', +'i', 'd', 'a', 't', 'i', 'o', 'n', 'C', 'o', 'n', 't', 'e', 'x', 't', 'S', 'd', 's', 'S', 'e', 'c', 'r', 'e', 't', 'C', 'o', +'n', 'f', 'i', 'g', '\022', '\312', '\001', '\n', '\'', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', '_', 'c', 'o', 'n', 't', 'e', +'x', 't', '_', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '_', 'p', 'r', 'o', 'v', 'i', 'd', 'e', 'r', '\030', '\003', ' ', '\001', '(', '\013', '2', 'O', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '.', 't', 'l', 's', '.', 'v', '3', '.', 'C', 'o', 'm', 'm', 'o', 'n', 'T', 'l', 's', 'C', 'o', 'n', 't', 'e', 'x', 't', '.', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', -'t', 'e', 'P', 'r', 'o', 'v', 'i', 'd', 'e', 'r', 'H', '\000', 'R', '$', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', 'C', -'o', 'n', 't', 'e', 'x', 't', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'v', 'i', 'd', 'e', 'r', -'\022', '\301', '\001', '\n', '0', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', '_', 'c', 'o', 'n', 't', 'e', 'x', 't', '_', 'c', -'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '_', 'p', 'r', 'o', 'v', 'i', 'd', 'e', 'r', '_', 'i', 'n', 's', 't', 'a', -'n', 'c', 'e', '\030', '\014', ' ', '\001', '(', '\013', '2', 'W', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', -'o', 'n', 's', '.', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '.', 't', 'l', 's', -'.', 'v', '3', '.', 'C', 'o', 'm', 'm', 'o', 'n', 'T', 'l', 's', 'C', 'o', 'n', 't', 'e', 'x', 't', '.', 'C', 'e', 'r', 't', -'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'v', 'i', 'd', 'e', 'r', 'I', 'n', 's', 't', 'a', 'n', 'c', 'e', 'H', '\000', -'R', ',', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', 'C', 'o', 'n', 't', 'e', 'x', 't', 'C', 'e', 'r', 't', 'i', 'f', -'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'v', 'i', 'd', 'e', 'r', 'I', 'n', 's', 't', 'a', 'n', 'c', 'e', '\022', '%', '\n', '\016', -'a', 'l', 'p', 'n', '_', 'p', 'r', 'o', 't', 'o', 'c', 'o', 'l', 's', '\030', '\004', ' ', '\003', '(', '\t', 'R', '\r', 'a', 'l', 'p', -'n', 'P', 'r', 'o', 't', 'o', 'c', 'o', 'l', 's', '\022', 'W', '\n', '\021', 'c', 'u', 's', 't', 'o', 'm', '_', 'h', 'a', 'n', 'd', -'s', 'h', 'a', 'k', 'e', 'r', '\030', '\r', ' ', '\001', '(', '\013', '2', '*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', -'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', 'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', -'C', 'o', 'n', 'f', 'i', 'g', 'R', '\020', 'c', 'u', 's', 't', 'o', 'm', 'H', 'a', 'n', 'd', 's', 'h', 'a', 'k', 'e', 'r', '\032', -'\222', '\001', '\n', '\023', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'v', 'i', 'd', 'e', 'r', '\022', '\033', -'\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', -'m', 'e', '\022', 'O', '\n', '\014', 't', 'y', 'p', 'e', 'd', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\002', ' ', '\001', '(', '\013', '2', -'*', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'T', 'y', -'p', 'e', 'd', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'C', 'o', 'n', 'f', 'i', 'g', 'H', '\000', 'R', '\013', 't', 'y', 'p', -'e', 'd', 'C', 'o', 'n', 'f', 'i', 'g', 'B', '\r', '\n', '\006', 'c', 'o', 'n', 'f', 'i', 'g', '\022', '\003', '\370', 'B', '\001', '\032', 'm', -'\n', '\033', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'v', 'i', 'd', 'e', 'r', 'I', 'n', 's', 't', -'a', 'n', 'c', 'e', '\022', '#', '\n', '\r', 'i', 'n', 's', 't', 'a', 'n', 'c', 'e', '_', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', -'(', '\t', 'R', '\014', 'i', 'n', 's', 't', 'a', 'n', 'c', 'e', 'N', 'a', 'm', 'e', '\022', ')', '\n', '\020', 'c', 'e', 'r', 't', 'i', -'f', 'i', 'c', 'a', 't', 'e', '_', 'n', 'a', 'm', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\017', 'c', 'e', 'r', 't', 'i', 'f', -'i', 'c', 'a', 't', 'e', 'N', 'a', 'm', 'e', '\032', '\364', '\006', '\n', '$', 'C', 'o', 'm', 'b', 'i', 'n', 'e', 'd', 'C', 'e', 'r', -'t', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'V', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', 'C', 'o', 'n', 't', 'e', 'x', 't', -'\022', '\217', '\001', '\n', '\032', 'd', 'e', 'f', 'a', 'u', 'l', 't', '_', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', '_', 'c', -'o', 'n', 't', 'e', 'x', 't', '\030', '\001', ' ', '\001', '(', '\013', '2', 'G', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', -'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '.', -'t', 'l', 's', '.', 'v', '3', '.', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'V', 'a', 'l', 'i', 'd', 'a', 't', -'i', 'o', 'n', 'C', 'o', 'n', 't', 'e', 'x', 't', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\030', 'd', 'e', 'f', -'a', 'u', 'l', 't', 'V', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', 'C', 'o', 'n', 't', 'e', 'x', 't', '\022', '\266', '\001', '\n', -'$', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', '_', 'c', 'o', 'n', 't', 'e', 'x', 't', '_', 's', 'd', 's', '_', 's', -'e', 'c', 'r', 'e', 't', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\002', ' ', '\001', '(', '\013', '2', ':', '.', 'e', 'n', 'v', 'o', +'t', 'e', 'P', 'r', 'o', 'v', 'i', 'd', 'e', 'r', 'B', '\"', '\362', '\230', '\376', '\217', '\005', '\034', '\022', '\032', 'd', 'y', 'n', 'a', 'm', +'i', 'c', '_', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', '_', 'c', 'o', 'n', 't', 'e', 'x', 't', 'R', '$', 'v', 'a', +'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', 'C', 'o', 'n', 't', 'e', 'x', 't', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', +'e', 'P', 'r', 'o', 'v', 'i', 'd', 'e', 'r', '\022', '\343', '\001', '\n', '0', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', '_', +'c', 'o', 'n', 't', 'e', 'x', 't', '_', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '_', 'p', 'r', 'o', 'v', 'i', +'d', 'e', 'r', '_', 'i', 'n', 's', 't', 'a', 'n', 'c', 'e', '\030', '\004', ' ', '\001', '(', '\013', '2', 'W', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', -'c', 'k', 'e', 't', 's', '.', 't', 'l', 's', '.', 'v', '3', '.', 'S', 'd', 's', 'S', 'e', 'c', 'r', 'e', 't', 'C', 'o', 'n', -'f', 'i', 'g', 'B', '*', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', '\362', '\230', '\376', '\217', '\005', '\034', '\022', '\032', 'd', 'y', 'n', 'a', -'m', 'i', 'c', '_', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', '_', 'c', 'o', 'n', 't', 'e', 'x', 't', 'R', ' ', 'v', -'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', 'C', 'o', 'n', 't', 'e', 'x', 't', 'S', 'd', 's', 'S', 'e', 'c', 'r', 'e', 't', -'C', 'o', 'n', 'f', 'i', 'g', '\022', '\312', '\001', '\n', '\'', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', '_', 'c', 'o', 'n', -'t', 'e', 'x', 't', '_', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '_', 'p', 'r', 'o', 'v', 'i', 'd', 'e', 'r', -'\030', '\003', ' ', '\001', '(', '\013', '2', 'O', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', -'.', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '.', 't', 'l', 's', '.', 'v', '3', -'.', 'C', 'o', 'm', 'm', 'o', 'n', 'T', 'l', 's', 'C', 'o', 'n', 't', 'e', 'x', 't', '.', 'C', 'e', 'r', 't', 'i', 'f', 'i', -'c', 'a', 't', 'e', 'P', 'r', 'o', 'v', 'i', 'd', 'e', 'r', 'B', '\"', '\362', '\230', '\376', '\217', '\005', '\034', '\022', '\032', 'd', 'y', 'n', -'a', 'm', 'i', 'c', '_', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', '_', 'c', 'o', 'n', 't', 'e', 'x', 't', 'R', '$', -'v', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', 'C', 'o', 'n', 't', 'e', 'x', 't', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', -'a', 't', 'e', 'P', 'r', 'o', 'v', 'i', 'd', 'e', 'r', '\022', '\343', '\001', '\n', '0', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', -'n', '_', 'c', 'o', 'n', 't', 'e', 'x', 't', '_', 'c', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', '_', 'p', 'r', 'o', -'v', 'i', 'd', 'e', 'r', '_', 'i', 'n', 's', 't', 'a', 'n', 'c', 'e', '\030', '\004', ' ', '\001', '(', '\013', '2', 'W', '.', 'e', 'n', -'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', -'s', 'o', 'c', 'k', 'e', 't', 's', '.', 't', 'l', 's', '.', 'v', '3', '.', 'C', 'o', 'm', 'm', 'o', 'n', 'T', 'l', 's', 'C', -'o', 'n', 't', 'e', 'x', 't', '.', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'v', 'i', 'd', 'e', -'r', 'I', 'n', 's', 't', 'a', 'n', 'c', 'e', 'B', '\"', '\362', '\230', '\376', '\217', '\005', '\034', '\022', '\032', 'd', 'y', 'n', 'a', 'm', 'i', -'c', '_', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', '_', 'c', 'o', 'n', 't', 'e', 'x', 't', 'R', ',', 'v', 'a', 'l', -'i', 'd', 'a', 't', 'i', 'o', 'n', 'C', 'o', 'n', 't', 'e', 'x', 't', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', -'P', 'r', 'o', 'v', 'i', 'd', 'e', 'r', 'I', 'n', 's', 't', 'a', 'n', 'c', 'e', ':', 'N', '\232', '\305', '\210', '\036', 'I', '\n', 'G', -'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'a', 'u', 't', 'h', '.', 'C', 'o', 'm', 'm', 'o', 'n', 'T', -'l', 's', 'C', 'o', 'n', 't', 'e', 'x', 't', '.', 'C', 'o', 'm', 'b', 'i', 'n', 'e', 'd', 'C', 'e', 'r', 't', 'i', 'f', 'i', -'c', 'a', 't', 'e', 'V', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', 'C', 'o', 'n', 't', 'e', 'x', 't', ':', ')', '\232', '\305', -'\210', '\036', '$', '\n', '\"', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'a', 'u', 't', 'h', '.', 'C', 'o', -'m', 'm', 'o', 'n', 'T', 'l', 's', 'C', 'o', 'n', 't', 'e', 'x', 't', 'B', '\031', '\n', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', -'i', 'o', 'n', '_', 'c', 'o', 'n', 't', 'e', 'x', 't', '_', 't', 'y', 'p', 'e', 'J', '\004', '\010', '\005', '\020', '\006', 'B', 'M', '\n', -'7', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', -'n', 's', 'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '.', -'t', 'l', 's', '.', 'v', '3', 'B', '\010', 'T', 'l', 's', 'P', 'r', 'o', 't', 'o', 'P', '\001', '\272', '\200', '\310', '\321', '\006', '\002', '\020', -'\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +'c', 'k', 'e', 't', 's', '.', 't', 'l', 's', '.', 'v', '3', '.', 'C', 'o', 'm', 'm', 'o', 'n', 'T', 'l', 's', 'C', 'o', 'n', +'t', 'e', 'x', 't', '.', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', 'o', 'v', 'i', 'd', 'e', 'r', 'I', +'n', 's', 't', 'a', 'n', 'c', 'e', 'B', '\"', '\362', '\230', '\376', '\217', '\005', '\034', '\022', '\032', 'd', 'y', 'n', 'a', 'm', 'i', 'c', '_', +'v', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', '_', 'c', 'o', 'n', 't', 'e', 'x', 't', 'R', ',', 'v', 'a', 'l', 'i', 'd', +'a', 't', 'i', 'o', 'n', 'C', 'o', 'n', 't', 'e', 'x', 't', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', 't', 'e', 'P', 'r', +'o', 'v', 'i', 'd', 'e', 'r', 'I', 'n', 's', 't', 'a', 'n', 'c', 'e', ':', 'N', '\232', '\305', '\210', '\036', 'I', '\n', 'G', 'e', 'n', +'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'a', 'u', 't', 'h', '.', 'C', 'o', 'm', 'm', 'o', 'n', 'T', 'l', 's', +'C', 'o', 'n', 't', 'e', 'x', 't', '.', 'C', 'o', 'm', 'b', 'i', 'n', 'e', 'd', 'C', 'e', 'r', 't', 'i', 'f', 'i', 'c', 'a', +'t', 'e', 'V', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', 'n', 'C', 'o', 'n', 't', 'e', 'x', 't', ':', ')', '\232', '\305', '\210', '\036', +'$', '\n', '\"', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'a', 'u', 't', 'h', '.', 'C', 'o', 'm', 'm', +'o', 'n', 'T', 'l', 's', 'C', 'o', 'n', 't', 'e', 'x', 't', 'B', '\031', '\n', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'i', 'o', +'n', '_', 'c', 'o', 'n', 't', 'e', 'x', 't', '_', 't', 'y', 'p', 'e', 'J', '\004', '\010', '\005', '\020', '\006', 'B', 'M', '\n', '7', 'i', +'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 'e', 'x', 't', 'e', 'n', 's', +'i', 'o', 'n', 's', '.', 't', 'r', 'a', 'n', 's', 'p', 'o', 'r', 't', '_', 's', 'o', 'c', 'k', 'e', 't', 's', '.', 't', 'l', +'s', '.', 'v', '3', 'B', '\010', 'T', 'l', 's', 'P', 'r', 'o', 't', 'o', 'P', '\001', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', +'\006', 'p', 'r', 'o', 't', 'o', '3', }; -static upb_def_init *deps[11] = { +static upb_def_init *deps[10] = { &envoy_config_core_v3_extension_proto_upbdefinit, &envoy_extensions_transport_sockets_tls_v3_common_proto_upbdefinit, &envoy_extensions_transport_sockets_tls_v3_secret_proto_upbdefinit, - &google_protobuf_any_proto_upbdefinit, &google_protobuf_duration_proto_upbdefinit, &google_protobuf_wrappers_proto_upbdefinit, &udpa_annotations_migrate_proto_upbdefinit, @@ -245,5 +242,5 @@ upb_def_init envoy_extensions_transport_sockets_tls_v3_tls_proto_upbdefinit = { deps, layouts, "envoy/extensions/transport_sockets/tls/v3/tls.proto", - UPB_STRVIEW_INIT(descriptor, 4734) + UPB_STRVIEW_INIT(descriptor, 4707) }; diff --git a/grpc/src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.c b/grpc/src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.c index 5e8a1bf4..0df3b7b3 100644 --- a/grpc/src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.c +++ b/grpc/src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.c @@ -11,10 +11,8 @@ extern upb_def_init envoy_config_core_v3_base_proto_upbdefinit; extern upb_def_init google_protobuf_any_proto_upbdefinit; +extern upb_def_init google_protobuf_duration_proto_upbdefinit; extern upb_def_init google_rpc_status_proto_upbdefinit; -extern upb_def_init udpa_core_v1_resource_locator_proto_upbdefinit; -extern upb_def_init udpa_core_v1_resource_name_proto_upbdefinit; -extern upb_def_init udpa_annotations_migrate_proto_upbdefinit; extern upb_def_init udpa_annotations_status_proto_upbdefinit; extern upb_def_init udpa_annotations_versioning_proto_upbdefinit; extern const upb_msglayout envoy_service_discovery_v3_DiscoveryRequest_msginit; @@ -23,122 +21,114 @@ extern const upb_msglayout envoy_service_discovery_v3_DeltaDiscoveryRequest_msgi extern const upb_msglayout envoy_service_discovery_v3_DeltaDiscoveryRequest_InitialResourceVersionsEntry_msginit; extern const upb_msglayout envoy_service_discovery_v3_DeltaDiscoveryResponse_msginit; extern const upb_msglayout envoy_service_discovery_v3_Resource_msginit; +extern const upb_msglayout envoy_service_discovery_v3_Resource_CacheControl_msginit; -static const upb_msglayout *layouts[6] = { +static const upb_msglayout *layouts[7] = { &envoy_service_discovery_v3_DiscoveryRequest_msginit, &envoy_service_discovery_v3_DiscoveryResponse_msginit, &envoy_service_discovery_v3_DeltaDiscoveryRequest_msginit, &envoy_service_discovery_v3_DeltaDiscoveryRequest_InitialResourceVersionsEntry_msginit, &envoy_service_discovery_v3_DeltaDiscoveryResponse_msginit, &envoy_service_discovery_v3_Resource_msginit, + &envoy_service_discovery_v3_Resource_CacheControl_msginit, }; -static const char descriptor[2407] = {'\n', '*', 'e', 'n', 'v', 'o', 'y', '/', 's', 'e', 'r', 'v', 'i', 'c', 'e', '/', 'd', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', +static const char descriptor[2206] = {'\n', '*', 'e', 'n', 'v', 'o', 'y', '/', 's', 'e', 'r', 'v', 'i', 'c', 'e', '/', 'd', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', '/', 'v', '3', '/', 'd', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', '.', 'p', 'r', 'o', 't', 'o', '\022', '\032', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'd', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', '.', 'v', '3', '\032', '\037', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'b', 'a', 's', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', '\031', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'a', 'n', -'y', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'r', 'p', 'c', '/', 's', 't', 'a', 't', 'u', -'s', '.', 'p', 'r', 'o', 't', 'o', '\032', '#', 'u', 'd', 'p', 'a', '/', 'c', 'o', 'r', 'e', '/', 'v', '1', '/', 'r', 'e', 's', -'o', 'u', 'r', 'c', 'e', '_', 'l', 'o', 'c', 'a', 't', 'o', 'r', '.', 'p', 'r', 'o', 't', 'o', '\032', ' ', 'u', 'd', 'p', 'a', -'/', 'c', 'o', 'r', 'e', '/', 'v', '1', '/', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', '_', 'n', 'a', 'm', 'e', '.', 'p', 'r', -'o', 't', 'o', '\032', '\036', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'm', 'i', 'g', -'r', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', -'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', -'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', -'o', '\"', '\253', '\002', '\n', '\020', 'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', 'R', 'e', 'q', 'u', 'e', 's', 't', '\022', '!', '\n', -'\014', 'v', 'e', 'r', 's', 'i', 'o', 'n', '_', 'i', 'n', 'f', 'o', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\013', 'v', 'e', 'r', 's', -'i', 'o', 'n', 'I', 'n', 'f', 'o', '\022', '.', '\n', '\004', 'n', 'o', 'd', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '\032', '.', 'e', -'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'N', 'o', 'd', 'e', 'R', -'\004', 'n', 'o', 'd', 'e', '\022', '%', '\n', '\016', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', '_', 'n', 'a', 'm', 'e', 's', '\030', '\003', -' ', '\003', '(', '\t', 'R', '\r', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', 'N', 'a', 'm', 'e', 's', '\022', '\031', '\n', '\010', 't', 'y', -'p', 'e', '_', 'u', 'r', 'l', '\030', '\004', ' ', '\001', '(', '\t', 'R', '\007', 't', 'y', 'p', 'e', 'U', 'r', 'l', '\022', '%', '\n', '\016', -'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 'n', 'o', 'n', 'c', 'e', '\030', '\005', ' ', '\001', '(', '\t', 'R', '\r', 'r', 'e', 's', -'p', 'o', 'n', 's', 'e', 'N', 'o', 'n', 'c', 'e', '\022', '5', '\n', '\014', 'e', 'r', 'r', 'o', 'r', '_', 'd', 'e', 't', 'a', 'i', -'l', '\030', '\006', ' ', '\001', '(', '\013', '2', '\022', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'r', 'p', 'c', '.', 'S', 't', 'a', 't', -'u', 's', 'R', '\013', 'e', 'r', 'r', 'o', 'r', 'D', 'e', 't', 'a', 'i', 'l', ':', '$', '\232', '\305', '\210', '\036', '\037', '\n', '\035', 'e', -'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', 'R', 'e', 'q', 'u', -'e', 's', 't', '\"', '\243', '\002', '\n', '\021', 'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', -'\022', '!', '\n', '\014', 'v', 'e', 'r', 's', 'i', 'o', 'n', '_', 'i', 'n', 'f', 'o', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\013', 'v', -'e', 'r', 's', 'i', 'o', 'n', 'I', 'n', 'f', 'o', '\022', '2', '\n', '\t', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', 's', '\030', '\002', -' ', '\003', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', -'y', 'R', '\t', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', 's', '\022', '\026', '\n', '\006', 'c', 'a', 'n', 'a', 'r', 'y', '\030', '\003', ' ', -'\001', '(', '\010', 'R', '\006', 'c', 'a', 'n', 'a', 'r', 'y', '\022', '\031', '\n', '\010', 't', 'y', 'p', 'e', '_', 'u', 'r', 'l', '\030', '\004', -' ', '\001', '(', '\t', 'R', '\007', 't', 'y', 'p', 'e', 'U', 'r', 'l', '\022', '\024', '\n', '\005', 'n', 'o', 'n', 'c', 'e', '\030', '\005', ' ', -'\001', '(', '\t', 'R', '\005', 'n', 'o', 'n', 'c', 'e', '\022', 'G', '\n', '\r', 'c', 'o', 'n', 't', 'r', 'o', 'l', '_', 'p', 'l', 'a', -'n', 'e', '\030', '\006', ' ', '\001', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', -'o', 'r', 'e', '.', 'v', '3', '.', 'C', 'o', 'n', 't', 'r', 'o', 'l', 'P', 'l', 'a', 'n', 'e', 'R', '\014', 'c', 'o', 'n', 't', -'r', 'o', 'l', 'P', 'l', 'a', 'n', 'e', ':', '%', '\232', '\305', '\210', '\036', ' ', '\n', '\036', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', -'i', '.', 'v', '2', '.', 'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', '\"', '\362', '\005', -'\n', '\025', 'D', 'e', 'l', 't', 'a', 'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', 'R', 'e', 'q', 'u', 'e', 's', 't', '\022', '.', -'\n', '\004', 'n', 'o', 'd', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '\032', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', -'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'N', 'o', 'd', 'e', 'R', '\004', 'n', 'o', 'd', 'e', '\022', '\031', '\n', '\010', -'t', 'y', 'p', 'e', '_', 'u', 'r', 'l', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\007', 't', 'y', 'p', 'e', 'U', 'r', 'l', '\022', '8', -'\n', '\030', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', '_', 'n', 'a', 'm', 'e', 's', '_', 's', 'u', 'b', 's', 'c', 'r', 'i', 'b', -'e', '\030', '\003', ' ', '\003', '(', '\t', 'R', '\026', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', 'N', 'a', 'm', 'e', 's', 'S', 'u', 'b', -'s', 'c', 'r', 'i', 'b', 'e', '\022', 'W', '\n', '\030', 'u', 'd', 'p', 'a', '_', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', 's', '_', -'s', 'u', 'b', 's', 'c', 'r', 'i', 'b', 'e', '\030', '\010', ' ', '\003', '(', '\013', '2', '\035', '.', 'u', 'd', 'p', 'a', '.', 'c', 'o', -'r', 'e', '.', 'v', '1', '.', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', 'L', 'o', 'c', 'a', 't', 'o', 'r', 'R', '\026', 'u', 'd', -'p', 'a', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', 's', 'S', 'u', 'b', 's', 'c', 'r', 'i', 'b', 'e', '\022', '<', '\n', '\032', 'r', -'e', 's', 'o', 'u', 'r', 'c', 'e', '_', 'n', 'a', 'm', 'e', 's', '_', 'u', 'n', 's', 'u', 'b', 's', 'c', 'r', 'i', 'b', 'e', -'\030', '\004', ' ', '\003', '(', '\t', 'R', '\030', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', 'N', 'a', 'm', 'e', 's', 'U', 'n', 's', 'u', -'b', 's', 'c', 'r', 'i', 'b', 'e', '\022', '[', '\n', '\032', 'u', 'd', 'p', 'a', '_', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', 's', -'_', 'u', 'n', 's', 'u', 'b', 's', 'c', 'r', 'i', 'b', 'e', '\030', '\t', ' ', '\003', '(', '\013', '2', '\035', '.', 'u', 'd', 'p', 'a', -'.', 'c', 'o', 'r', 'e', '.', 'v', '1', '.', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', 'L', 'o', 'c', 'a', 't', 'o', 'r', 'R', -'\030', 'u', 'd', 'p', 'a', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', 's', 'U', 'n', 's', 'u', 'b', 's', 'c', 'r', 'i', 'b', 'e', -'\022', '\212', '\001', '\n', '\031', 'i', 'n', 'i', 't', 'i', 'a', 'l', '_', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', '_', 'v', 'e', 'r', -'s', 'i', 'o', 'n', 's', '\030', '\005', ' ', '\003', '(', '\013', '2', 'N', '.', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', 'i', -'c', 'e', '.', 'd', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', '.', 'v', '3', '.', 'D', 'e', 'l', 't', 'a', 'D', 'i', 's', 'c', -'o', 'v', 'e', 'r', 'y', 'R', 'e', 'q', 'u', 'e', 's', 't', '.', 'I', 'n', 'i', 't', 'i', 'a', 'l', 'R', 'e', 's', 'o', 'u', -'r', 'c', 'e', 'V', 'e', 'r', 's', 'i', 'o', 'n', 's', 'E', 'n', 't', 'r', 'y', 'R', '\027', 'i', 'n', 'i', 't', 'i', 'a', 'l', -'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', 'V', 'e', 'r', 's', 'i', 'o', 'n', 's', '\022', '%', '\n', '\016', 'r', 'e', 's', 'p', 'o', -'n', 's', 'e', '_', 'n', 'o', 'n', 'c', 'e', '\030', '\006', ' ', '\001', '(', '\t', 'R', '\r', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', -'N', 'o', 'n', 'c', 'e', '\022', '5', '\n', '\014', 'e', 'r', 'r', 'o', 'r', '_', 'd', 'e', 't', 'a', 'i', 'l', '\030', '\007', ' ', '\001', -'(', '\013', '2', '\022', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'r', 'p', 'c', '.', 'S', 't', 'a', 't', 'u', 's', 'R', '\013', 'e', -'r', 'r', 'o', 'r', 'D', 'e', 't', 'a', 'i', 'l', '\032', 'J', '\n', '\034', 'I', 'n', 'i', 't', 'i', 'a', 'l', 'R', 'e', 's', 'o', -'u', 'r', 'c', 'e', 'V', 'e', 'r', 's', 'i', 'o', 'n', 's', 'E', 'n', 't', 'r', 'y', '\022', '\020', '\n', '\003', 'k', 'e', 'y', '\030', -'\001', ' ', '\001', '(', '\t', 'R', '\003', 'k', 'e', 'y', '\022', '\024', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\t', -'R', '\005', 'v', 'a', 'l', 'u', 'e', ':', '\002', '8', '\001', ':', ')', '\232', '\305', '\210', '\036', '$', '\n', '\"', 'e', 'n', 'v', 'o', 'y', -'.', 'a', 'p', 'i', '.', 'v', '2', '.', 'D', 'e', 'l', 't', 'a', 'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', 'R', 'e', 'q', -'u', 'e', 's', 't', '\"', '\350', '\002', '\n', '\026', 'D', 'e', 'l', 't', 'a', 'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', 'R', 'e', -'s', 'p', 'o', 'n', 's', 'e', '\022', '.', '\n', '\023', 's', 'y', 's', 't', 'e', 'm', '_', 'v', 'e', 'r', 's', 'i', 'o', 'n', '_', -'i', 'n', 'f', 'o', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\021', 's', 'y', 's', 't', 'e', 'm', 'V', 'e', 'r', 's', 'i', 'o', 'n', -'I', 'n', 'f', 'o', '\022', 'B', '\n', '\t', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', 's', '\030', '\002', ' ', '\003', '(', '\013', '2', '$', -'.', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'd', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', '.', -'v', '3', '.', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', 'R', '\t', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', 's', '\022', '\031', '\n', -'\010', 't', 'y', 'p', 'e', '_', 'u', 'r', 'l', '\030', '\004', ' ', '\001', '(', '\t', 'R', '\007', 't', 'y', 'p', 'e', 'U', 'r', 'l', '\022', -'+', '\n', '\021', 'r', 'e', 'm', 'o', 'v', 'e', 'd', '_', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', 's', '\030', '\006', ' ', '\003', '(', -'\t', 'R', '\020', 'r', 'e', 'm', 'o', 'v', 'e', 'd', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', 's', '\022', 'P', '\n', '\026', 'u', 'd', -'p', 'a', '_', 'r', 'e', 'm', 'o', 'v', 'e', 'd', '_', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', 's', '\030', '\007', ' ', '\003', '(', -'\013', '2', '\032', '.', 'u', 'd', 'p', 'a', '.', 'c', 'o', 'r', 'e', '.', 'v', '1', '.', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', -'N', 'a', 'm', 'e', 'R', '\024', 'u', 'd', 'p', 'a', 'R', 'e', 'm', 'o', 'v', 'e', 'd', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', -'s', '\022', '\024', '\n', '\005', 'n', 'o', 'n', 'c', 'e', '\030', '\005', ' ', '\001', '(', '\t', 'R', '\005', 'n', 'o', 'n', 'c', 'e', ':', '*', -'\232', '\305', '\210', '\036', '%', '\n', '#', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'D', 'e', 'l', 't', 'a', -'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', '\"', '\234', '\002', '\n', '\010', 'R', 'e', 's', -'o', 'u', 'r', 'c', 'e', '\022', '*', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\003', ' ', '\001', '(', '\t', 'B', '\026', '\362', '\230', '\376', '\217', -'\005', '\020', '\022', '\016', 'n', 'a', 'm', 'e', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'R', '\004', 'n', 'a', 'm', 'e', '\022', -'`', '\n', '\022', 'u', 'd', 'p', 'a', '_', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', '_', 'n', 'a', 'm', 'e', '\030', '\005', ' ', '\001', -'(', '\013', '2', '\032', '.', 'u', 'd', 'p', 'a', '.', 'c', 'o', 'r', 'e', '.', 'v', '1', '.', 'R', 'e', 's', 'o', 'u', 'r', 'c', -'e', 'N', 'a', 'm', 'e', 'B', '\026', '\362', '\230', '\376', '\217', '\005', '\020', '\022', '\016', 'n', 'a', 'm', 'e', '_', 's', 'p', 'e', 'c', 'i', -'f', 'i', 'e', 'r', 'R', '\020', 'u', 'd', 'p', 'a', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', 'N', 'a', 'm', 'e', '\022', '\030', '\n', -'\007', 'a', 'l', 'i', 'a', 's', 'e', 's', '\030', '\004', ' ', '\003', '(', '\t', 'R', '\007', 'a', 'l', 'i', 'a', 's', 'e', 's', '\022', '\030', -'\n', '\007', 'v', 'e', 'r', 's', 'i', 'o', 'n', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\007', 'v', 'e', 'r', 's', 'i', 'o', 'n', '\022', -'0', '\n', '\010', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', -'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'R', '\010', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', ':', -'\034', '\232', '\305', '\210', '\036', '\027', '\n', '\025', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'R', 'e', 's', 'o', -'u', 'r', 'c', 'e', 'B', 'D', '\n', '(', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', -'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'd', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', '.', 'v', '3', 'B', '\016', -'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', 'P', 'r', 'o', 't', 'o', 'P', '\001', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', -'\006', 'p', 'r', 'o', 't', 'o', '3', +'y', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', +'d', 'u', 'r', 'a', 't', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'r', 'p', +'c', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', +'t', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '!', 'u', 'd', 'p', +'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', +'p', 'r', 'o', 't', 'o', '\"', '\253', '\002', '\n', '\020', 'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', 'R', 'e', 'q', 'u', 'e', 's', +'t', '\022', '!', '\n', '\014', 'v', 'e', 'r', 's', 'i', 'o', 'n', '_', 'i', 'n', 'f', 'o', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\013', +'v', 'e', 'r', 's', 'i', 'o', 'n', 'I', 'n', 'f', 'o', '\022', '.', '\n', '\004', 'n', 'o', 'd', 'e', '\030', '\002', ' ', '\001', '(', '\013', +'2', '\032', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'N', +'o', 'd', 'e', 'R', '\004', 'n', 'o', 'd', 'e', '\022', '%', '\n', '\016', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', '_', 'n', 'a', 'm', +'e', 's', '\030', '\003', ' ', '\003', '(', '\t', 'R', '\r', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', 'N', 'a', 'm', 'e', 's', '\022', '\031', +'\n', '\010', 't', 'y', 'p', 'e', '_', 'u', 'r', 'l', '\030', '\004', ' ', '\001', '(', '\t', 'R', '\007', 't', 'y', 'p', 'e', 'U', 'r', 'l', +'\022', '%', '\n', '\016', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 'n', 'o', 'n', 'c', 'e', '\030', '\005', ' ', '\001', '(', '\t', 'R', +'\r', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', 'N', 'o', 'n', 'c', 'e', '\022', '5', '\n', '\014', 'e', 'r', 'r', 'o', 'r', '_', 'd', +'e', 't', 'a', 'i', 'l', '\030', '\006', ' ', '\001', '(', '\013', '2', '\022', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'r', 'p', 'c', '.', +'S', 't', 'a', 't', 'u', 's', 'R', '\013', 'e', 'r', 'r', 'o', 'r', 'D', 'e', 't', 'a', 'i', 'l', ':', '$', '\232', '\305', '\210', '\036', +'\037', '\n', '\035', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', +'R', 'e', 'q', 'u', 'e', 's', 't', '\"', '\243', '\002', '\n', '\021', 'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', 'R', 'e', 's', 'p', +'o', 'n', 's', 'e', '\022', '!', '\n', '\014', 'v', 'e', 'r', 's', 'i', 'o', 'n', '_', 'i', 'n', 'f', 'o', '\030', '\001', ' ', '\001', '(', +'\t', 'R', '\013', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'I', 'n', 'f', 'o', '\022', '2', '\n', '\t', 'r', 'e', 's', 'o', 'u', 'r', 'c', +'e', 's', '\030', '\002', ' ', '\003', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', +'f', '.', 'A', 'n', 'y', 'R', '\t', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', 's', '\022', '\026', '\n', '\006', 'c', 'a', 'n', 'a', 'r', +'y', '\030', '\003', ' ', '\001', '(', '\010', 'R', '\006', 'c', 'a', 'n', 'a', 'r', 'y', '\022', '\031', '\n', '\010', 't', 'y', 'p', 'e', '_', 'u', +'r', 'l', '\030', '\004', ' ', '\001', '(', '\t', 'R', '\007', 't', 'y', 'p', 'e', 'U', 'r', 'l', '\022', '\024', '\n', '\005', 'n', 'o', 'n', 'c', +'e', '\030', '\005', ' ', '\001', '(', '\t', 'R', '\005', 'n', 'o', 'n', 'c', 'e', '\022', 'G', '\n', '\r', 'c', 'o', 'n', 't', 'r', 'o', 'l', +'_', 'p', 'l', 'a', 'n', 'e', '\030', '\006', ' ', '\001', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', +'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'C', 'o', 'n', 't', 'r', 'o', 'l', 'P', 'l', 'a', 'n', 'e', 'R', '\014', +'c', 'o', 'n', 't', 'r', 'o', 'l', 'P', 'l', 'a', 'n', 'e', ':', '%', '\232', '\305', '\210', '\036', ' ', '\n', '\036', 'e', 'n', 'v', 'o', +'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', 'R', 'e', 's', 'p', 'o', 'n', 's', +'e', '\"', '\274', '\004', '\n', '\025', 'D', 'e', 'l', 't', 'a', 'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', 'R', 'e', 'q', 'u', 'e', +'s', 't', '\022', '.', '\n', '\004', 'n', 'o', 'd', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '\032', '.', 'e', 'n', 'v', 'o', 'y', '.', +'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'N', 'o', 'd', 'e', 'R', '\004', 'n', 'o', 'd', 'e', +'\022', '\031', '\n', '\010', 't', 'y', 'p', 'e', '_', 'u', 'r', 'l', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\007', 't', 'y', 'p', 'e', 'U', +'r', 'l', '\022', '8', '\n', '\030', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', '_', 'n', 'a', 'm', 'e', 's', '_', 's', 'u', 'b', 's', +'c', 'r', 'i', 'b', 'e', '\030', '\003', ' ', '\003', '(', '\t', 'R', '\026', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', 'N', 'a', 'm', 'e', +'s', 'S', 'u', 'b', 's', 'c', 'r', 'i', 'b', 'e', '\022', '<', '\n', '\032', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', '_', 'n', 'a', +'m', 'e', 's', '_', 'u', 'n', 's', 'u', 'b', 's', 'c', 'r', 'i', 'b', 'e', '\030', '\004', ' ', '\003', '(', '\t', 'R', '\030', 'r', 'e', +'s', 'o', 'u', 'r', 'c', 'e', 'N', 'a', 'm', 'e', 's', 'U', 'n', 's', 'u', 'b', 's', 'c', 'r', 'i', 'b', 'e', '\022', '\212', '\001', +'\n', '\031', 'i', 'n', 'i', 't', 'i', 'a', 'l', '_', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', '_', 'v', 'e', 'r', 's', 'i', 'o', +'n', 's', '\030', '\005', ' ', '\003', '(', '\013', '2', 'N', '.', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', +'d', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', '.', 'v', '3', '.', 'D', 'e', 'l', 't', 'a', 'D', 'i', 's', 'c', 'o', 'v', 'e', +'r', 'y', 'R', 'e', 'q', 'u', 'e', 's', 't', '.', 'I', 'n', 'i', 't', 'i', 'a', 'l', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', +'V', 'e', 'r', 's', 'i', 'o', 'n', 's', 'E', 'n', 't', 'r', 'y', 'R', '\027', 'i', 'n', 'i', 't', 'i', 'a', 'l', 'R', 'e', 's', +'o', 'u', 'r', 'c', 'e', 'V', 'e', 'r', 's', 'i', 'o', 'n', 's', '\022', '%', '\n', '\016', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', +'_', 'n', 'o', 'n', 'c', 'e', '\030', '\006', ' ', '\001', '(', '\t', 'R', '\r', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', 'N', 'o', 'n', +'c', 'e', '\022', '5', '\n', '\014', 'e', 'r', 'r', 'o', 'r', '_', 'd', 'e', 't', 'a', 'i', 'l', '\030', '\007', ' ', '\001', '(', '\013', '2', +'\022', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'r', 'p', 'c', '.', 'S', 't', 'a', 't', 'u', 's', 'R', '\013', 'e', 'r', 'r', 'o', +'r', 'D', 'e', 't', 'a', 'i', 'l', '\032', 'J', '\n', '\034', 'I', 'n', 'i', 't', 'i', 'a', 'l', 'R', 'e', 's', 'o', 'u', 'r', 'c', +'e', 'V', 'e', 'r', 's', 'i', 'o', 'n', 's', 'E', 'n', 't', 'r', 'y', '\022', '\020', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', +'(', '\t', 'R', '\003', 'k', 'e', 'y', '\022', '\024', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\005', 'v', +'a', 'l', 'u', 'e', ':', '\002', '8', '\001', ':', ')', '\232', '\305', '\210', '\036', '$', '\n', '\"', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', +'i', '.', 'v', '2', '.', 'D', 'e', 'l', 't', 'a', 'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', 'R', 'e', 'q', 'u', 'e', 's', +'t', '\"', '\337', '\002', '\n', '\026', 'D', 'e', 'l', 't', 'a', 'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', 'R', 'e', 's', 'p', 'o', +'n', 's', 'e', '\022', '.', '\n', '\023', 's', 'y', 's', 't', 'e', 'm', '_', 'v', 'e', 'r', 's', 'i', 'o', 'n', '_', 'i', 'n', 'f', +'o', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\021', 's', 'y', 's', 't', 'e', 'm', 'V', 'e', 'r', 's', 'i', 'o', 'n', 'I', 'n', 'f', +'o', '\022', 'B', '\n', '\t', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', 's', '\030', '\002', ' ', '\003', '(', '\013', '2', '$', '.', 'e', 'n', +'v', 'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'd', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', '.', 'v', '3', '.', +'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', 'R', '\t', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', 's', '\022', '\031', '\n', '\010', 't', 'y', +'p', 'e', '_', 'u', 'r', 'l', '\030', '\004', ' ', '\001', '(', '\t', 'R', '\007', 't', 'y', 'p', 'e', 'U', 'r', 'l', '\022', '+', '\n', '\021', +'r', 'e', 'm', 'o', 'v', 'e', 'd', '_', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', 's', '\030', '\006', ' ', '\003', '(', '\t', 'R', '\020', +'r', 'e', 'm', 'o', 'v', 'e', 'd', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', 's', '\022', '\024', '\n', '\005', 'n', 'o', 'n', 'c', 'e', +'\030', '\005', ' ', '\001', '(', '\t', 'R', '\005', 'n', 'o', 'n', 'c', 'e', '\022', 'G', '\n', '\r', 'c', 'o', 'n', 't', 'r', 'o', 'l', '_', +'p', 'l', 'a', 'n', 'e', '\030', '\007', ' ', '\001', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', +'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'C', 'o', 'n', 't', 'r', 'o', 'l', 'P', 'l', 'a', 'n', 'e', 'R', '\014', 'c', +'o', 'n', 't', 'r', 'o', 'l', 'P', 'l', 'a', 'n', 'e', ':', '*', '\232', '\305', '\210', '\036', '%', '\n', '#', 'e', 'n', 'v', 'o', 'y', +'.', 'a', 'p', 'i', '.', 'v', '2', '.', 'D', 'e', 'l', 't', 'a', 'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', 'R', 'e', 's', +'p', 'o', 'n', 's', 'e', '\"', '\331', '\002', '\n', '\010', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', '\022', '\022', '\n', '\004', 'n', 'a', 'm', +'e', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '\030', '\n', '\007', 'a', 'l', 'i', 'a', 's', 'e', 's', '\030', +'\004', ' ', '\003', '(', '\t', 'R', '\007', 'a', 'l', 'i', 'a', 's', 'e', 's', '\022', '\030', '\n', '\007', 'v', 'e', 'r', 's', 'i', 'o', 'n', +'\030', '\001', ' ', '\001', '(', '\t', 'R', '\007', 'v', 'e', 'r', 's', 'i', 'o', 'n', '\022', '0', '\n', '\010', 'r', 'e', 's', 'o', 'u', 'r', +'c', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', +'f', '.', 'A', 'n', 'y', 'R', '\010', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', '\022', '+', '\n', '\003', 't', 't', 'l', '\030', '\006', ' ', +'\001', '(', '\013', '2', '\031', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'u', 'r', +'a', 't', 'i', 'o', 'n', 'R', '\003', 't', 't', 'l', '\022', 'V', '\n', '\r', 'c', 'a', 'c', 'h', 'e', '_', 'c', 'o', 'n', 't', 'r', +'o', 'l', '\030', '\007', ' ', '\001', '(', '\013', '2', '1', '.', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', +'d', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', '.', 'v', '3', '.', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', '.', 'C', 'a', 'c', +'h', 'e', 'C', 'o', 'n', 't', 'r', 'o', 'l', 'R', '\014', 'c', 'a', 'c', 'h', 'e', 'C', 'o', 'n', 't', 'r', 'o', 'l', '\032', '0', +'\n', '\014', 'C', 'a', 'c', 'h', 'e', 'C', 'o', 'n', 't', 'r', 'o', 'l', '\022', ' ', '\n', '\014', 'd', 'o', '_', 'n', 'o', 't', '_', +'c', 'a', 'c', 'h', 'e', '\030', '\001', ' ', '\001', '(', '\010', 'R', '\n', 'd', 'o', 'N', 'o', 't', 'C', 'a', 'c', 'h', 'e', ':', '\034', +'\232', '\305', '\210', '\036', '\027', '\n', '\025', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'R', 'e', 's', 'o', 'u', +'r', 'c', 'e', 'B', 'D', '\n', '(', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', +'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'd', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', '.', 'v', '3', 'B', '\016', 'D', +'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', 'P', 'r', 'o', 't', 'o', 'P', '\001', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', +'p', 'r', 'o', 't', 'o', '3', }; -static upb_def_init *deps[9] = { +static upb_def_init *deps[7] = { &envoy_config_core_v3_base_proto_upbdefinit, &google_protobuf_any_proto_upbdefinit, + &google_protobuf_duration_proto_upbdefinit, &google_rpc_status_proto_upbdefinit, - &udpa_core_v1_resource_locator_proto_upbdefinit, - &udpa_core_v1_resource_name_proto_upbdefinit, - &udpa_annotations_migrate_proto_upbdefinit, &udpa_annotations_status_proto_upbdefinit, &udpa_annotations_versioning_proto_upbdefinit, NULL @@ -148,5 +138,5 @@ upb_def_init envoy_service_discovery_v3_discovery_proto_upbdefinit = { deps, layouts, "envoy/service/discovery/v3/discovery.proto", - UPB_STRVIEW_INIT(descriptor, 2407) + UPB_STRVIEW_INIT(descriptor, 2206) }; diff --git a/grpc/src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.h b/grpc/src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.h index a53e4c27..770d46d6 100644 --- a/grpc/src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.h +++ b/grpc/src/core/ext/upbdefs-generated/envoy/service/discovery/v3/discovery.upbdefs.h @@ -51,6 +51,11 @@ UPB_INLINE const upb_msgdef *envoy_service_discovery_v3_Resource_getmsgdef(upb_s return upb_symtab_lookupmsg(s, "envoy.service.discovery.v3.Resource"); } +UPB_INLINE const upb_msgdef *envoy_service_discovery_v3_Resource_CacheControl_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_service_discovery_v3_discovery_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.service.discovery.v3.Resource.CacheControl"); +} + #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/grpc/src/core/ext/upbdefs-generated/envoy/service/endpoint/v3/eds.upbdefs.c b/grpc/src/core/ext/upbdefs-generated/envoy/service/endpoint/v3/eds.upbdefs.c index 49fac22d..c7667879 100644 --- a/grpc/src/core/ext/upbdefs-generated/envoy/service/endpoint/v3/eds.upbdefs.c +++ b/grpc/src/core/ext/upbdefs-generated/envoy/service/endpoint/v3/eds.upbdefs.c @@ -11,67 +11,57 @@ extern upb_def_init envoy_service_discovery_v3_discovery_proto_upbdefinit; extern upb_def_init google_api_annotations_proto_upbdefinit; -extern upb_def_init google_protobuf_duration_proto_upbdefinit; -extern upb_def_init google_protobuf_wrappers_proto_upbdefinit; extern upb_def_init envoy_annotations_resource_proto_upbdefinit; extern upb_def_init udpa_annotations_status_proto_upbdefinit; extern upb_def_init udpa_annotations_versioning_proto_upbdefinit; -extern upb_def_init validate_validate_proto_upbdefinit; extern const upb_msglayout envoy_service_endpoint_v3_EdsDummy_msginit; static const upb_msglayout *layouts[1] = { &envoy_service_endpoint_v3_EdsDummy_msginit, }; -static const char descriptor[927] = {'\n', '#', 'e', 'n', 'v', 'o', 'y', '/', 's', 'e', 'r', 'v', 'i', 'c', 'e', '/', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '/', +static const char descriptor[838] = {'\n', '#', 'e', 'n', 'v', 'o', 'y', '/', 's', 'e', 'r', 'v', 'i', 'c', 'e', '/', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '/', 'v', '3', '/', 'e', 'd', 's', '.', 'p', 'r', 'o', 't', 'o', '\022', '\031', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', 'v', '3', '\032', '*', 'e', 'n', 'v', 'o', 'y', '/', 's', 'e', 'r', 'v', 'i', 'c', 'e', '/', 'd', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', '/', 'v', '3', '/', 'd', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', '.', 'p', 'r', 'o', 't', 'o', '\032', '\034', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'a', 'p', 'i', '/', 'a', 'n', 'n', 'o', -'t', 'a', 't', 'i', 'o', 'n', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', -'t', 'o', 'b', 'u', 'f', '/', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', 'o', -'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'w', 'r', 'a', 'p', 'p', 'e', 'r', 's', '.', 'p', 'r', 'o', -'t', 'o', '\032', ' ', 'e', 'n', 'v', 'o', 'y', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'r', 'e', 's', -'o', 'u', 'r', 'c', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', -'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '!', 'u', 'd', 'p', 'a', '/', 'a', -'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', -'t', 'o', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', -'t', 'o', '\"', '(', '\n', '\010', 'E', 'd', 's', 'D', 'u', 'm', 'm', 'y', ':', '\034', '\232', '\305', '\210', '\036', '\027', '\n', '\025', 'e', 'n', -'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'E', 'd', 's', 'D', 'u', 'm', 'm', 'y', '2', '\341', '\003', '\n', '\030', 'E', -'n', 'd', 'p', 'o', 'i', 'n', 't', 'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '\022', 't', -'\n', '\017', 'S', 't', 'r', 'e', 'a', 'm', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 's', '\022', ',', '.', 'e', 'n', 'v', 'o', 'y', -'.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'd', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', '.', 'v', '3', '.', 'D', 'i', 's', -'c', 'o', 'v', 'e', 'r', 'y', 'R', 'e', 'q', 'u', 'e', 's', 't', '\032', '-', '.', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', -'v', 'i', 'c', 'e', '.', 'd', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', '.', 'v', '3', '.', 'D', 'i', 's', 'c', 'o', 'v', 'e', -'r', 'y', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', '\"', '\000', '(', '\001', '0', '\001', '\022', '}', '\n', '\016', 'D', 'e', 'l', 't', 'a', -'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 's', '\022', '1', '.', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', -'.', 'd', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', '.', 'v', '3', '.', 'D', 'e', 'l', 't', 'a', 'D', 'i', 's', 'c', 'o', 'v', -'e', 'r', 'y', 'R', 'e', 'q', 'u', 'e', 's', 't', '\032', '2', '.', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', -'e', '.', 'd', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', '.', 'v', '3', '.', 'D', 'e', 'l', 't', 'a', 'D', 'i', 's', 'c', 'o', -'v', 'e', 'r', 'y', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', '\"', '\000', '(', '\001', '0', '\001', '\022', '\227', '\001', '\n', '\016', 'F', 'e', -'t', 'c', 'h', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 's', '\022', ',', '.', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', -'i', 'c', 'e', '.', 'd', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', '.', 'v', '3', '.', 'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', -'y', 'R', 'e', 'q', 'u', 'e', 's', 't', '\032', '-', '.', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', -'d', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', '.', 'v', '3', '.', 'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', 'R', 'e', 's', -'p', 'o', 'n', 's', 'e', '\"', '(', '\202', '\323', '\344', '\223', '\002', '\031', '\"', '\027', '/', 'v', '3', '/', 'd', 'i', 's', 'c', 'o', 'v', -'e', 'r', 'y', ':', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', 's', '\202', '\323', '\344', '\223', '\002', '\003', ':', '\001', '*', '\032', '6', '\212', -'\244', '\226', '\363', '\007', '0', '\n', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'e', 'n', 'd', 'p', 'o', -'i', 'n', 't', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', 'L', 'o', 'a', 'd', 'A', 's', 's', 'i', 'g', 'n', 'm', -'e', 'n', 't', 'B', '@', '\n', '\'', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', -'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', 'v', '3', 'B', '\010', 'E', 'd', -'s', 'P', 'r', 'o', 't', 'o', 'P', '\001', '\210', '\001', '\001', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', -'o', '3', +'t', 'a', 't', 'i', 'o', 'n', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', ' ', 'e', 'n', 'v', 'o', 'y', '/', 'a', 'n', 'n', 'o', +'t', 'a', 't', 'i', 'o', 'n', 's', '/', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', '\035', 'u', +'d', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', +'o', 't', 'o', '\032', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', +'s', 'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\"', '(', '\n', '\010', 'E', 'd', 's', 'D', 'u', 'm', 'm', 'y', +':', '\034', '\232', '\305', '\210', '\036', '\027', '\n', '\025', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'E', 'd', 's', +'D', 'u', 'm', 'm', 'y', '2', '\341', '\003', '\n', '\030', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 'D', 'i', 's', 'c', 'o', 'v', 'e', +'r', 'y', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '\022', 't', '\n', '\017', 'S', 't', 'r', 'e', 'a', 'm', 'E', 'n', 'd', 'p', 'o', 'i', +'n', 't', 's', '\022', ',', '.', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'd', 'i', 's', 'c', 'o', +'v', 'e', 'r', 'y', '.', 'v', '3', '.', 'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', 'R', 'e', 'q', 'u', 'e', 's', 't', '\032', +'-', '.', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'd', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', +'.', 'v', '3', '.', 'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', '\"', '\000', '(', '\001', +'0', '\001', '\022', '}', '\n', '\016', 'D', 'e', 'l', 't', 'a', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 's', '\022', '1', '.', 'e', 'n', +'v', 'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'd', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', '.', 'v', '3', '.', +'D', 'e', 'l', 't', 'a', 'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', 'R', 'e', 'q', 'u', 'e', 's', 't', '\032', '2', '.', 'e', +'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'd', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', '.', 'v', '3', +'.', 'D', 'e', 'l', 't', 'a', 'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', '\"', '\000', +'(', '\001', '0', '\001', '\022', '\227', '\001', '\n', '\016', 'F', 'e', 't', 'c', 'h', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 's', '\022', ',', +'.', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'd', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', '.', +'v', '3', '.', 'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', 'R', 'e', 'q', 'u', 'e', 's', 't', '\032', '-', '.', 'e', 'n', 'v', +'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'd', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', '.', 'v', '3', '.', 'D', +'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', '\"', '(', '\202', '\323', '\344', '\223', '\002', '\031', '\"', +'\027', '/', 'v', '3', '/', 'd', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', ':', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', 's', '\202', +'\323', '\344', '\223', '\002', '\003', ':', '\001', '*', '\032', '6', '\212', '\244', '\226', '\363', '\007', '0', '\n', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', +'o', 'n', 'f', 'i', 'g', '.', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '.', 'v', '3', '.', 'C', 'l', 'u', 's', 't', 'e', 'r', +'L', 'o', 'a', 'd', 'A', 's', 's', 'i', 'g', 'n', 'm', 'e', 'n', 't', 'B', '@', '\n', '\'', 'i', 'o', '.', 'e', 'n', 'v', 'o', +'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'e', 'n', 'd', 'p', +'o', 'i', 'n', 't', '.', 'v', '3', 'B', '\010', 'E', 'd', 's', 'P', 'r', 'o', 't', 'o', 'P', '\001', '\210', '\001', '\001', '\272', '\200', '\310', +'\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; -static upb_def_init *deps[9] = { +static upb_def_init *deps[6] = { &envoy_service_discovery_v3_discovery_proto_upbdefinit, &google_api_annotations_proto_upbdefinit, - &google_protobuf_duration_proto_upbdefinit, - &google_protobuf_wrappers_proto_upbdefinit, &envoy_annotations_resource_proto_upbdefinit, &udpa_annotations_status_proto_upbdefinit, &udpa_annotations_versioning_proto_upbdefinit, - &validate_validate_proto_upbdefinit, NULL }; @@ -79,5 +69,5 @@ upb_def_init envoy_service_endpoint_v3_eds_proto_upbdefinit = { deps, layouts, "envoy/service/endpoint/v3/eds.proto", - UPB_STRVIEW_INIT(descriptor, 927) + UPB_STRVIEW_INIT(descriptor, 838) }; diff --git a/grpc/src/core/ext/upbdefs-generated/envoy/service/listener/v3/lds.upbdefs.c b/grpc/src/core/ext/upbdefs-generated/envoy/service/listener/v3/lds.upbdefs.c index a436513f..c0a99342 100644 --- a/grpc/src/core/ext/upbdefs-generated/envoy/service/listener/v3/lds.upbdefs.c +++ b/grpc/src/core/ext/upbdefs-generated/envoy/service/listener/v3/lds.upbdefs.c @@ -11,66 +11,56 @@ extern upb_def_init envoy_service_discovery_v3_discovery_proto_upbdefinit; extern upb_def_init google_api_annotations_proto_upbdefinit; -extern upb_def_init google_protobuf_duration_proto_upbdefinit; -extern upb_def_init google_protobuf_wrappers_proto_upbdefinit; extern upb_def_init envoy_annotations_resource_proto_upbdefinit; extern upb_def_init udpa_annotations_status_proto_upbdefinit; extern upb_def_init udpa_annotations_versioning_proto_upbdefinit; -extern upb_def_init validate_validate_proto_upbdefinit; extern const upb_msglayout envoy_service_listener_v3_LdsDummy_msginit; static const upb_msglayout *layouts[1] = { &envoy_service_listener_v3_LdsDummy_msginit, }; -static const char descriptor[914] = {'\n', '#', 'e', 'n', 'v', 'o', 'y', '/', 's', 'e', 'r', 'v', 'i', 'c', 'e', '/', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '/', +static const char descriptor[825] = {'\n', '#', 'e', 'n', 'v', 'o', 'y', '/', 's', 'e', 'r', 'v', 'i', 'c', 'e', '/', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '/', 'v', '3', '/', 'l', 'd', 's', '.', 'p', 'r', 'o', 't', 'o', '\022', '\031', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'v', '3', '\032', '*', 'e', 'n', 'v', 'o', 'y', '/', 's', 'e', 'r', 'v', 'i', 'c', 'e', '/', 'd', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', '/', 'v', '3', '/', 'd', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', '.', 'p', 'r', 'o', 't', 'o', '\032', '\034', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'a', 'p', 'i', '/', 'a', 'n', 'n', 'o', -'t', 'a', 't', 'i', 'o', 'n', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', -'t', 'o', 'b', 'u', 'f', '/', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', 'o', -'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'w', 'r', 'a', 'p', 'p', 'e', 'r', 's', '.', 'p', 'r', 'o', -'t', 'o', '\032', ' ', 'e', 'n', 'v', 'o', 'y', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'r', 'e', 's', -'o', 'u', 'r', 'c', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', -'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '!', 'u', 'd', 'p', 'a', '/', 'a', -'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', -'t', 'o', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', -'t', 'o', '\"', '(', '\n', '\010', 'L', 'd', 's', 'D', 'u', 'm', 'm', 'y', ':', '\034', '\232', '\305', '\210', '\036', '\027', '\n', '\025', 'e', 'n', -'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'L', 'd', 's', 'D', 'u', 'm', 'm', 'y', '2', '\324', '\003', '\n', '\030', 'L', -'i', 's', 't', 'e', 'n', 'e', 'r', 'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '\022', '}', -'\n', '\016', 'D', 'e', 'l', 't', 'a', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 's', '\022', '1', '.', 'e', 'n', 'v', 'o', 'y', '.', -'s', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'd', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', '.', 'v', '3', '.', 'D', 'e', 'l', 't', -'a', 'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', 'R', 'e', 'q', 'u', 'e', 's', 't', '\032', '2', '.', 'e', 'n', 'v', 'o', 'y', -'.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'd', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', '.', 'v', '3', '.', 'D', 'e', 'l', -'t', 'a', 'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', '\"', '\000', '(', '\001', '0', '\001', -'\022', 't', '\n', '\017', 'S', 't', 'r', 'e', 'a', 'm', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 's', '\022', ',', '.', 'e', 'n', 'v', +'t', 'a', 't', 'i', 'o', 'n', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', ' ', 'e', 'n', 'v', 'o', 'y', '/', 'a', 'n', 'n', 'o', +'t', 'a', 't', 'i', 'o', 'n', 's', '/', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', '\035', 'u', +'d', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', +'o', 't', 'o', '\032', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', +'s', 'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\"', '(', '\n', '\010', 'L', 'd', 's', 'D', 'u', 'm', 'm', 'y', +':', '\034', '\232', '\305', '\210', '\036', '\027', '\n', '\025', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'L', 'd', 's', +'D', 'u', 'm', 'm', 'y', '2', '\324', '\003', '\n', '\030', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 'D', 'i', 's', 'c', 'o', 'v', 'e', +'r', 'y', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '\022', '}', '\n', '\016', 'D', 'e', 'l', 't', 'a', 'L', 'i', 's', 't', 'e', 'n', 'e', +'r', 's', '\022', '1', '.', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'd', 'i', 's', 'c', 'o', 'v', +'e', 'r', 'y', '.', 'v', '3', '.', 'D', 'e', 'l', 't', 'a', 'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', 'R', 'e', 'q', 'u', +'e', 's', 't', '\032', '2', '.', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'd', 'i', 's', 'c', 'o', +'v', 'e', 'r', 'y', '.', 'v', '3', '.', 'D', 'e', 'l', 't', 'a', 'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', 'R', 'e', 's', +'p', 'o', 'n', 's', 'e', '\"', '\000', '(', '\001', '0', '\001', '\022', 't', '\n', '\017', 'S', 't', 'r', 'e', 'a', 'm', 'L', 'i', 's', 't', +'e', 'n', 'e', 'r', 's', '\022', ',', '.', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'd', 'i', 's', +'c', 'o', 'v', 'e', 'r', 'y', '.', 'v', '3', '.', 'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', 'R', 'e', 'q', 'u', 'e', 's', +'t', '\032', '-', '.', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'd', 'i', 's', 'c', 'o', 'v', 'e', +'r', 'y', '.', 'v', '3', '.', 'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', '\"', '\000', +'(', '\001', '0', '\001', '\022', '\227', '\001', '\n', '\016', 'F', 'e', 't', 'c', 'h', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 's', '\022', ',', +'.', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'd', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', '.', +'v', '3', '.', 'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', 'R', 'e', 'q', 'u', 'e', 's', 't', '\032', '-', '.', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'd', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', '.', 'v', '3', '.', 'D', -'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', 'R', 'e', 'q', 'u', 'e', 's', 't', '\032', '-', '.', 'e', 'n', 'v', 'o', 'y', '.', 's', -'e', 'r', 'v', 'i', 'c', 'e', '.', 'd', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', '.', 'v', '3', '.', 'D', 'i', 's', 'c', 'o', -'v', 'e', 'r', 'y', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', '\"', '\000', '(', '\001', '0', '\001', '\022', '\227', '\001', '\n', '\016', 'F', 'e', -'t', 'c', 'h', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 's', '\022', ',', '.', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', -'i', 'c', 'e', '.', 'd', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', '.', 'v', '3', '.', 'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', -'y', 'R', 'e', 'q', 'u', 'e', 's', 't', '\032', '-', '.', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', -'d', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', '.', 'v', '3', '.', 'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', 'R', 'e', 's', -'p', 'o', 'n', 's', 'e', '\"', '(', '\202', '\323', '\344', '\223', '\002', '\031', '\"', '\027', '/', 'v', '3', '/', 'd', 'i', 's', 'c', 'o', 'v', -'e', 'r', 'y', ':', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', 's', '\202', '\323', '\344', '\223', '\002', '\003', ':', '\001', '*', '\032', ')', '\212', -'\244', '\226', '\363', '\007', '#', '\n', '!', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'l', 'i', 's', 't', 'e', -'n', 'e', 'r', '.', 'v', '3', '.', 'L', 'i', 's', 't', 'e', 'n', 'e', 'r', 'B', '@', '\n', '\'', 'i', 'o', '.', 'e', 'n', 'v', -'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'l', 'i', 's', -'t', 'e', 'n', 'e', 'r', '.', 'v', '3', 'B', '\010', 'L', 'd', 's', 'P', 'r', 'o', 't', 'o', 'P', '\001', '\210', '\001', '\001', '\272', '\200', -'\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', '\"', '(', '\202', '\323', '\344', '\223', '\002', '\031', '\"', +'\027', '/', 'v', '3', '/', 'd', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', ':', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', 's', '\202', +'\323', '\344', '\223', '\002', '\003', ':', '\001', '*', '\032', ')', '\212', '\244', '\226', '\363', '\007', '#', '\n', '!', 'e', 'n', 'v', 'o', 'y', '.', 'c', +'o', 'n', 'f', 'i', 'g', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'v', '3', '.', 'L', 'i', 's', 't', 'e', 'n', 'e', +'r', 'B', '@', '\n', '\'', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', +'s', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '.', 'v', '3', 'B', '\010', 'L', 'd', 's', 'P', +'r', 'o', 't', 'o', 'P', '\001', '\210', '\001', '\001', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; -static upb_def_init *deps[9] = { +static upb_def_init *deps[6] = { &envoy_service_discovery_v3_discovery_proto_upbdefinit, &google_api_annotations_proto_upbdefinit, - &google_protobuf_duration_proto_upbdefinit, - &google_protobuf_wrappers_proto_upbdefinit, &envoy_annotations_resource_proto_upbdefinit, &udpa_annotations_status_proto_upbdefinit, &udpa_annotations_versioning_proto_upbdefinit, - &validate_validate_proto_upbdefinit, NULL }; @@ -78,5 +68,5 @@ upb_def_init envoy_service_listener_v3_lds_proto_upbdefinit = { deps, layouts, "envoy/service/listener/v3/lds.proto", - UPB_STRVIEW_INIT(descriptor, 914) + UPB_STRVIEW_INIT(descriptor, 825) }; diff --git a/grpc/src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.c b/grpc/src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.c index 24c1c593..830b3987 100644 --- a/grpc/src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.c +++ b/grpc/src/core/ext/upbdefs-generated/envoy/service/load_stats/v3/lrs.upbdefs.c @@ -14,7 +14,6 @@ extern upb_def_init envoy_config_endpoint_v3_load_report_proto_upbdefinit; extern upb_def_init google_protobuf_duration_proto_upbdefinit; extern upb_def_init udpa_annotations_status_proto_upbdefinit; extern upb_def_init udpa_annotations_versioning_proto_upbdefinit; -extern upb_def_init validate_validate_proto_upbdefinit; extern const upb_msglayout envoy_service_load_stats_v3_LoadStatsRequest_msginit; extern const upb_msglayout envoy_service_load_stats_v3_LoadStatsResponse_msginit; @@ -23,7 +22,7 @@ static const upb_msglayout *layouts[2] = { &envoy_service_load_stats_v3_LoadStatsResponse_msginit, }; -static const char descriptor[983] = {'\n', '%', 'e', 'n', 'v', 'o', 'y', '/', 's', 'e', 'r', 'v', 'i', 'c', 'e', '/', 'l', 'o', 'a', 'd', '_', 's', 't', 'a', 't', +static const char descriptor[958] = {'\n', '%', 'e', 'n', 'v', 'o', 'y', '/', 's', 'e', 'r', 'v', 'i', 'c', 'e', '/', 'l', 'o', 'a', 'd', '_', 's', 't', 'a', 't', 's', '/', 'v', '3', '/', 'l', 'r', 's', '.', 'p', 'r', 'o', 't', 'o', '\022', '\033', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'l', 'o', 'a', 'd', '_', 's', 't', 'a', 't', 's', '.', 'v', '3', '\032', '\037', 'e', 'n', 'v', 'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'b', 'a', 's', 'e', '.', 'p', 'r', 'o', 't', @@ -32,8 +31,7 @@ static const char descriptor[983] = {'\n', '%', 'e', 'n', 'v', 'o', 'y', '/', 's 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', -'s', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', 'l', 'i', 'd', -'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '\304', '\001', '\n', '\020', 'L', 'o', +'s', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\"', '\304', '\001', '\n', '\020', 'L', 'o', 'a', 'd', 'S', 't', 'a', 't', 's', 'R', 'e', 'q', 'u', 'e', 's', 't', '\022', '.', '\n', '\004', 'n', 'o', 'd', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '\032', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'N', 'o', 'd', 'e', 'R', '\004', 'n', 'o', 'd', 'e', '\022', 'K', '\n', '\r', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 's', @@ -65,13 +63,12 @@ static const char descriptor[983] = {'\n', '%', 'e', 'n', 'v', 'o', 'y', '/', 's 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; -static upb_def_init *deps[7] = { +static upb_def_init *deps[6] = { &envoy_config_core_v3_base_proto_upbdefinit, &envoy_config_endpoint_v3_load_report_proto_upbdefinit, &google_protobuf_duration_proto_upbdefinit, &udpa_annotations_status_proto_upbdefinit, &udpa_annotations_versioning_proto_upbdefinit, - &validate_validate_proto_upbdefinit, NULL }; @@ -79,5 +76,5 @@ upb_def_init envoy_service_load_stats_v3_lrs_proto_upbdefinit = { deps, layouts, "envoy/service/load_stats/v3/lrs.proto", - UPB_STRVIEW_INIT(descriptor, 983) + UPB_STRVIEW_INIT(descriptor, 958) }; diff --git a/grpc/src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.c b/grpc/src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.c index 5264e741..d6f94655 100644 --- a/grpc/src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.c +++ b/grpc/src/core/ext/upbdefs-generated/envoy/service/route/v3/rds.upbdefs.c @@ -11,70 +11,64 @@ extern upb_def_init envoy_service_discovery_v3_discovery_proto_upbdefinit; extern upb_def_init google_api_annotations_proto_upbdefinit; -extern upb_def_init google_protobuf_wrappers_proto_upbdefinit; extern upb_def_init envoy_annotations_resource_proto_upbdefinit; extern upb_def_init udpa_annotations_status_proto_upbdefinit; extern upb_def_init udpa_annotations_versioning_proto_upbdefinit; -extern upb_def_init validate_validate_proto_upbdefinit; extern const upb_msglayout envoy_service_route_v3_RdsDummy_msginit; static const upb_msglayout *layouts[1] = { &envoy_service_route_v3_RdsDummy_msginit, }; -static const char descriptor[1071] = {'\n', ' ', 'e', 'n', 'v', 'o', 'y', '/', 's', 'e', 'r', 'v', 'i', 'c', 'e', '/', 'r', 'o', 'u', 't', 'e', '/', 'v', '3', '/', +static const char descriptor[1014] = {'\n', ' ', 'e', 'n', 'v', 'o', 'y', '/', 's', 'e', 'r', 'v', 'i', 'c', 'e', '/', 'r', 'o', 'u', 't', 'e', '/', 'v', '3', '/', 'r', 'd', 's', '.', 'p', 'r', 'o', 't', 'o', '\022', '\026', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '\032', '*', 'e', 'n', 'v', 'o', 'y', '/', 's', 'e', 'r', 'v', 'i', 'c', 'e', '/', 'd', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', '/', 'v', '3', '/', 'd', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', '.', 'p', 'r', 'o', 't', 'o', '\032', '\034', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'a', 'p', 'i', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', -'s', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', -'w', 'r', 'a', 'p', 'p', 'e', 'r', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', ' ', 'e', 'n', 'v', 'o', 'y', '/', 'a', 'n', 'n', -'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', '\035', -'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', -'r', 'o', 't', 'o', '\032', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', -'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', -'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '(', '\n', '\010', 'R', 'd', 's', 'D', 'u', 'm', 'm', -'y', ':', '\034', '\232', '\305', '\210', '\036', '\027', '\n', '\025', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'R', 'd', -'s', 'D', 'u', 'm', 'm', 'y', '2', '\314', '\003', '\n', '\025', 'R', 'o', 'u', 't', 'e', 'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', -'S', 'e', 'r', 'v', 'i', 'c', 'e', '\022', 'q', '\n', '\014', 'S', 't', 'r', 'e', 'a', 'm', 'R', 'o', 'u', 't', 'e', 's', '\022', ',', -'.', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'd', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', '.', -'v', '3', '.', 'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', 'R', 'e', 'q', 'u', 'e', 's', 't', '\032', '-', '.', 'e', 'n', 'v', -'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'd', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', '.', 'v', '3', '.', 'D', -'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', '\"', '\000', '(', '\001', '0', '\001', '\022', 'z', '\n', -'\013', 'D', 'e', 'l', 't', 'a', 'R', 'o', 'u', 't', 'e', 's', '\022', '1', '.', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', -'i', 'c', 'e', '.', 'd', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', '.', 'v', '3', '.', 'D', 'e', 'l', 't', 'a', 'D', 'i', 's', -'c', 'o', 'v', 'e', 'r', 'y', 'R', 'e', 'q', 'u', 'e', 's', 't', '\032', '2', '.', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', -'v', 'i', 'c', 'e', '.', 'd', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', '.', 'v', '3', '.', 'D', 'e', 'l', 't', 'a', 'D', 'i', -'s', 'c', 'o', 'v', 'e', 'r', 'y', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', '\"', '\000', '(', '\001', '0', '\001', '\022', '\221', '\001', '\n', -'\013', 'F', 'e', 't', 'c', 'h', 'R', 'o', 'u', 't', 'e', 's', '\022', ',', '.', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', +'s', '.', 'p', 'r', 'o', 't', 'o', '\032', ' ', 'e', 'n', 'v', 'o', 'y', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', +'s', '/', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', +'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '!', 'u', +'d', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', +'g', '.', 'p', 'r', 'o', 't', 'o', '\"', '(', '\n', '\010', 'R', 'd', 's', 'D', 'u', 'm', 'm', 'y', ':', '\034', '\232', '\305', '\210', '\036', +'\027', '\n', '\025', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'p', 'i', '.', 'v', '2', '.', 'R', 'd', 's', 'D', 'u', 'm', 'm', 'y', '2', +'\314', '\003', '\n', '\025', 'R', 'o', 'u', 't', 'e', 'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', 'S', 'e', 'r', 'v', 'i', 'c', 'e', +'\022', 'q', '\n', '\014', 'S', 't', 'r', 'e', 'a', 'm', 'R', 'o', 'u', 't', 'e', 's', '\022', ',', '.', 'e', 'n', 'v', 'o', 'y', '.', +'s', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'd', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', '.', 'v', '3', '.', 'D', 'i', 's', 'c', +'o', 'v', 'e', 'r', 'y', 'R', 'e', 'q', 'u', 'e', 's', 't', '\032', '-', '.', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'd', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', '.', 'v', '3', '.', 'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', -'y', 'R', 'e', 'q', 'u', 'e', 's', 't', '\032', '-', '.', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', -'d', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', '.', 'v', '3', '.', 'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', 'R', 'e', 's', -'p', 'o', 'n', 's', 'e', '\"', '%', '\202', '\323', '\344', '\223', '\002', '\026', '\"', '\024', '/', 'v', '3', '/', 'd', 'i', 's', 'c', 'o', 'v', -'e', 'r', 'y', ':', 'r', 'o', 'u', 't', 'e', 's', '\202', '\323', '\344', '\223', '\002', '\003', ':', '\001', '*', '\032', '0', '\212', '\244', '\226', '\363', -'\007', '*', '\n', '(', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', -'.', 'R', 'o', 'u', 't', 'e', 'C', 'o', 'n', 'f', 'i', 'g', 'u', 'r', 'a', 't', 'i', 'o', 'n', '2', '\313', '\001', '\n', '\033', 'V', -'i', 'r', 't', 'u', 'a', 'l', 'H', 'o', 's', 't', 'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', 'S', 'e', 'r', 'v', 'i', 'c', -'e', '\022', '\200', '\001', '\n', '\021', 'D', 'e', 'l', 't', 'a', 'V', 'i', 'r', 't', 'u', 'a', 'l', 'H', 'o', 's', 't', 's', '\022', '1', -'.', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'd', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', '.', -'v', '3', '.', 'D', 'e', 'l', 't', 'a', 'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', 'R', 'e', 'q', 'u', 'e', 's', 't', '\032', -'2', '.', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'd', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', -'.', 'v', '3', '.', 'D', 'e', 'l', 't', 'a', 'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', 'R', 'e', 's', 'p', 'o', 'n', 's', -'e', '\"', '\000', '(', '\001', '0', '\001', '\032', ')', '\212', '\244', '\226', '\363', '\007', '#', '\n', '!', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', -'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'V', 'i', 'r', 't', 'u', 'a', 'l', 'H', 'o', 's', 't', -'B', '=', '\n', '$', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 's', -'e', 'r', 'v', 'i', 'c', 'e', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', 'B', '\010', 'R', 'd', 's', 'P', 'r', 'o', 't', 'o', -'P', '\001', '\210', '\001', '\001', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +'y', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', '\"', '\000', '(', '\001', '0', '\001', '\022', 'z', '\n', '\013', 'D', 'e', 'l', 't', 'a', 'R', +'o', 'u', 't', 'e', 's', '\022', '1', '.', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'd', 'i', 's', +'c', 'o', 'v', 'e', 'r', 'y', '.', 'v', '3', '.', 'D', 'e', 'l', 't', 'a', 'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', 'R', +'e', 'q', 'u', 'e', 's', 't', '\032', '2', '.', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'd', 'i', +'s', 'c', 'o', 'v', 'e', 'r', 'y', '.', 'v', '3', '.', 'D', 'e', 'l', 't', 'a', 'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', +'R', 'e', 's', 'p', 'o', 'n', 's', 'e', '\"', '\000', '(', '\001', '0', '\001', '\022', '\221', '\001', '\n', '\013', 'F', 'e', 't', 'c', 'h', 'R', +'o', 'u', 't', 'e', 's', '\022', ',', '.', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'd', 'i', 's', +'c', 'o', 'v', 'e', 'r', 'y', '.', 'v', '3', '.', 'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', 'R', 'e', 'q', 'u', 'e', 's', +'t', '\032', '-', '.', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'd', 'i', 's', 'c', 'o', 'v', 'e', +'r', 'y', '.', 'v', '3', '.', 'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', '\"', '%', +'\202', '\323', '\344', '\223', '\002', '\026', '\"', '\024', '/', 'v', '3', '/', 'd', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', ':', 'r', 'o', 'u', +'t', 'e', 's', '\202', '\323', '\344', '\223', '\002', '\003', ':', '\001', '*', '\032', '0', '\212', '\244', '\226', '\363', '\007', '*', '\n', '(', 'e', 'n', 'v', +'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', 'u', 't', 'e', '.', 'v', '3', '.', 'R', 'o', 'u', 't', 'e', 'C', +'o', 'n', 'f', 'i', 'g', 'u', 'r', 'a', 't', 'i', 'o', 'n', '2', '\313', '\001', '\n', '\033', 'V', 'i', 'r', 't', 'u', 'a', 'l', 'H', +'o', 's', 't', 'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '\022', '\200', '\001', '\n', '\021', 'D', +'e', 'l', 't', 'a', 'V', 'i', 'r', 't', 'u', 'a', 'l', 'H', 'o', 's', 't', 's', '\022', '1', '.', 'e', 'n', 'v', 'o', 'y', '.', +'s', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'd', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', '.', 'v', '3', '.', 'D', 'e', 'l', 't', +'a', 'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', 'R', 'e', 'q', 'u', 'e', 's', 't', '\032', '2', '.', 'e', 'n', 'v', 'o', 'y', +'.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 'd', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', '.', 'v', '3', '.', 'D', 'e', 'l', +'t', 'a', 'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', '\"', '\000', '(', '\001', '0', '\001', +'\032', ')', '\212', '\244', '\226', '\363', '\007', '#', '\n', '!', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'r', 'o', +'u', 't', 'e', '.', 'v', '3', '.', 'V', 'i', 'r', 't', 'u', 'a', 'l', 'H', 'o', 's', 't', 'B', '=', '\n', '$', 'i', 'o', '.', +'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', +'r', 'o', 'u', 't', 'e', '.', 'v', '3', 'B', '\010', 'R', 'd', 's', 'P', 'r', 'o', 't', 'o', 'P', '\001', '\210', '\001', '\001', '\272', '\200', +'\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; -static upb_def_init *deps[8] = { +static upb_def_init *deps[6] = { &envoy_service_discovery_v3_discovery_proto_upbdefinit, &google_api_annotations_proto_upbdefinit, - &google_protobuf_wrappers_proto_upbdefinit, &envoy_annotations_resource_proto_upbdefinit, &udpa_annotations_status_proto_upbdefinit, &udpa_annotations_versioning_proto_upbdefinit, - &validate_validate_proto_upbdefinit, NULL }; @@ -82,5 +76,5 @@ upb_def_init envoy_service_route_v3_rds_proto_upbdefinit = { deps, layouts, "envoy/service/route/v3/rds.proto", - UPB_STRVIEW_INIT(descriptor, 1071) + UPB_STRVIEW_INIT(descriptor, 1014) }; diff --git a/grpc/src/core/ext/upbdefs-generated/envoy/service/status/v3/csds.upbdefs.c b/grpc/src/core/ext/upbdefs-generated/envoy/service/status/v3/csds.upbdefs.c new file mode 100644 index 00000000..2673ebbb --- /dev/null +++ b/grpc/src/core/ext/upbdefs-generated/envoy/service/status/v3/csds.upbdefs.c @@ -0,0 +1,130 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * envoy/service/status/v3/csds.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#include "upb/def.h" +#include "envoy/service/status/v3/csds.upbdefs.h" + +extern upb_def_init envoy_admin_v3_config_dump_proto_upbdefinit; +extern upb_def_init envoy_config_core_v3_base_proto_upbdefinit; +extern upb_def_init envoy_type_matcher_v3_node_proto_upbdefinit; +extern upb_def_init google_api_annotations_proto_upbdefinit; +extern upb_def_init udpa_annotations_migrate_proto_upbdefinit; +extern upb_def_init udpa_annotations_status_proto_upbdefinit; +extern upb_def_init udpa_annotations_versioning_proto_upbdefinit; +extern const upb_msglayout envoy_service_status_v3_ClientStatusRequest_msginit; +extern const upb_msglayout envoy_service_status_v3_PerXdsConfig_msginit; +extern const upb_msglayout envoy_service_status_v3_ClientConfig_msginit; +extern const upb_msglayout envoy_service_status_v3_ClientStatusResponse_msginit; + +static const upb_msglayout *layouts[4] = { + &envoy_service_status_v3_ClientStatusRequest_msginit, + &envoy_service_status_v3_PerXdsConfig_msginit, + &envoy_service_status_v3_ClientConfig_msginit, + &envoy_service_status_v3_ClientStatusResponse_msginit, +}; + +static const char descriptor[2001] = {'\n', '\"', 'e', 'n', 'v', 'o', 'y', '/', 's', 'e', 'r', 'v', 'i', 'c', 'e', '/', 's', 't', 'a', 't', 'u', 's', '/', 'v', '3', +'/', 'c', 's', 'd', 's', '.', 'p', 'r', 'o', 't', 'o', '\022', '\027', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', +'e', '.', 's', 't', 'a', 't', 'u', 's', '.', 'v', '3', '\032', ' ', 'e', 'n', 'v', 'o', 'y', '/', 'a', 'd', 'm', 'i', 'n', '/', +'v', '3', '/', 'c', 'o', 'n', 'f', 'i', 'g', '_', 'd', 'u', 'm', 'p', '.', 'p', 'r', 'o', 't', 'o', '\032', '\037', 'e', 'n', 'v', +'o', 'y', '/', 'c', 'o', 'n', 'f', 'i', 'g', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'b', 'a', 's', 'e', '.', 'p', 'r', +'o', 't', 'o', '\032', ' ', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', +'3', '/', 'n', 'o', 'd', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', '\034', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'a', 'p', 'i', '/', +'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'u', 'd', 'p', 'a', '/', 'a', +'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'm', 'i', 'g', 'r', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', +'\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', +'p', 'r', 'o', 't', 'o', '\032', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', +'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\"', '\302', '\001', '\n', '\023', 'C', 'l', 'i', 'e', 'n', +'t', 'S', 't', 'a', 't', 'u', 's', 'R', 'e', 'q', 'u', 'e', 's', 't', '\022', 'G', '\n', '\r', 'n', 'o', 'd', 'e', '_', 'm', 'a', +'t', 'c', 'h', 'e', 'r', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', +'.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'N', 'o', 'd', 'e', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'R', '\014', +'n', 'o', 'd', 'e', 'M', 'a', 't', 'c', 'h', 'e', 'r', 's', '\022', '.', '\n', '\004', 'n', 'o', 'd', 'e', '\030', '\002', ' ', '\001', '(', +'\013', '2', '\032', '.', 'e', 'n', 'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', +'N', 'o', 'd', 'e', 'R', '\004', 'n', 'o', 'd', 'e', ':', '2', '\232', '\305', '\210', '\036', '-', '\n', '+', 'e', 'n', 'v', 'o', 'y', '.', +'s', 'e', 'r', 'v', 'i', 'c', 'e', '.', 's', 't', 'a', 't', 'u', 's', '.', 'v', '2', '.', 'C', 'l', 'i', 'e', 'n', 't', 'S', +'t', 'a', 't', 'u', 's', 'R', 'e', 'q', 'u', 'e', 's', 't', '\"', '\360', '\004', '\n', '\014', 'P', 'e', 'r', 'X', 'd', 's', 'C', 'o', +'n', 'f', 'i', 'g', '\022', '=', '\n', '\006', 's', 't', 'a', 't', 'u', 's', '\030', '\001', ' ', '\001', '(', '\016', '2', '%', '.', 'e', 'n', +'v', 'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 's', 't', 'a', 't', 'u', 's', '.', 'v', '3', '.', 'C', 'o', 'n', +'f', 'i', 'g', 'S', 't', 'a', 't', 'u', 's', 'R', '\006', 's', 't', 'a', 't', 'u', 's', '\022', 'T', '\n', '\r', 'c', 'l', 'i', 'e', +'n', 't', '_', 's', 't', 'a', 't', 'u', 's', '\030', '\007', ' ', '\001', '(', '\016', '2', '+', '.', 'e', 'n', 'v', 'o', 'y', '.', 's', +'e', 'r', 'v', 'i', 'c', 'e', '.', 's', 't', 'a', 't', 'u', 's', '.', 'v', '3', '.', 'C', 'l', 'i', 'e', 'n', 't', 'C', 'o', +'n', 'f', 'i', 'g', 'S', 't', 'a', 't', 'u', 's', 'B', '\002', '\030', '\001', 'R', '\014', 'c', 'l', 'i', 'e', 'n', 't', 'S', 't', 'a', +'t', 'u', 's', '\022', 'N', '\n', '\017', 'l', 'i', 's', 't', 'e', 'n', 'e', 'r', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\002', ' ', +'\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '3', '.', 'L', 'i', 's', 't', +'e', 'n', 'e', 'r', 's', 'C', 'o', 'n', 'f', 'i', 'g', 'D', 'u', 'm', 'p', 'H', '\000', 'R', '\016', 'l', 'i', 's', 't', 'e', 'n', +'e', 'r', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'K', '\n', '\016', 'c', 'l', 'u', 's', 't', 'e', 'r', '_', 'c', 'o', 'n', 'f', 'i', +'g', '\030', '\003', ' ', '\001', '(', '\013', '2', '\"', '.', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '3', '.', +'C', 'l', 'u', 's', 't', 'e', 'r', 's', 'C', 'o', 'n', 'f', 'i', 'g', 'D', 'u', 'm', 'p', 'H', '\000', 'R', '\r', 'c', 'l', 'u', +'s', 't', 'e', 'r', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'E', '\n', '\014', 'r', 'o', 'u', 't', 'e', '_', 'c', 'o', 'n', 'f', 'i', +'g', '\030', '\004', ' ', '\001', '(', '\013', '2', ' ', '.', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '3', '.', +'R', 'o', 'u', 't', 'e', 's', 'C', 'o', 'n', 'f', 'i', 'g', 'D', 'u', 'm', 'p', 'H', '\000', 'R', '\013', 'r', 'o', 'u', 't', 'e', +'C', 'o', 'n', 'f', 'i', 'g', '\022', 'X', '\n', '\023', 's', 'c', 'o', 'p', 'e', 'd', '_', 'r', 'o', 'u', 't', 'e', '_', 'c', 'o', +'n', 'f', 'i', 'g', '\030', '\005', ' ', '\001', '(', '\013', '2', '&', '.', 'e', 'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', +'v', '3', '.', 'S', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 's', 'C', 'o', 'n', 'f', 'i', 'g', 'D', 'u', 'm', 'p', +'H', '\000', 'R', '\021', 's', 'c', 'o', 'p', 'e', 'd', 'R', 'o', 'u', 't', 'e', 'C', 'o', 'n', 'f', 'i', 'g', '\022', 'N', '\n', '\017', +'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\006', ' ', '\001', '(', '\013', '2', '#', '.', 'e', +'n', 'v', 'o', 'y', '.', 'a', 'd', 'm', 'i', 'n', '.', 'v', '3', '.', 'E', 'n', 'd', 'p', 'o', 'i', 'n', 't', 's', 'C', 'o', +'n', 'f', 'i', 'g', 'D', 'u', 'm', 'p', 'H', '\000', 'R', '\016', 'e', 'n', 'd', 'p', 'o', 'i', 'n', 't', 'C', 'o', 'n', 'f', 'i', +'g', ':', '+', '\232', '\305', '\210', '\036', '&', '\n', '$', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 's', +'t', 'a', 't', 'u', 's', '.', 'v', '2', '.', 'P', 'e', 'r', 'X', 'd', 's', 'C', 'o', 'n', 'f', 'i', 'g', 'B', '\020', '\n', '\016', +'p', 'e', 'r', '_', 'x', 'd', 's', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\"', '\261', '\001', '\n', '\014', 'C', 'l', 'i', 'e', 'n', 't', +'C', 'o', 'n', 'f', 'i', 'g', '\022', '.', '\n', '\004', 'n', 'o', 'd', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '\032', '.', 'e', 'n', +'v', 'o', 'y', '.', 'c', 'o', 'n', 'f', 'i', 'g', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'N', 'o', 'd', 'e', 'R', '\004', +'n', 'o', 'd', 'e', '\022', 'D', '\n', '\n', 'x', 'd', 's', '_', 'c', 'o', 'n', 'f', 'i', 'g', '\030', '\002', ' ', '\003', '(', '\013', '2', +'%', '.', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 's', 't', 'a', 't', 'u', 's', '.', 'v', '3', +'.', 'P', 'e', 'r', 'X', 'd', 's', 'C', 'o', 'n', 'f', 'i', 'g', 'R', '\t', 'x', 'd', 's', 'C', 'o', 'n', 'f', 'i', 'g', ':', +'+', '\232', '\305', '\210', '\036', '&', '\n', '$', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 's', 't', 'a', +'t', 'u', 's', '.', 'v', '2', '.', 'C', 'l', 'i', 'e', 'n', 't', 'C', 'o', 'n', 'f', 'i', 'g', '\"', '\212', '\001', '\n', '\024', 'C', +'l', 'i', 'e', 'n', 't', 'S', 't', 'a', 't', 'u', 's', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', '\022', '=', '\n', '\006', 'c', 'o', +'n', 'f', 'i', 'g', '\030', '\001', ' ', '\003', '(', '\013', '2', '%', '.', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', +'e', '.', 's', 't', 'a', 't', 'u', 's', '.', 'v', '3', '.', 'C', 'l', 'i', 'e', 'n', 't', 'C', 'o', 'n', 'f', 'i', 'g', 'R', +'\006', 'c', 'o', 'n', 'f', 'i', 'g', ':', '3', '\232', '\305', '\210', '\036', '.', '\n', ',', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', +'v', 'i', 'c', 'e', '.', 's', 't', 'a', 't', 'u', 's', '.', 'v', '2', '.', 'C', 'l', 'i', 'e', 'n', 't', 'S', 't', 'a', 't', +'u', 's', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', '*', 'K', '\n', '\014', 'C', 'o', 'n', 'f', 'i', 'g', 'S', 't', 'a', 't', 'u', +'s', '\022', '\013', '\n', '\007', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\n', '\n', '\006', 'S', 'Y', 'N', 'C', 'E', 'D', '\020', +'\001', '\022', '\014', '\n', '\010', 'N', 'O', 'T', '_', 'S', 'E', 'N', 'T', '\020', '\002', '\022', '\t', '\n', '\005', 'S', 'T', 'A', 'L', 'E', '\020', +'\003', '\022', '\t', '\n', '\005', 'E', 'R', 'R', 'O', 'R', '\020', '\004', '*', 'c', '\n', '\022', 'C', 'l', 'i', 'e', 'n', 't', 'C', 'o', 'n', +'f', 'i', 'g', 'S', 't', 'a', 't', 'u', 's', '\022', '\022', '\n', '\016', 'C', 'L', 'I', 'E', 'N', 'T', '_', 'U', 'N', 'K', 'N', 'O', +'W', 'N', '\020', '\000', '\022', '\024', '\n', '\020', 'C', 'L', 'I', 'E', 'N', 'T', '_', 'R', 'E', 'Q', 'U', 'E', 'S', 'T', 'E', 'D', '\020', +'\001', '\022', '\020', '\n', '\014', 'C', 'L', 'I', 'E', 'N', 'T', '_', 'A', 'C', 'K', 'E', 'D', '\020', '\002', '\022', '\021', '\n', '\r', 'C', 'L', +'I', 'E', 'N', 'T', '_', 'N', 'A', 'C', 'K', 'E', 'D', '\020', '\003', '2', '\270', '\002', '\n', '\034', 'C', 'l', 'i', 'e', 'n', 't', 'S', +'t', 'a', 't', 'u', 's', 'D', 'i', 's', 'c', 'o', 'v', 'e', 'r', 'y', 'S', 'e', 'r', 'v', 'i', 'c', 'e', '\022', 'w', '\n', '\022', +'S', 't', 'r', 'e', 'a', 'm', 'C', 'l', 'i', 'e', 'n', 't', 'S', 't', 'a', 't', 'u', 's', '\022', ',', '.', 'e', 'n', 'v', 'o', +'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 's', 't', 'a', 't', 'u', 's', '.', 'v', '3', '.', 'C', 'l', 'i', 'e', 'n', +'t', 'S', 't', 'a', 't', 'u', 's', 'R', 'e', 'q', 'u', 'e', 's', 't', '\032', '-', '.', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', +'r', 'v', 'i', 'c', 'e', '.', 's', 't', 'a', 't', 'u', 's', '.', 'v', '3', '.', 'C', 'l', 'i', 'e', 'n', 't', 'S', 't', 'a', +'t', 'u', 's', 'R', 'e', 's', 'p', 'o', 'n', 's', 'e', '\"', '\000', '(', '\001', '0', '\001', '\022', '\236', '\001', '\n', '\021', 'F', 'e', 't', +'c', 'h', 'C', 'l', 'i', 'e', 'n', 't', 'S', 't', 'a', 't', 'u', 's', '\022', ',', '.', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', +'r', 'v', 'i', 'c', 'e', '.', 's', 't', 'a', 't', 'u', 's', '.', 'v', '3', '.', 'C', 'l', 'i', 'e', 'n', 't', 'S', 't', 'a', +'t', 'u', 's', 'R', 'e', 'q', 'u', 'e', 's', 't', '\032', '-', '.', 'e', 'n', 'v', 'o', 'y', '.', 's', 'e', 'r', 'v', 'i', 'c', +'e', '.', 's', 't', 'a', 't', 'u', 's', '.', 'v', '3', '.', 'C', 'l', 'i', 'e', 'n', 't', 'S', 't', 'a', 't', 'u', 's', 'R', +'e', 's', 'p', 'o', 'n', 's', 'e', '\"', ',', '\202', '\323', '\344', '\223', '\002', '\035', '\"', '\033', '/', 'v', '3', '/', 'd', 'i', 's', 'c', +'o', 'v', 'e', 'r', 'y', ':', 'c', 'l', 'i', 'e', 'n', 't', '_', 's', 't', 'a', 't', 'u', 's', '\202', '\323', '\344', '\223', '\002', '\003', +':', '\001', '*', 'B', '?', '\n', '%', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', +'y', '.', 's', 'e', 'r', 'v', 'i', 'c', 'e', '.', 's', 't', 'a', 't', 'u', 's', '.', 'v', '3', 'B', '\t', 'C', 's', 'd', 's', +'P', 'r', 'o', 't', 'o', 'P', '\001', '\210', '\001', '\001', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', +'3', +}; + +static upb_def_init *deps[8] = { + &envoy_admin_v3_config_dump_proto_upbdefinit, + &envoy_config_core_v3_base_proto_upbdefinit, + &envoy_type_matcher_v3_node_proto_upbdefinit, + &google_api_annotations_proto_upbdefinit, + &udpa_annotations_migrate_proto_upbdefinit, + &udpa_annotations_status_proto_upbdefinit, + &udpa_annotations_versioning_proto_upbdefinit, + NULL +}; + +upb_def_init envoy_service_status_v3_csds_proto_upbdefinit = { + deps, + layouts, + "envoy/service/status/v3/csds.proto", + UPB_STRVIEW_INIT(descriptor, 2001) +}; diff --git a/grpc/src/core/ext/upbdefs-generated/envoy/service/status/v3/csds.upbdefs.h b/grpc/src/core/ext/upbdefs-generated/envoy/service/status/v3/csds.upbdefs.h new file mode 100644 index 00000000..91723cc1 --- /dev/null +++ b/grpc/src/core/ext/upbdefs-generated/envoy/service/status/v3/csds.upbdefs.h @@ -0,0 +1,50 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * envoy/service/status/v3/csds.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#ifndef ENVOY_SERVICE_STATUS_V3_CSDS_PROTO_UPBDEFS_H_ +#define ENVOY_SERVICE_STATUS_V3_CSDS_PROTO_UPBDEFS_H_ + +#include "upb/def.h" +#include "upb/port_def.inc" +#ifdef __cplusplus +extern "C" { +#endif + +#include "upb/def.h" + +#include "upb/port_def.inc" + +extern upb_def_init envoy_service_status_v3_csds_proto_upbdefinit; + +UPB_INLINE const upb_msgdef *envoy_service_status_v3_ClientStatusRequest_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_service_status_v3_csds_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.service.status.v3.ClientStatusRequest"); +} + +UPB_INLINE const upb_msgdef *envoy_service_status_v3_PerXdsConfig_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_service_status_v3_csds_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.service.status.v3.PerXdsConfig"); +} + +UPB_INLINE const upb_msgdef *envoy_service_status_v3_ClientConfig_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_service_status_v3_csds_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.service.status.v3.ClientConfig"); +} + +UPB_INLINE const upb_msgdef *envoy_service_status_v3_ClientStatusResponse_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_service_status_v3_csds_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.service.status.v3.ClientStatusResponse"); +} + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#include "upb/port_undef.inc" + +#endif /* ENVOY_SERVICE_STATUS_V3_CSDS_PROTO_UPBDEFS_H_ */ diff --git a/grpc/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/node.upbdefs.c b/grpc/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/node.upbdefs.c new file mode 100644 index 00000000..8b0ecb58 --- /dev/null +++ b/grpc/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/node.upbdefs.c @@ -0,0 +1,56 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * envoy/type/matcher/v3/node.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#include "upb/def.h" +#include "envoy/type/matcher/v3/node.upbdefs.h" + +extern upb_def_init envoy_type_matcher_v3_string_proto_upbdefinit; +extern upb_def_init envoy_type_matcher_v3_struct_proto_upbdefinit; +extern upb_def_init udpa_annotations_status_proto_upbdefinit; +extern upb_def_init udpa_annotations_versioning_proto_upbdefinit; +extern const upb_msglayout envoy_type_matcher_v3_NodeMatcher_msginit; + +static const upb_msglayout *layouts[1] = { + &envoy_type_matcher_v3_NodeMatcher_msginit, +}; + +static const char descriptor[458] = {'\n', ' ', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 'n', +'o', 'd', 'e', '.', 'p', 'r', 'o', 't', 'o', '\022', '\025', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', +'c', 'h', 'e', 'r', '.', 'v', '3', '\032', '\"', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', +'e', 'r', '/', 'v', '3', '/', 's', 't', 'r', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\"', 'e', 'n', 'v', 'o', 'y', +'/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 's', 't', 'r', 'u', 'c', 't', '.', 'p', +'r', 'o', 't', 'o', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', +'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', +'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\"', '\300', '\001', '\n', '\013', +'N', 'o', 'd', 'e', 'M', 'a', 't', 'c', 'h', 'e', 'r', '\022', '=', '\n', '\007', 'n', 'o', 'd', 'e', '_', 'i', 'd', '\030', '\001', ' ', +'\001', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', +'v', '3', '.', 'S', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'R', '\006', 'n', 'o', 'd', 'e', 'I', 'd', '\022', +'K', '\n', '\016', 'n', 'o', 'd', 'e', '_', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', 's', '\030', '\002', ' ', '\003', '(', '\013', '2', '$', +'.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'S', 't', +'r', 'u', 'c', 't', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'R', '\r', 'n', 'o', 'd', 'e', 'M', 'e', 't', 'a', 'd', 'a', 't', 'a', +'s', ':', '%', '\232', '\305', '\210', '\036', ' ', '\n', '\036', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', +'h', 'e', 'r', '.', 'N', 'o', 'd', 'e', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', ':', '\n', '#', 'i', 'o', '.', 'e', 'n', 'v', +'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', +'r', '.', 'v', '3', 'B', '\t', 'N', 'o', 'd', 'e', 'P', 'r', 'o', 't', 'o', 'P', '\001', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', +'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +}; + +static upb_def_init *deps[5] = { + &envoy_type_matcher_v3_string_proto_upbdefinit, + &envoy_type_matcher_v3_struct_proto_upbdefinit, + &udpa_annotations_status_proto_upbdefinit, + &udpa_annotations_versioning_proto_upbdefinit, + NULL +}; + +upb_def_init envoy_type_matcher_v3_node_proto_upbdefinit = { + deps, + layouts, + "envoy/type/matcher/v3/node.proto", + UPB_STRVIEW_INIT(descriptor, 458) +}; diff --git a/grpc/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/node.upbdefs.h b/grpc/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/node.upbdefs.h new file mode 100644 index 00000000..9ec4a6de --- /dev/null +++ b/grpc/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/node.upbdefs.h @@ -0,0 +1,35 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * envoy/type/matcher/v3/node.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#ifndef ENVOY_TYPE_MATCHER_V3_NODE_PROTO_UPBDEFS_H_ +#define ENVOY_TYPE_MATCHER_V3_NODE_PROTO_UPBDEFS_H_ + +#include "upb/def.h" +#include "upb/port_def.inc" +#ifdef __cplusplus +extern "C" { +#endif + +#include "upb/def.h" + +#include "upb/port_def.inc" + +extern upb_def_init envoy_type_matcher_v3_node_proto_upbdefinit; + +UPB_INLINE const upb_msgdef *envoy_type_matcher_v3_NodeMatcher_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_type_matcher_v3_node_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.type.matcher.v3.NodeMatcher"); +} + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#include "upb/port_undef.inc" + +#endif /* ENVOY_TYPE_MATCHER_V3_NODE_PROTO_UPBDEFS_H_ */ diff --git a/grpc/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.c b/grpc/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.c index 60901528..4844b106 100644 --- a/grpc/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.c +++ b/grpc/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/string.upbdefs.c @@ -10,7 +10,6 @@ #include "envoy/type/matcher/v3/string.upbdefs.h" extern upb_def_init envoy_type_matcher_v3_regex_proto_upbdefinit; -extern upb_def_init envoy_annotations_deprecation_proto_upbdefinit; extern upb_def_init udpa_annotations_status_proto_upbdefinit; extern upb_def_init udpa_annotations_versioning_proto_upbdefinit; extern upb_def_init validate_validate_proto_upbdefinit; @@ -22,42 +21,40 @@ static const upb_msglayout *layouts[2] = { &envoy_type_matcher_v3_ListStringMatcher_msginit, }; -static const char descriptor[775] = {'\n', '\"', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 's', +static const char descriptor[738] = {'\n', '\"', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 's', 't', 'r', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\022', '\025', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '\032', '!', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', -'c', 'h', 'e', 'r', '/', 'v', '3', '/', 'r', 'e', 'g', 'e', 'x', '.', 'p', 'r', 'o', 't', 'o', '\032', '#', 'e', 'n', 'v', 'o', -'y', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'i', 'o', 'n', -'.', 'p', 'r', 'o', 't', 'o', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', -'s', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', -'t', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', 'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', -'a', 'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '\321', '\002', -'\n', '\r', 'S', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', 'e', 'r', '\022', '\026', '\n', '\005', 'e', 'x', 'a', 'c', 't', '\030', -'\001', ' ', '\001', '(', '\t', 'H', '\000', 'R', '\005', 'e', 'x', 'a', 'c', 't', '\022', '!', '\n', '\006', 'p', 'r', 'e', 'f', 'i', 'x', '\030', -'\002', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'H', '\000', 'R', '\006', 'p', 'r', 'e', 'f', 'i', 'x', '\022', -'!', '\n', '\006', 's', 'u', 'f', 'f', 'i', 'x', '\030', '\003', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'H', -'\000', 'R', '\006', 's', 'u', 'f', 'f', 'i', 'x', '\022', 'N', '\n', '\n', 's', 'a', 'f', 'e', '_', 'r', 'e', 'g', 'e', 'x', '\030', '\005', -' ', '\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', -'.', 'v', '3', '.', 'R', 'e', 'g', 'e', 'x', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', -'\001', 'H', '\000', 'R', '\t', 's', 'a', 'f', 'e', 'R', 'e', 'g', 'e', 'x', '\022', '%', '\n', '\010', 'c', 'o', 'n', 't', 'a', 'i', 'n', -'s', '\030', '\007', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'H', '\000', 'R', '\010', 'c', 'o', 'n', 't', 'a', -'i', 'n', 's', '\022', '\037', '\n', '\013', 'i', 'g', 'n', 'o', 'r', 'e', '_', 'c', 'a', 's', 'e', '\030', '\006', ' ', '\001', '(', '\010', 'R', -'\n', 'i', 'g', 'n', 'o', 'r', 'e', 'C', 'a', 's', 'e', ':', '\'', '\232', '\305', '\210', '\036', '\"', '\n', ' ', 'e', 'n', 'v', 'o', 'y', -'.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'S', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', -'e', 'r', 'B', '\024', '\n', '\r', 'm', 'a', 't', 'c', 'h', '_', 'p', 'a', 't', 't', 'e', 'r', 'n', '\022', '\003', '\370', 'B', '\001', 'J', -'\004', '\010', '\004', '\020', '\005', 'R', '\005', 'r', 'e', 'g', 'e', 'x', '\"', '\214', '\001', '\n', '\021', 'L', 'i', 's', 't', 'S', 't', 'r', 'i', -'n', 'g', 'M', 'a', 't', 'c', 'h', 'e', 'r', '\022', 'J', '\n', '\010', 'p', 'a', 't', 't', 'e', 'r', 'n', 's', '\030', '\001', ' ', '\003', -'(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', -'3', '.', 'S', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', -'R', '\010', 'p', 'a', 't', 't', 'e', 'r', 'n', 's', ':', '+', '\232', '\305', '\210', '\036', '&', '\n', '$', 'e', 'n', 'v', 'o', 'y', '.', -'t', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'L', 'i', 's', 't', 'S', 't', 'r', 'i', 'n', 'g', 'M', 'a', -'t', 'c', 'h', 'e', 'r', 'B', '<', '\n', '#', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', -'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', 'B', '\013', 'S', 't', 'r', 'i', -'n', 'g', 'P', 'r', 'o', 't', 'o', 'P', '\001', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +'c', 'h', 'e', 'r', '/', 'v', '3', '/', 'r', 'e', 'g', 'e', 'x', '.', 'p', 'r', 'o', 't', 'o', '\032', '\035', 'u', 'd', 'p', 'a', +'/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', +'\032', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', +'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', +'d', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '\321', '\002', '\n', '\r', 'S', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', +'h', 'e', 'r', '\022', '\026', '\n', '\005', 'e', 'x', 'a', 'c', 't', '\030', '\001', ' ', '\001', '(', '\t', 'H', '\000', 'R', '\005', 'e', 'x', 'a', +'c', 't', '\022', '!', '\n', '\006', 'p', 'r', 'e', 'f', 'i', 'x', '\030', '\002', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', +'\020', '\001', 'H', '\000', 'R', '\006', 'p', 'r', 'e', 'f', 'i', 'x', '\022', '!', '\n', '\006', 's', 'u', 'f', 'f', 'i', 'x', '\030', '\003', ' ', +'\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'H', '\000', 'R', '\006', 's', 'u', 'f', 'f', 'i', 'x', '\022', 'N', '\n', +'\n', 's', 'a', 'f', 'e', '_', 'r', 'e', 'g', 'e', 'x', '\030', '\005', ' ', '\001', '(', '\013', '2', '#', '.', 'e', 'n', 'v', 'o', 'y', +'.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'R', 'e', 'g', 'e', 'x', 'M', 'a', 't', +'c', 'h', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'H', '\000', 'R', '\t', 's', 'a', 'f', 'e', 'R', 'e', 'g', +'e', 'x', '\022', '%', '\n', '\010', 'c', 'o', 'n', 't', 'a', 'i', 'n', 's', '\030', '\007', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', +'r', '\002', '\020', '\001', 'H', '\000', 'R', '\010', 'c', 'o', 'n', 't', 'a', 'i', 'n', 's', '\022', '\037', '\n', '\013', 'i', 'g', 'n', 'o', 'r', +'e', '_', 'c', 'a', 's', 'e', '\030', '\006', ' ', '\001', '(', '\010', 'R', '\n', 'i', 'g', 'n', 'o', 'r', 'e', 'C', 'a', 's', 'e', ':', +'\'', '\232', '\305', '\210', '\036', '\"', '\n', ' ', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', +'r', '.', 'S', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '\024', '\n', '\r', 'm', 'a', 't', 'c', 'h', '_', +'p', 'a', 't', 't', 'e', 'r', 'n', '\022', '\003', '\370', 'B', '\001', 'J', '\004', '\010', '\004', '\020', '\005', 'R', '\005', 'r', 'e', 'g', 'e', 'x', +'\"', '\214', '\001', '\n', '\021', 'L', 'i', 's', 't', 'S', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', 'e', 'r', '\022', 'J', '\n', +'\010', 'p', 'a', 't', 't', 'e', 'r', 'n', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '$', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', +'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'S', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', +'h', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', '\010', '\001', 'R', '\010', 'p', 'a', 't', 't', 'e', 'r', 'n', 's', ':', '+', +'\232', '\305', '\210', '\036', '&', '\n', '$', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', +'.', 'L', 'i', 's', 't', 'S', 't', 'r', 'i', 'n', 'g', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '<', '\n', '#', 'i', 'o', '.', +'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', +'c', 'h', 'e', 'r', '.', 'v', '3', 'B', '\013', 'S', 't', 'r', 'i', 'n', 'g', 'P', 'r', 'o', 't', 'o', 'P', '\001', '\272', '\200', '\310', +'\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; -static upb_def_init *deps[6] = { +static upb_def_init *deps[5] = { &envoy_type_matcher_v3_regex_proto_upbdefinit, - &envoy_annotations_deprecation_proto_upbdefinit, &udpa_annotations_status_proto_upbdefinit, &udpa_annotations_versioning_proto_upbdefinit, &validate_validate_proto_upbdefinit, @@ -68,5 +65,5 @@ upb_def_init envoy_type_matcher_v3_string_proto_upbdefinit = { deps, layouts, "envoy/type/matcher/v3/string.proto", - UPB_STRVIEW_INIT(descriptor, 775) + UPB_STRVIEW_INIT(descriptor, 738) }; diff --git a/grpc/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/struct.upbdefs.c b/grpc/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/struct.upbdefs.c new file mode 100644 index 00000000..6660ffad --- /dev/null +++ b/grpc/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/struct.upbdefs.c @@ -0,0 +1,63 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * envoy/type/matcher/v3/struct.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#include "upb/def.h" +#include "envoy/type/matcher/v3/struct.upbdefs.h" + +extern upb_def_init envoy_type_matcher_v3_value_proto_upbdefinit; +extern upb_def_init udpa_annotations_status_proto_upbdefinit; +extern upb_def_init udpa_annotations_versioning_proto_upbdefinit; +extern upb_def_init validate_validate_proto_upbdefinit; +extern const upb_msglayout envoy_type_matcher_v3_StructMatcher_msginit; +extern const upb_msglayout envoy_type_matcher_v3_StructMatcher_PathSegment_msginit; + +static const upb_msglayout *layouts[2] = { + &envoy_type_matcher_v3_StructMatcher_msginit, + &envoy_type_matcher_v3_StructMatcher_PathSegment_msginit, +}; + +static const char descriptor[576] = {'\n', '\"', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', 'c', 'h', 'e', 'r', '/', 'v', '3', '/', 's', +'t', 'r', 'u', 'c', 't', '.', 'p', 'r', 'o', 't', 'o', '\022', '\025', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', +'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '\032', '!', 'e', 'n', 'v', 'o', 'y', '/', 't', 'y', 'p', 'e', '/', 'm', 'a', 't', +'c', 'h', 'e', 'r', '/', 'v', '3', '/', 'v', 'a', 'l', 'u', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', '\035', 'u', 'd', 'p', 'a', +'/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', +'\032', '!', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 'v', 'e', 'r', 's', 'i', 'o', +'n', 'i', 'n', 'g', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', +'d', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '\276', '\002', '\n', '\r', 'S', 't', 'r', 'u', 'c', 't', 'M', 'a', 't', 'c', +'h', 'e', 'r', '\022', 'N', '\n', '\004', 'p', 'a', 't', 'h', '\030', '\002', ' ', '\003', '(', '\013', '2', '0', '.', 'e', 'n', 'v', 'o', 'y', +'.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'S', 't', 'r', 'u', 'c', 't', 'M', 'a', +'t', 'c', 'h', 'e', 'r', '.', 'P', 'a', 't', 'h', 'S', 'e', 'g', 'm', 'e', 'n', 't', 'B', '\010', '\372', 'B', '\005', '\222', '\001', '\002', +'\010', '\001', 'R', '\004', 'p', 'a', 't', 'h', '\022', 'C', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\003', ' ', '\001', '(', '\013', '2', '#', +'.', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', '.', 'V', 'a', +'l', 'u', 'e', 'M', 'a', 't', 'c', 'h', 'e', 'r', 'B', '\010', '\372', 'B', '\005', '\212', '\001', '\002', '\020', '\001', 'R', '\005', 'v', 'a', 'l', +'u', 'e', '\032', 'o', '\n', '\013', 'P', 'a', 't', 'h', 'S', 'e', 'g', 'm', 'e', 'n', 't', '\022', '\033', '\n', '\003', 'k', 'e', 'y', '\030', +'\001', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'H', '\000', 'R', '\003', 'k', 'e', 'y', ':', '3', '\232', '\305', +'\210', '\036', '.', '\n', ',', 'e', 'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'S', +'t', 'r', 'u', 'c', 't', 'M', 'a', 't', 'c', 'h', 'e', 'r', '.', 'P', 'a', 't', 'h', 'S', 'e', 'g', 'm', 'e', 'n', 't', 'B', +'\016', '\n', '\007', 's', 'e', 'g', 'm', 'e', 'n', 't', '\022', '\003', '\370', 'B', '\001', ':', '\'', '\232', '\305', '\210', '\036', '\"', '\n', ' ', 'e', +'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'S', 't', 'r', 'u', 'c', 't', 'M', +'a', 't', 'c', 'h', 'e', 'r', 'B', '<', '\n', '#', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'e', +'n', 'v', 'o', 'y', '.', 't', 'y', 'p', 'e', '.', 'm', 'a', 't', 'c', 'h', 'e', 'r', '.', 'v', '3', 'B', '\013', 'S', 't', 'r', +'u', 'c', 't', 'P', 'r', 'o', 't', 'o', 'P', '\001', '\272', '\200', '\310', '\321', '\006', '\002', '\020', '\002', 'b', '\006', 'p', 'r', 'o', 't', 'o', +'3', +}; + +static upb_def_init *deps[5] = { + &envoy_type_matcher_v3_value_proto_upbdefinit, + &udpa_annotations_status_proto_upbdefinit, + &udpa_annotations_versioning_proto_upbdefinit, + &validate_validate_proto_upbdefinit, + NULL +}; + +upb_def_init envoy_type_matcher_v3_struct_proto_upbdefinit = { + deps, + layouts, + "envoy/type/matcher/v3/struct.proto", + UPB_STRVIEW_INIT(descriptor, 576) +}; diff --git a/grpc/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/struct.upbdefs.h b/grpc/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/struct.upbdefs.h new file mode 100644 index 00000000..472d486a --- /dev/null +++ b/grpc/src/core/ext/upbdefs-generated/envoy/type/matcher/v3/struct.upbdefs.h @@ -0,0 +1,40 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * envoy/type/matcher/v3/struct.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#ifndef ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPBDEFS_H_ +#define ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPBDEFS_H_ + +#include "upb/def.h" +#include "upb/port_def.inc" +#ifdef __cplusplus +extern "C" { +#endif + +#include "upb/def.h" + +#include "upb/port_def.inc" + +extern upb_def_init envoy_type_matcher_v3_struct_proto_upbdefinit; + +UPB_INLINE const upb_msgdef *envoy_type_matcher_v3_StructMatcher_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_type_matcher_v3_struct_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.type.matcher.v3.StructMatcher"); +} + +UPB_INLINE const upb_msgdef *envoy_type_matcher_v3_StructMatcher_PathSegment_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &envoy_type_matcher_v3_struct_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "envoy.type.matcher.v3.StructMatcher.PathSegment"); +} + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#include "upb/port_undef.inc" + +#endif /* ENVOY_TYPE_MATCHER_V3_STRUCT_PROTO_UPBDEFS_H_ */ diff --git a/grpc/src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/syntax.upbdefs.c b/grpc/src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/syntax.upbdefs.c index d44ccca9..3ad38ed1 100644 --- a/grpc/src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/syntax.upbdefs.c +++ b/grpc/src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/syntax.upbdefs.c @@ -24,9 +24,10 @@ extern const upb_msglayout google_api_expr_v1alpha1_Expr_Comprehension_msginit; extern const upb_msglayout google_api_expr_v1alpha1_Constant_msginit; extern const upb_msglayout google_api_expr_v1alpha1_SourceInfo_msginit; extern const upb_msglayout google_api_expr_v1alpha1_SourceInfo_PositionsEntry_msginit; +extern const upb_msglayout google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry_msginit; extern const upb_msglayout google_api_expr_v1alpha1_SourcePosition_msginit; -static const upb_msglayout *layouts[13] = { +static const upb_msglayout *layouts[14] = { &google_api_expr_v1alpha1_ParsedExpr_msginit, &google_api_expr_v1alpha1_Expr_msginit, &google_api_expr_v1alpha1_Expr_Ident_msginit, @@ -39,10 +40,11 @@ static const upb_msglayout *layouts[13] = { &google_api_expr_v1alpha1_Constant_msginit, &google_api_expr_v1alpha1_SourceInfo_msginit, &google_api_expr_v1alpha1_SourceInfo_PositionsEntry_msginit, + &google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry_msginit, &google_api_expr_v1alpha1_SourcePosition_msginit, }; -static const char descriptor[2877] = {'\n', '%', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'a', 'p', 'i', '/', 'e', 'x', 'p', 'r', '/', 'v', '1', 'a', 'l', 'p', 'h', 'a', +static const char descriptor[3059] = {'\n', '%', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'a', 'p', 'i', '/', 'e', 'x', 'p', 'r', '/', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '/', 's', 'y', 'n', 't', 'a', 'x', '.', 'p', 'r', 'o', 't', 'o', '\022', '\030', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', 'o', '\032', '\034', 'g', @@ -137,7 +139,7 @@ static const char descriptor[2877] = {'\n', '%', 'g', 'o', 'o', 'g', 'l', 'e', ' 'm', 'p', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\t', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'T', 'i', 'm', 'e', 's', 't', 'a', 'm', 'p', 'B', '\002', '\030', '\001', 'H', '\000', 'R', '\016', 't', 'i', 'm', 'e', 's', 't', 'a', 'm', 'p', 'V', 'a', 'l', 'u', 'e', 'B', '\017', '\n', '\r', 'c', 'o', 'n', 's', 't', 'a', 'n', -'t', '_', 'k', 'i', 'n', 'd', '\"', '\203', '\002', '\n', '\n', 'S', 'o', 'u', 'r', 'c', 'e', 'I', 'n', 'f', 'o', '\022', '%', '\n', '\016', +'t', '_', 'k', 'i', 'n', 'd', '\"', '\271', '\003', '\n', '\n', 'S', 'o', 'u', 'r', 'c', 'e', 'I', 'n', 'f', 'o', '\022', '%', '\n', '\016', 's', 'y', 'n', 't', 'a', 'x', '_', 'v', 'e', 'r', 's', 'i', 'o', 'n', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\r', 's', 'y', 'n', 't', 'a', 'x', 'V', 'e', 'r', 's', 'i', 'o', 'n', '\022', '\032', '\n', '\010', 'l', 'o', 'c', 'a', 't', 'i', 'o', 'n', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\010', 'l', 'o', 'c', 'a', 't', 'i', 'o', 'n', '\022', '!', '\n', '\014', 'l', 'i', 'n', 'e', '_', 'o', 'f', 'f', @@ -145,19 +147,26 @@ static const char descriptor[2877] = {'\n', '%', 'g', 'o', 'o', 'g', 'l', 'e', ' '\n', '\t', 'p', 'o', 's', 'i', 't', 'i', 'o', 'n', 's', '\030', '\004', ' ', '\003', '(', '\013', '2', '3', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'S', 'o', 'u', 'r', 'c', 'e', 'I', 'n', 'f', 'o', '.', 'P', 'o', 's', 'i', 't', 'i', 'o', 'n', 's', 'E', 'n', 't', 'r', 'y', 'R', '\t', 'p', 'o', 's', -'i', 't', 'i', 'o', 'n', 's', '\032', '<', '\n', '\016', 'P', 'o', 's', 'i', 't', 'i', 'o', 'n', 's', 'E', 'n', 't', 'r', 'y', '\022', -'\020', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\003', 'R', '\003', 'k', 'e', 'y', '\022', '\024', '\n', '\005', 'v', 'a', 'l', 'u', -'e', '\030', '\002', ' ', '\001', '(', '\005', 'R', '\005', 'v', 'a', 'l', 'u', 'e', ':', '\002', '8', '\001', '\"', 'p', '\n', '\016', 'S', 'o', 'u', -'r', 'c', 'e', 'P', 'o', 's', 'i', 't', 'i', 'o', 'n', '\022', '\032', '\n', '\010', 'l', 'o', 'c', 'a', 't', 'i', 'o', 'n', '\030', '\001', -' ', '\001', '(', '\t', 'R', '\010', 'l', 'o', 'c', 'a', 't', 'i', 'o', 'n', '\022', '\026', '\n', '\006', 'o', 'f', 'f', 's', 'e', 't', '\030', -'\002', ' ', '\001', '(', '\005', 'R', '\006', 'o', 'f', 'f', 's', 'e', 't', '\022', '\022', '\n', '\004', 'l', 'i', 'n', 'e', '\030', '\003', ' ', '\001', -'(', '\005', 'R', '\004', 'l', 'i', 'n', 'e', '\022', '\026', '\n', '\006', 'c', 'o', 'l', 'u', 'm', 'n', '\030', '\004', ' ', '\001', '(', '\005', 'R', -'\006', 'c', 'o', 'l', 'u', 'm', 'n', 'B', 'n', '\n', '\034', 'c', 'o', 'm', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', -'.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', 'B', '\013', 'S', 'y', 'n', 't', 'a', 'x', 'P', 'r', 'o', -'t', 'o', 'P', '\001', 'Z', '<', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'g', 'o', 'l', 'a', 'n', 'g', '.', 'o', 'r', 'g', '/', 'g', -'e', 'n', 'p', 'r', 'o', 't', 'o', '/', 'g', 'o', 'o', 'g', 'l', 'e', 'a', 'p', 'i', 's', '/', 'a', 'p', 'i', '/', 'e', 'x', -'p', 'r', '/', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', ';', 'e', 'x', 'p', 'r', '\370', '\001', '\001', 'b', '\006', 'p', 'r', 'o', 't', -'o', '3', +'i', 't', 'i', 'o', 'n', 's', '\022', 'U', '\n', '\013', 'm', 'a', 'c', 'r', 'o', '_', 'c', 'a', 'l', 'l', 's', '\030', '\005', ' ', '\003', +'(', '\013', '2', '4', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', +'p', 'h', 'a', '1', '.', 'S', 'o', 'u', 'r', 'c', 'e', 'I', 'n', 'f', 'o', '.', 'M', 'a', 'c', 'r', 'o', 'C', 'a', 'l', 'l', +'s', 'E', 'n', 't', 'r', 'y', 'R', '\n', 'm', 'a', 'c', 'r', 'o', 'C', 'a', 'l', 'l', 's', '\032', '<', '\n', '\016', 'P', 'o', 's', +'i', 't', 'i', 'o', 'n', 's', 'E', 'n', 't', 'r', 'y', '\022', '\020', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\003', 'R', +'\003', 'k', 'e', 'y', '\022', '\024', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\005', 'R', '\005', 'v', 'a', 'l', 'u', +'e', ':', '\002', '8', '\001', '\032', ']', '\n', '\017', 'M', 'a', 'c', 'r', 'o', 'C', 'a', 'l', 'l', 's', 'E', 'n', 't', 'r', 'y', '\022', +'\020', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\003', 'R', '\003', 'k', 'e', 'y', '\022', '4', '\n', '\005', 'v', 'a', 'l', 'u', +'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '\036', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', +'.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', '.', 'E', 'x', 'p', 'r', 'R', '\005', 'v', 'a', 'l', 'u', 'e', ':', '\002', '8', '\001', +'\"', 'p', '\n', '\016', 'S', 'o', 'u', 'r', 'c', 'e', 'P', 'o', 's', 'i', 't', 'i', 'o', 'n', '\022', '\032', '\n', '\010', 'l', 'o', 'c', +'a', 't', 'i', 'o', 'n', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\010', 'l', 'o', 'c', 'a', 't', 'i', 'o', 'n', '\022', '\026', '\n', '\006', +'o', 'f', 'f', 's', 'e', 't', '\030', '\002', ' ', '\001', '(', '\005', 'R', '\006', 'o', 'f', 'f', 's', 'e', 't', '\022', '\022', '\n', '\004', 'l', +'i', 'n', 'e', '\030', '\003', ' ', '\001', '(', '\005', 'R', '\004', 'l', 'i', 'n', 'e', '\022', '\026', '\n', '\006', 'c', 'o', 'l', 'u', 'm', 'n', +'\030', '\004', ' ', '\001', '(', '\005', 'R', '\006', 'c', 'o', 'l', 'u', 'm', 'n', 'B', 'n', '\n', '\034', 'c', 'o', 'm', '.', 'g', 'o', 'o', +'g', 'l', 'e', '.', 'a', 'p', 'i', '.', 'e', 'x', 'p', 'r', '.', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', 'B', '\013', 'S', 'y', +'n', 't', 'a', 'x', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', '<', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'g', 'o', 'l', 'a', 'n', +'g', '.', 'o', 'r', 'g', '/', 'g', 'e', 'n', 'p', 'r', 'o', 't', 'o', '/', 'g', 'o', 'o', 'g', 'l', 'e', 'a', 'p', 'i', 's', +'/', 'a', 'p', 'i', '/', 'e', 'x', 'p', 'r', '/', 'v', '1', 'a', 'l', 'p', 'h', 'a', '1', ';', 'e', 'x', 'p', 'r', '\370', '\001', +'\001', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', }; static upb_def_init *deps[4] = { @@ -171,5 +180,5 @@ upb_def_init google_api_expr_v1alpha1_syntax_proto_upbdefinit = { deps, layouts, "google/api/expr/v1alpha1/syntax.proto", - UPB_STRVIEW_INIT(descriptor, 2877) + UPB_STRVIEW_INIT(descriptor, 3059) }; diff --git a/grpc/src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/syntax.upbdefs.h b/grpc/src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/syntax.upbdefs.h index f1dedba0..750f563f 100644 --- a/grpc/src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/syntax.upbdefs.h +++ b/grpc/src/core/ext/upbdefs-generated/google/api/expr/v1alpha1/syntax.upbdefs.h @@ -81,6 +81,11 @@ UPB_INLINE const upb_msgdef *google_api_expr_v1alpha1_SourceInfo_PositionsEntry_ return upb_symtab_lookupmsg(s, "google.api.expr.v1alpha1.SourceInfo.PositionsEntry"); } +UPB_INLINE const upb_msgdef *google_api_expr_v1alpha1_SourceInfo_MacroCallsEntry_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &google_api_expr_v1alpha1_syntax_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "google.api.expr.v1alpha1.SourceInfo.MacroCallsEntry"); +} + UPB_INLINE const upb_msgdef *google_api_expr_v1alpha1_SourcePosition_getmsgdef(upb_symtab *s) { _upb_symtab_loaddefinit(s, &google_api_expr_v1alpha1_syntax_proto_upbdefinit); return upb_symtab_lookupmsg(s, "google.api.expr.v1alpha1.SourcePosition"); diff --git a/grpc/src/core/ext/upbdefs-generated/src/proto/grpc/auth/v1/authz_policy.upbdefs.c b/grpc/src/core/ext/upbdefs-generated/src/proto/grpc/auth/v1/authz_policy.upbdefs.c new file mode 100644 index 00000000..7f317ae5 --- /dev/null +++ b/grpc/src/core/ext/upbdefs-generated/src/proto/grpc/auth/v1/authz_policy.upbdefs.c @@ -0,0 +1,58 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * src/proto/grpc/auth/v1/authz_policy.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#include "upb/def.h" +#include "src/proto/grpc/auth/v1/authz_policy.upbdefs.h" + +extern const upb_msglayout grpc_auth_v1_Peer_msginit; +extern const upb_msglayout grpc_auth_v1_Header_msginit; +extern const upb_msglayout grpc_auth_v1_Request_msginit; +extern const upb_msglayout grpc_auth_v1_Rule_msginit; +extern const upb_msglayout grpc_auth_v1_AuthorizationPolicy_msginit; + +static const upb_msglayout *layouts[5] = { + &grpc_auth_v1_Peer_msginit, + &grpc_auth_v1_Header_msginit, + &grpc_auth_v1_Request_msginit, + &grpc_auth_v1_Rule_msginit, + &grpc_auth_v1_AuthorizationPolicy_msginit, +}; + +static const char descriptor[507] = {'\n', ')', 's', 'r', 'c', '/', 'p', 'r', 'o', 't', 'o', '/', 'g', 'r', 'p', 'c', '/', 'a', 'u', 't', 'h', '/', 'v', '1', '/', +'a', 'u', 't', 'h', 'z', '_', 'p', 'o', 'l', 'i', 'c', 'y', '.', 'p', 'r', 'o', 't', 'o', '\022', '\014', 'g', 'r', 'p', 'c', '.', +'a', 'u', 't', 'h', '.', 'v', '1', '\"', '&', '\n', '\004', 'P', 'e', 'e', 'r', '\022', '\036', '\n', '\n', 'p', 'r', 'i', 'n', 'c', 'i', +'p', 'a', 'l', 's', '\030', '\001', ' ', '\003', '(', '\t', 'R', '\n', 'p', 'r', 'i', 'n', 'c', 'i', 'p', 'a', 'l', 's', '\"', '2', '\n', +'\006', 'H', 'e', 'a', 'd', 'e', 'r', '\022', '\020', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\003', 'k', 'e', 'y', +'\022', '\026', '\n', '\006', 'v', 'a', 'l', 'u', 'e', 's', '\030', '\002', ' ', '\003', '(', '\t', 'R', '\006', 'v', 'a', 'l', 'u', 'e', 's', '\"', +'O', '\n', '\007', 'R', 'e', 'q', 'u', 'e', 's', 't', '\022', '\024', '\n', '\005', 'p', 'a', 't', 'h', 's', '\030', '\001', ' ', '\003', '(', '\t', +'R', '\005', 'p', 'a', 't', 'h', 's', '\022', '.', '\n', '\007', 'h', 'e', 'a', 'd', 'e', 'r', 's', '\030', '\003', ' ', '\003', '(', '\013', '2', +'\024', '.', 'g', 'r', 'p', 'c', '.', 'a', 'u', 't', 'h', '.', 'v', '1', '.', 'H', 'e', 'a', 'd', 'e', 'r', 'R', '\007', 'h', 'e', +'a', 'd', 'e', 'r', 's', '\"', 'w', '\n', '\004', 'R', 'u', 'l', 'e', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', +'(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '*', '\n', '\006', 's', 'o', 'u', 'r', 'c', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', +'\022', '.', 'g', 'r', 'p', 'c', '.', 'a', 'u', 't', 'h', '.', 'v', '1', '.', 'P', 'e', 'e', 'r', 'R', '\006', 's', 'o', 'u', 'r', +'c', 'e', '\022', '/', '\n', '\007', 'r', 'e', 'q', 'u', 'e', 's', 't', '\030', '\003', ' ', '\001', '(', '\013', '2', '\025', '.', 'g', 'r', 'p', +'c', '.', 'a', 'u', 't', 'h', '.', 'v', '1', '.', 'R', 'e', 'q', 'u', 'e', 's', 't', 'R', '\007', 'r', 'e', 'q', 'u', 'e', 's', +'t', '\"', '\221', '\001', '\n', '\023', 'A', 'u', 't', 'h', 'o', 'r', 'i', 'z', 'a', 't', 'i', 'o', 'n', 'P', 'o', 'l', 'i', 'c', 'y', +'\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '1', '\n', '\n', 'd', +'e', 'n', 'y', '_', 'r', 'u', 'l', 'e', 's', '\030', '\002', ' ', '\003', '(', '\013', '2', '\022', '.', 'g', 'r', 'p', 'c', '.', 'a', 'u', +'t', 'h', '.', 'v', '1', '.', 'R', 'u', 'l', 'e', 'R', '\t', 'd', 'e', 'n', 'y', 'R', 'u', 'l', 'e', 's', '\022', '3', '\n', '\013', +'a', 'l', 'l', 'o', 'w', '_', 'r', 'u', 'l', 'e', 's', '\030', '\003', ' ', '\003', '(', '\013', '2', '\022', '.', 'g', 'r', 'p', 'c', '.', +'a', 'u', 't', 'h', '.', 'v', '1', '.', 'R', 'u', 'l', 'e', 'R', '\n', 'a', 'l', 'l', 'o', 'w', 'R', 'u', 'l', 'e', 's', 'b', +'\006', 'p', 'r', 'o', 't', 'o', '3', +}; + +static upb_def_init *deps[1] = { + NULL +}; + +upb_def_init src_proto_grpc_auth_v1_authz_policy_proto_upbdefinit = { + deps, + layouts, + "src/proto/grpc/auth/v1/authz_policy.proto", + UPB_STRVIEW_INIT(descriptor, 507) +}; diff --git a/grpc/src/core/ext/upbdefs-generated/src/proto/grpc/auth/v1/authz_policy.upbdefs.h b/grpc/src/core/ext/upbdefs-generated/src/proto/grpc/auth/v1/authz_policy.upbdefs.h new file mode 100644 index 00000000..c06fb251 --- /dev/null +++ b/grpc/src/core/ext/upbdefs-generated/src/proto/grpc/auth/v1/authz_policy.upbdefs.h @@ -0,0 +1,55 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * src/proto/grpc/auth/v1/authz_policy.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#ifndef SRC_PROTO_GRPC_AUTH_V1_AUTHZ_POLICY_PROTO_UPBDEFS_H_ +#define SRC_PROTO_GRPC_AUTH_V1_AUTHZ_POLICY_PROTO_UPBDEFS_H_ + +#include "upb/def.h" +#include "upb/port_def.inc" +#ifdef __cplusplus +extern "C" { +#endif + +#include "upb/def.h" + +#include "upb/port_def.inc" + +extern upb_def_init src_proto_grpc_auth_v1_authz_policy_proto_upbdefinit; + +UPB_INLINE const upb_msgdef *grpc_auth_v1_Peer_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &src_proto_grpc_auth_v1_authz_policy_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "grpc.auth.v1.Peer"); +} + +UPB_INLINE const upb_msgdef *grpc_auth_v1_Header_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &src_proto_grpc_auth_v1_authz_policy_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "grpc.auth.v1.Header"); +} + +UPB_INLINE const upb_msgdef *grpc_auth_v1_Request_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &src_proto_grpc_auth_v1_authz_policy_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "grpc.auth.v1.Request"); +} + +UPB_INLINE const upb_msgdef *grpc_auth_v1_Rule_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &src_proto_grpc_auth_v1_authz_policy_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "grpc.auth.v1.Rule"); +} + +UPB_INLINE const upb_msgdef *grpc_auth_v1_AuthorizationPolicy_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &src_proto_grpc_auth_v1_authz_policy_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "grpc.auth.v1.AuthorizationPolicy"); +} + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#include "upb/port_undef.inc" + +#endif /* SRC_PROTO_GRPC_AUTH_V1_AUTHZ_POLICY_PROTO_UPBDEFS_H_ */ diff --git a/grpc/src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.c b/grpc/src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.c deleted file mode 100644 index c6ce1dd1..00000000 --- a/grpc/src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.c +++ /dev/null @@ -1,42 +0,0 @@ -/* This file was generated by upbc (the upb compiler) from the input - * file: - * - * udpa/core/v1/authority.proto - * - * Do not edit -- your changes will be discarded when the file is - * regenerated. */ - -#include "upb/def.h" -#include "udpa/core/v1/authority.upbdefs.h" - -extern upb_def_init udpa_annotations_status_proto_upbdefinit; -extern upb_def_init validate_validate_proto_upbdefinit; -extern const upb_msglayout udpa_core_v1_Authority_msginit; - -static const upb_msglayout *layouts[1] = { - &udpa_core_v1_Authority_msginit, -}; - -static const char descriptor[208] = {'\n', '\034', 'u', 'd', 'p', 'a', '/', 'c', 'o', 'r', 'e', '/', 'v', '1', '/', 'a', 'u', 't', 'h', 'o', 'r', 'i', 't', 'y', '.', -'p', 'r', 'o', 't', 'o', '\022', '\014', 'u', 'd', 'p', 'a', '.', 'c', 'o', 'r', 'e', '.', 'v', '1', '\032', '\035', 'u', 'd', 'p', 'a', -'/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', -'\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', -'\"', '(', '\n', '\t', 'A', 'u', 't', 'h', 'o', 'r', 'i', 't', 'y', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', -'(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', 'm', 'e', 'B', '8', '\n', '\034', 'c', 'o', 'm', '.', -'g', 'i', 't', 'h', 'u', 'b', '.', 'u', 'd', 'p', 'a', '.', 'u', 'd', 'p', 'a', '.', 'c', 'o', 'r', 'e', '.', 'v', '1', 'B', -'\016', 'A', 'u', 't', 'h', 'o', 'r', 'i', 't', 'y', 'P', 'r', 'o', 't', 'o', 'P', '\001', '\272', '\200', '\310', '\321', '\006', '\002', '\010', '\001', -'b', '\006', 'p', 'r', 'o', 't', 'o', '3', -}; - -static upb_def_init *deps[3] = { - &udpa_annotations_status_proto_upbdefinit, - &validate_validate_proto_upbdefinit, - NULL -}; - -upb_def_init udpa_core_v1_authority_proto_upbdefinit = { - deps, - layouts, - "udpa/core/v1/authority.proto", - UPB_STRVIEW_INIT(descriptor, 208) -}; diff --git a/grpc/src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.h b/grpc/src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.h deleted file mode 100644 index 300938dd..00000000 --- a/grpc/src/core/ext/upbdefs-generated/udpa/core/v1/authority.upbdefs.h +++ /dev/null @@ -1,35 +0,0 @@ -/* This file was generated by upbc (the upb compiler) from the input - * file: - * - * udpa/core/v1/authority.proto - * - * Do not edit -- your changes will be discarded when the file is - * regenerated. */ - -#ifndef UDPA_CORE_V1_AUTHORITY_PROTO_UPBDEFS_H_ -#define UDPA_CORE_V1_AUTHORITY_PROTO_UPBDEFS_H_ - -#include "upb/def.h" -#include "upb/port_def.inc" -#ifdef __cplusplus -extern "C" { -#endif - -#include "upb/def.h" - -#include "upb/port_def.inc" - -extern upb_def_init udpa_core_v1_authority_proto_upbdefinit; - -UPB_INLINE const upb_msgdef *udpa_core_v1_Authority_getmsgdef(upb_symtab *s) { - _upb_symtab_loaddefinit(s, &udpa_core_v1_authority_proto_upbdefinit); - return upb_symtab_lookupmsg(s, "udpa.core.v1.Authority"); -} - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#include "upb/port_undef.inc" - -#endif /* UDPA_CORE_V1_AUTHORITY_PROTO_UPBDEFS_H_ */ diff --git a/grpc/src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.c b/grpc/src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.c deleted file mode 100644 index 3d07ae60..00000000 --- a/grpc/src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.c +++ /dev/null @@ -1,62 +0,0 @@ -/* This file was generated by upbc (the upb compiler) from the input - * file: - * - * udpa/core/v1/collection_entry.proto - * - * Do not edit -- your changes will be discarded when the file is - * regenerated. */ - -#include "upb/def.h" -#include "udpa/core/v1/collection_entry.upbdefs.h" - -extern upb_def_init google_protobuf_any_proto_upbdefinit; -extern upb_def_init udpa_annotations_status_proto_upbdefinit; -extern upb_def_init udpa_core_v1_resource_locator_proto_upbdefinit; -extern upb_def_init validate_validate_proto_upbdefinit; -extern const upb_msglayout udpa_core_v1_CollectionEntry_msginit; -extern const upb_msglayout udpa_core_v1_CollectionEntry_InlineEntry_msginit; - -static const upb_msglayout *layouts[2] = { - &udpa_core_v1_CollectionEntry_msginit, - &udpa_core_v1_CollectionEntry_InlineEntry_msginit, -}; - -static const char descriptor[571] = {'\n', '#', 'u', 'd', 'p', 'a', '/', 'c', 'o', 'r', 'e', '/', 'v', '1', '/', 'c', 'o', 'l', 'l', 'e', 'c', 't', 'i', 'o', 'n', -'_', 'e', 'n', 't', 'r', 'y', '.', 'p', 'r', 'o', 't', 'o', '\022', '\014', 'u', 'd', 'p', 'a', '.', 'c', 'o', 'r', 'e', '.', 'v', -'1', '\032', '\031', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'a', 'n', 'y', '.', 'p', 'r', -'o', 't', 'o', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', -'t', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '#', 'u', 'd', 'p', 'a', '/', 'c', 'o', 'r', 'e', '/', 'v', '1', '/', 'r', -'e', 's', 'o', 'u', 'r', 'c', 'e', '_', 'l', 'o', 'c', 'a', 't', 'o', 'r', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', -'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '\305', '\002', '\n', -'\017', 'C', 'o', 'l', 'l', 'e', 'c', 't', 'i', 'o', 'n', 'E', 'n', 't', 'r', 'y', '\022', '9', '\n', '\007', 'l', 'o', 'c', 'a', 't', -'o', 'r', '\030', '\001', ' ', '\001', '(', '\013', '2', '\035', '.', 'u', 'd', 'p', 'a', '.', 'c', 'o', 'r', 'e', '.', 'v', '1', '.', 'R', -'e', 's', 'o', 'u', 'r', 'c', 'e', 'L', 'o', 'c', 'a', 't', 'o', 'r', 'H', '\000', 'R', '\007', 'l', 'o', 'c', 'a', 't', 'o', 'r', -'\022', 'N', '\n', '\014', 'i', 'n', 'l', 'i', 'n', 'e', '_', 'e', 'n', 't', 'r', 'y', '\030', '\002', ' ', '\001', '(', '\013', '2', ')', '.', -'u', 'd', 'p', 'a', '.', 'c', 'o', 'r', 'e', '.', 'v', '1', '.', 'C', 'o', 'l', 'l', 'e', 'c', 't', 'i', 'o', 'n', 'E', 'n', -'t', 'r', 'y', '.', 'I', 'n', 'l', 'i', 'n', 'e', 'E', 'n', 't', 'r', 'y', 'H', '\000', 'R', '\013', 'i', 'n', 'l', 'i', 'n', 'e', -'E', 'n', 't', 'r', 'y', '\032', '\213', '\001', '\n', '\013', 'I', 'n', 'l', 'i', 'n', 'e', 'E', 'n', 't', 'r', 'y', '\022', '0', '\n', '\004', -'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\034', '\372', 'B', '\031', 'r', '\027', '2', '\025', '^', '[', '0', '-', '9', 'a', -'-', 'z', 'A', '-', 'Z', '_', '\\', '-', '\\', '.', '~', ':', ']', '+', '$', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '\030', '\n', '\007', -'v', 'e', 'r', 's', 'i', 'o', 'n', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\007', 'v', 'e', 'r', 's', 'i', 'o', 'n', '\022', '0', '\n', -'\010', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', '\030', '\003', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', -'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'R', '\010', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', 'B', '\031', '\n', -'\022', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', '\001', 'B', -'>', '\n', '\034', 'c', 'o', 'm', '.', 'g', 'i', 't', 'h', 'u', 'b', '.', 'u', 'd', 'p', 'a', '.', 'u', 'd', 'p', 'a', '.', 'c', -'o', 'r', 'e', '.', 'v', '1', 'B', '\024', 'C', 'o', 'l', 'l', 'e', 'c', 't', 'i', 'o', 'n', 'E', 'n', 't', 'r', 'y', 'P', 'r', -'o', 't', 'o', 'P', '\001', '\272', '\200', '\310', '\321', '\006', '\002', '\010', '\001', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', -}; - -static upb_def_init *deps[5] = { - &google_protobuf_any_proto_upbdefinit, - &udpa_annotations_status_proto_upbdefinit, - &udpa_core_v1_resource_locator_proto_upbdefinit, - &validate_validate_proto_upbdefinit, - NULL -}; - -upb_def_init udpa_core_v1_collection_entry_proto_upbdefinit = { - deps, - layouts, - "udpa/core/v1/collection_entry.proto", - UPB_STRVIEW_INIT(descriptor, 571) -}; diff --git a/grpc/src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.h b/grpc/src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.h deleted file mode 100644 index 7864b1f2..00000000 --- a/grpc/src/core/ext/upbdefs-generated/udpa/core/v1/collection_entry.upbdefs.h +++ /dev/null @@ -1,40 +0,0 @@ -/* This file was generated by upbc (the upb compiler) from the input - * file: - * - * udpa/core/v1/collection_entry.proto - * - * Do not edit -- your changes will be discarded when the file is - * regenerated. */ - -#ifndef UDPA_CORE_V1_COLLECTION_ENTRY_PROTO_UPBDEFS_H_ -#define UDPA_CORE_V1_COLLECTION_ENTRY_PROTO_UPBDEFS_H_ - -#include "upb/def.h" -#include "upb/port_def.inc" -#ifdef __cplusplus -extern "C" { -#endif - -#include "upb/def.h" - -#include "upb/port_def.inc" - -extern upb_def_init udpa_core_v1_collection_entry_proto_upbdefinit; - -UPB_INLINE const upb_msgdef *udpa_core_v1_CollectionEntry_getmsgdef(upb_symtab *s) { - _upb_symtab_loaddefinit(s, &udpa_core_v1_collection_entry_proto_upbdefinit); - return upb_symtab_lookupmsg(s, "udpa.core.v1.CollectionEntry"); -} - -UPB_INLINE const upb_msgdef *udpa_core_v1_CollectionEntry_InlineEntry_getmsgdef(upb_symtab *s) { - _upb_symtab_loaddefinit(s, &udpa_core_v1_collection_entry_proto_upbdefinit); - return upb_symtab_lookupmsg(s, "udpa.core.v1.CollectionEntry.InlineEntry"); -} - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#include "upb/port_undef.inc" - -#endif /* UDPA_CORE_V1_COLLECTION_ENTRY_PROTO_UPBDEFS_H_ */ diff --git a/grpc/src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.c b/grpc/src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.c deleted file mode 100644 index 4b6beaf0..00000000 --- a/grpc/src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.c +++ /dev/null @@ -1,45 +0,0 @@ -/* This file was generated by upbc (the upb compiler) from the input - * file: - * - * udpa/core/v1/context_params.proto - * - * Do not edit -- your changes will be discarded when the file is - * regenerated. */ - -#include "upb/def.h" -#include "udpa/core/v1/context_params.upbdefs.h" - -extern upb_def_init udpa_annotations_status_proto_upbdefinit; -extern const upb_msglayout udpa_core_v1_ContextParams_msginit; -extern const upb_msglayout udpa_core_v1_ContextParams_ParamsEntry_msginit; - -static const upb_msglayout *layouts[2] = { - &udpa_core_v1_ContextParams_msginit, - &udpa_core_v1_ContextParams_ParamsEntry_msginit, -}; - -static const char descriptor[292] = {'\n', '!', 'u', 'd', 'p', 'a', '/', 'c', 'o', 'r', 'e', '/', 'v', '1', '/', 'c', 'o', 'n', 't', 'e', 'x', 't', '_', 'p', 'a', -'r', 'a', 'm', 's', '.', 'p', 'r', 'o', 't', 'o', '\022', '\014', 'u', 'd', 'p', 'a', '.', 'c', 'o', 'r', 'e', '.', 'v', '1', '\032', -'\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', -'p', 'r', 'o', 't', 'o', '\"', '\213', '\001', '\n', '\r', 'C', 'o', 'n', 't', 'e', 'x', 't', 'P', 'a', 'r', 'a', 'm', 's', '\022', '?', -'\n', '\006', 'p', 'a', 'r', 'a', 'm', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '\'', '.', 'u', 'd', 'p', 'a', '.', 'c', 'o', 'r', -'e', '.', 'v', '1', '.', 'C', 'o', 'n', 't', 'e', 'x', 't', 'P', 'a', 'r', 'a', 'm', 's', '.', 'P', 'a', 'r', 'a', 'm', 's', -'E', 'n', 't', 'r', 'y', 'R', '\006', 'p', 'a', 'r', 'a', 'm', 's', '\032', '9', '\n', '\013', 'P', 'a', 'r', 'a', 'm', 's', 'E', 'n', -'t', 'r', 'y', '\022', '\020', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\003', 'k', 'e', 'y', '\022', '\024', '\n', '\005', -'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\005', 'v', 'a', 'l', 'u', 'e', ':', '\002', '8', '\001', 'B', '<', '\n', -'\034', 'c', 'o', 'm', '.', 'g', 'i', 't', 'h', 'u', 'b', '.', 'u', 'd', 'p', 'a', '.', 'u', 'd', 'p', 'a', '.', 'c', 'o', 'r', -'e', '.', 'v', '1', 'B', '\022', 'C', 'o', 'n', 't', 'e', 'x', 't', 'P', 'a', 'r', 'a', 'm', 's', 'P', 'r', 'o', 't', 'o', 'P', -'\001', '\272', '\200', '\310', '\321', '\006', '\002', '\010', '\001', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', -}; - -static upb_def_init *deps[2] = { - &udpa_annotations_status_proto_upbdefinit, - NULL -}; - -upb_def_init udpa_core_v1_context_params_proto_upbdefinit = { - deps, - layouts, - "udpa/core/v1/context_params.proto", - UPB_STRVIEW_INIT(descriptor, 292) -}; diff --git a/grpc/src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.h b/grpc/src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.h deleted file mode 100644 index 8c988cf3..00000000 --- a/grpc/src/core/ext/upbdefs-generated/udpa/core/v1/context_params.upbdefs.h +++ /dev/null @@ -1,40 +0,0 @@ -/* This file was generated by upbc (the upb compiler) from the input - * file: - * - * udpa/core/v1/context_params.proto - * - * Do not edit -- your changes will be discarded when the file is - * regenerated. */ - -#ifndef UDPA_CORE_V1_CONTEXT_PARAMS_PROTO_UPBDEFS_H_ -#define UDPA_CORE_V1_CONTEXT_PARAMS_PROTO_UPBDEFS_H_ - -#include "upb/def.h" -#include "upb/port_def.inc" -#ifdef __cplusplus -extern "C" { -#endif - -#include "upb/def.h" - -#include "upb/port_def.inc" - -extern upb_def_init udpa_core_v1_context_params_proto_upbdefinit; - -UPB_INLINE const upb_msgdef *udpa_core_v1_ContextParams_getmsgdef(upb_symtab *s) { - _upb_symtab_loaddefinit(s, &udpa_core_v1_context_params_proto_upbdefinit); - return upb_symtab_lookupmsg(s, "udpa.core.v1.ContextParams"); -} - -UPB_INLINE const upb_msgdef *udpa_core_v1_ContextParams_ParamsEntry_getmsgdef(upb_symtab *s) { - _upb_symtab_loaddefinit(s, &udpa_core_v1_context_params_proto_upbdefinit); - return upb_symtab_lookupmsg(s, "udpa.core.v1.ContextParams.ParamsEntry"); -} - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#include "upb/port_undef.inc" - -#endif /* UDPA_CORE_V1_CONTEXT_PARAMS_PROTO_UPBDEFS_H_ */ diff --git a/grpc/src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.c b/grpc/src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.c deleted file mode 100644 index 702f4c0a..00000000 --- a/grpc/src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.c +++ /dev/null @@ -1,49 +0,0 @@ -/* This file was generated by upbc (the upb compiler) from the input - * file: - * - * udpa/core/v1/resource.proto - * - * Do not edit -- your changes will be discarded when the file is - * regenerated. */ - -#include "upb/def.h" -#include "udpa/core/v1/resource.upbdefs.h" - -extern upb_def_init google_protobuf_any_proto_upbdefinit; -extern upb_def_init udpa_annotations_status_proto_upbdefinit; -extern upb_def_init udpa_core_v1_resource_name_proto_upbdefinit; -extern const upb_msglayout udpa_core_v1_Resource_msginit; - -static const upb_msglayout *layouts[1] = { - &udpa_core_v1_Resource_msginit, -}; - -static const char descriptor[337] = {'\n', '\033', 'u', 'd', 'p', 'a', '/', 'c', 'o', 'r', 'e', '/', 'v', '1', '/', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', '.', 'p', -'r', 'o', 't', 'o', '\022', '\014', 'u', 'd', 'p', 'a', '.', 'c', 'o', 'r', 'e', '.', 'v', '1', '\032', '\031', 'g', 'o', 'o', 'g', 'l', -'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'a', 'n', 'y', '.', 'p', 'r', 'o', 't', 'o', '\032', '\035', 'u', 'd', 'p', -'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', -'o', '\032', ' ', 'u', 'd', 'p', 'a', '/', 'c', 'o', 'r', 'e', '/', 'v', '1', '/', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', '_', -'n', 'a', 'm', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '\206', '\001', '\n', '\010', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', '\022', '.', -'\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '\032', '.', 'u', 'd', 'p', 'a', '.', 'c', 'o', 'r', 'e', '.', -'v', '1', '.', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', 'N', 'a', 'm', 'e', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '\030', '\n', '\007', -'v', 'e', 'r', 's', 'i', 'o', 'n', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\007', 'v', 'e', 'r', 's', 'i', 'o', 'n', '\022', '0', '\n', -'\010', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', '\030', '\003', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', -'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'R', '\010', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', 'B', '7', '\n', -'\034', 'c', 'o', 'm', '.', 'g', 'i', 't', 'h', 'u', 'b', '.', 'u', 'd', 'p', 'a', '.', 'u', 'd', 'p', 'a', '.', 'c', 'o', 'r', -'e', '.', 'v', '1', 'B', '\r', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', 'P', 'r', 'o', 't', 'o', 'P', '\001', '\272', '\200', '\310', '\321', -'\006', '\002', '\010', '\001', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', -}; - -static upb_def_init *deps[4] = { - &google_protobuf_any_proto_upbdefinit, - &udpa_annotations_status_proto_upbdefinit, - &udpa_core_v1_resource_name_proto_upbdefinit, - NULL -}; - -upb_def_init udpa_core_v1_resource_proto_upbdefinit = { - deps, - layouts, - "udpa/core/v1/resource.proto", - UPB_STRVIEW_INIT(descriptor, 337) -}; diff --git a/grpc/src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.h b/grpc/src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.h deleted file mode 100644 index de8cfc79..00000000 --- a/grpc/src/core/ext/upbdefs-generated/udpa/core/v1/resource.upbdefs.h +++ /dev/null @@ -1,35 +0,0 @@ -/* This file was generated by upbc (the upb compiler) from the input - * file: - * - * udpa/core/v1/resource.proto - * - * Do not edit -- your changes will be discarded when the file is - * regenerated. */ - -#ifndef UDPA_CORE_V1_RESOURCE_PROTO_UPBDEFS_H_ -#define UDPA_CORE_V1_RESOURCE_PROTO_UPBDEFS_H_ - -#include "upb/def.h" -#include "upb/port_def.inc" -#ifdef __cplusplus -extern "C" { -#endif - -#include "upb/def.h" - -#include "upb/port_def.inc" - -extern upb_def_init udpa_core_v1_resource_proto_upbdefinit; - -UPB_INLINE const upb_msgdef *udpa_core_v1_Resource_getmsgdef(upb_symtab *s) { - _upb_symtab_loaddefinit(s, &udpa_core_v1_resource_proto_upbdefinit); - return upb_symtab_lookupmsg(s, "udpa.core.v1.Resource"); -} - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#include "upb/port_undef.inc" - -#endif /* UDPA_CORE_V1_RESOURCE_PROTO_UPBDEFS_H_ */ diff --git a/grpc/src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.c b/grpc/src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.c deleted file mode 100644 index 80c11246..00000000 --- a/grpc/src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.c +++ /dev/null @@ -1,68 +0,0 @@ -/* This file was generated by upbc (the upb compiler) from the input - * file: - * - * udpa/core/v1/resource_locator.proto - * - * Do not edit -- your changes will be discarded when the file is - * regenerated. */ - -#include "upb/def.h" -#include "udpa/core/v1/resource_locator.upbdefs.h" - -extern upb_def_init udpa_annotations_status_proto_upbdefinit; -extern upb_def_init udpa_core_v1_context_params_proto_upbdefinit; -extern upb_def_init validate_validate_proto_upbdefinit; -extern const upb_msglayout udpa_core_v1_ResourceLocator_msginit; -extern const upb_msglayout udpa_core_v1_ResourceLocator_Directive_msginit; - -static const upb_msglayout *layouts[2] = { - &udpa_core_v1_ResourceLocator_msginit, - &udpa_core_v1_ResourceLocator_Directive_msginit, -}; - -static const char descriptor[756] = {'\n', '#', 'u', 'd', 'p', 'a', '/', 'c', 'o', 'r', 'e', '/', 'v', '1', '/', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', '_', 'l', -'o', 'c', 'a', 't', 'o', 'r', '.', 'p', 'r', 'o', 't', 'o', '\022', '\014', 'u', 'd', 'p', 'a', '.', 'c', 'o', 'r', 'e', '.', 'v', -'1', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', -'s', '.', 'p', 'r', 'o', 't', 'o', '\032', '!', 'u', 'd', 'p', 'a', '/', 'c', 'o', 'r', 'e', '/', 'v', '1', '/', 'c', 'o', 'n', -'t', 'e', 'x', 't', '_', 'p', 'a', 'r', 'a', 'm', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', -'t', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '\233', '\004', '\n', '\017', 'R', 'e', 's', -'o', 'u', 'r', 'c', 'e', 'L', 'o', 'c', 'a', 't', 'o', 'r', '\022', 'F', '\n', '\006', 's', 'c', 'h', 'e', 'm', 'e', '\030', '\001', ' ', -'\001', '(', '\016', '2', '$', '.', 'u', 'd', 'p', 'a', '.', 'c', 'o', 'r', 'e', '.', 'v', '1', '.', 'R', 'e', 's', 'o', 'u', 'r', -'c', 'e', 'L', 'o', 'c', 'a', 't', 'o', 'r', '.', 'S', 'c', 'h', 'e', 'm', 'e', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', -'\001', 'R', '\006', 's', 'c', 'h', 'e', 'm', 'e', '\022', '\030', '\n', '\002', 'i', 'd', '\030', '\002', ' ', '\003', '(', '\t', 'B', '\010', '\372', 'B', -'\005', '\222', '\001', '\002', '\010', '\001', 'R', '\002', 'i', 'd', '\022', '\034', '\n', '\t', 'a', 'u', 't', 'h', 'o', 'r', 'i', 't', 'y', '\030', '\003', -' ', '\001', '(', '\t', 'R', '\t', 'a', 'u', 't', 'h', 'o', 'r', 'i', 't', 'y', '\022', ',', '\n', '\r', 'r', 'e', 's', 'o', 'u', 'r', -'c', 'e', '_', 't', 'y', 'p', 'e', '\030', '\004', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\014', 'r', -'e', 's', 'o', 'u', 'r', 'c', 'e', 'T', 'y', 'p', 'e', '\022', 'B', '\n', '\r', 'e', 'x', 'a', 'c', 't', '_', 'c', 'o', 'n', 't', -'e', 'x', 't', '\030', '\005', ' ', '\001', '(', '\013', '2', '\033', '.', 'u', 'd', 'p', 'a', '.', 'c', 'o', 'r', 'e', '.', 'v', '1', '.', -'C', 'o', 'n', 't', 'e', 'x', 't', 'P', 'a', 'r', 'a', 'm', 's', 'H', '\000', 'R', '\014', 'e', 'x', 'a', 'c', 't', 'C', 'o', 'n', -'t', 'e', 'x', 't', '\022', 'G', '\n', '\n', 'd', 'i', 'r', 'e', 'c', 't', 'i', 'v', 'e', 's', '\030', '\006', ' ', '\003', '(', '\013', '2', -'\'', '.', 'u', 'd', 'p', 'a', '.', 'c', 'o', 'r', 'e', '.', 'v', '1', '.', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', 'L', 'o', -'c', 'a', 't', 'o', 'r', '.', 'D', 'i', 'r', 'e', 'c', 't', 'i', 'v', 'e', 'R', '\n', 'd', 'i', 'r', 'e', 'c', 't', 'i', 'v', -'e', 's', '\032', '\211', '\001', '\n', '\t', 'D', 'i', 'r', 'e', 'c', 't', 'i', 'v', 'e', '\022', '1', '\n', '\003', 'a', 'l', 't', '\030', '\001', -' ', '\001', '(', '\013', '2', '\035', '.', 'u', 'd', 'p', 'a', '.', 'c', 'o', 'r', 'e', '.', 'v', '1', '.', 'R', 'e', 's', 'o', 'u', -'r', 'c', 'e', 'L', 'o', 'c', 'a', 't', 'o', 'r', 'H', '\000', 'R', '\003', 'a', 'l', 't', '\022', '7', '\n', '\005', 'e', 'n', 't', 'r', -'y', '\030', '\002', ' ', '\001', '(', '\t', 'B', '\037', '\372', 'B', '\034', 'r', '\032', '\020', '\001', '2', '\026', '^', '[', '0', '-', '9', 'a', '-', -'z', 'A', '-', 'Z', '_', '\\', '-', '\\', '.', '/', '~', ':', ']', '+', '$', 'H', '\000', 'R', '\005', 'e', 'n', 't', 'r', 'y', 'B', -'\020', '\n', '\t', 'd', 'i', 'r', 'e', 'c', 't', 'i', 'v', 'e', '\022', '\003', '\370', 'B', '\001', '\"', '&', '\n', '\006', 'S', 'c', 'h', 'e', -'m', 'e', '\022', '\010', '\n', '\004', 'U', 'D', 'P', 'A', '\020', '\000', '\022', '\010', '\n', '\004', 'H', 'T', 'T', 'P', '\020', '\001', '\022', '\010', '\n', -'\004', 'F', 'I', 'L', 'E', '\020', '\002', 'B', '\031', '\n', '\027', 'c', 'o', 'n', 't', 'e', 'x', 't', '_', 'p', 'a', 'r', 'a', 'm', '_', -'s', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'B', '>', '\n', '\034', 'c', 'o', 'm', '.', 'g', 'i', 't', 'h', 'u', 'b', '.', 'u', -'d', 'p', 'a', '.', 'u', 'd', 'p', 'a', '.', 'c', 'o', 'r', 'e', '.', 'v', '1', 'B', '\024', 'R', 'e', 's', 'o', 'u', 'r', 'c', -'e', 'L', 'o', 'c', 'a', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 'P', '\001', '\272', '\200', '\310', '\321', '\006', '\002', '\010', '\001', 'b', '\006', -'p', 'r', 'o', 't', 'o', '3', -}; - -static upb_def_init *deps[4] = { - &udpa_annotations_status_proto_upbdefinit, - &udpa_core_v1_context_params_proto_upbdefinit, - &validate_validate_proto_upbdefinit, - NULL -}; - -upb_def_init udpa_core_v1_resource_locator_proto_upbdefinit = { - deps, - layouts, - "udpa/core/v1/resource_locator.proto", - UPB_STRVIEW_INIT(descriptor, 756) -}; diff --git a/grpc/src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.h b/grpc/src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.h deleted file mode 100644 index 439d10ae..00000000 --- a/grpc/src/core/ext/upbdefs-generated/udpa/core/v1/resource_locator.upbdefs.h +++ /dev/null @@ -1,40 +0,0 @@ -/* This file was generated by upbc (the upb compiler) from the input - * file: - * - * udpa/core/v1/resource_locator.proto - * - * Do not edit -- your changes will be discarded when the file is - * regenerated. */ - -#ifndef UDPA_CORE_V1_RESOURCE_LOCATOR_PROTO_UPBDEFS_H_ -#define UDPA_CORE_V1_RESOURCE_LOCATOR_PROTO_UPBDEFS_H_ - -#include "upb/def.h" -#include "upb/port_def.inc" -#ifdef __cplusplus -extern "C" { -#endif - -#include "upb/def.h" - -#include "upb/port_def.inc" - -extern upb_def_init udpa_core_v1_resource_locator_proto_upbdefinit; - -UPB_INLINE const upb_msgdef *udpa_core_v1_ResourceLocator_getmsgdef(upb_symtab *s) { - _upb_symtab_loaddefinit(s, &udpa_core_v1_resource_locator_proto_upbdefinit); - return upb_symtab_lookupmsg(s, "udpa.core.v1.ResourceLocator"); -} - -UPB_INLINE const upb_msgdef *udpa_core_v1_ResourceLocator_Directive_getmsgdef(upb_symtab *s) { - _upb_symtab_loaddefinit(s, &udpa_core_v1_resource_locator_proto_upbdefinit); - return upb_symtab_lookupmsg(s, "udpa.core.v1.ResourceLocator.Directive"); -} - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#include "upb/port_undef.inc" - -#endif /* UDPA_CORE_V1_RESOURCE_LOCATOR_PROTO_UPBDEFS_H_ */ diff --git a/grpc/src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.c b/grpc/src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.c deleted file mode 100644 index 6d80f98a..00000000 --- a/grpc/src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.c +++ /dev/null @@ -1,51 +0,0 @@ -/* This file was generated by upbc (the upb compiler) from the input - * file: - * - * udpa/core/v1/resource_name.proto - * - * Do not edit -- your changes will be discarded when the file is - * regenerated. */ - -#include "upb/def.h" -#include "udpa/core/v1/resource_name.upbdefs.h" - -extern upb_def_init udpa_annotations_status_proto_upbdefinit; -extern upb_def_init udpa_core_v1_context_params_proto_upbdefinit; -extern upb_def_init validate_validate_proto_upbdefinit; -extern const upb_msglayout udpa_core_v1_ResourceName_msginit; - -static const upb_msglayout *layouts[1] = { - &udpa_core_v1_ResourceName_msginit, -}; - -static const char descriptor[382] = {'\n', ' ', 'u', 'd', 'p', 'a', '/', 'c', 'o', 'r', 'e', '/', 'v', '1', '/', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', '_', 'n', -'a', 'm', 'e', '.', 'p', 'r', 'o', 't', 'o', '\022', '\014', 'u', 'd', 'p', 'a', '.', 'c', 'o', 'r', 'e', '.', 'v', '1', '\032', '\035', -'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', -'r', 'o', 't', 'o', '\032', '!', 'u', 'd', 'p', 'a', '/', 'c', 'o', 'r', 'e', '/', 'v', '1', '/', 'c', 'o', 'n', 't', 'e', 'x', -'t', '_', 'p', 'a', 'r', 'a', 'm', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', -'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '\253', '\001', '\n', '\014', 'R', 'e', 's', 'o', 'u', 'r', -'c', 'e', 'N', 'a', 'm', 'e', '\022', '\030', '\n', '\002', 'i', 'd', '\030', '\001', ' ', '\003', '(', '\t', 'B', '\010', '\372', 'B', '\005', '\222', '\001', -'\002', '\010', '\001', 'R', '\002', 'i', 'd', '\022', '\034', '\n', '\t', 'a', 'u', 't', 'h', 'o', 'r', 'i', 't', 'y', '\030', '\002', ' ', '\001', '(', -'\t', 'R', '\t', 'a', 'u', 't', 'h', 'o', 'r', 'i', 't', 'y', '\022', ',', '\n', '\r', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', '_', -'t', 'y', 'p', 'e', '\030', '\003', ' ', '\001', '(', '\t', 'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\014', 'r', 'e', 's', 'o', -'u', 'r', 'c', 'e', 'T', 'y', 'p', 'e', '\022', '5', '\n', '\007', 'c', 'o', 'n', 't', 'e', 'x', 't', '\030', '\004', ' ', '\001', '(', '\013', -'2', '\033', '.', 'u', 'd', 'p', 'a', '.', 'c', 'o', 'r', 'e', '.', 'v', '1', '.', 'C', 'o', 'n', 't', 'e', 'x', 't', 'P', 'a', -'r', 'a', 'm', 's', 'R', '\007', 'c', 'o', 'n', 't', 'e', 'x', 't', 'B', ';', '\n', '\034', 'c', 'o', 'm', '.', 'g', 'i', 't', 'h', -'u', 'b', '.', 'u', 'd', 'p', 'a', '.', 'u', 'd', 'p', 'a', '.', 'c', 'o', 'r', 'e', '.', 'v', '1', 'B', '\021', 'R', 'e', 's', -'o', 'u', 'r', 'c', 'e', 'N', 'a', 'm', 'e', 'P', 'r', 'o', 't', 'o', 'P', '\001', '\272', '\200', '\310', '\321', '\006', '\002', '\010', '\001', 'b', -'\006', 'p', 'r', 'o', 't', 'o', '3', -}; - -static upb_def_init *deps[4] = { - &udpa_annotations_status_proto_upbdefinit, - &udpa_core_v1_context_params_proto_upbdefinit, - &validate_validate_proto_upbdefinit, - NULL -}; - -upb_def_init udpa_core_v1_resource_name_proto_upbdefinit = { - deps, - layouts, - "udpa/core/v1/resource_name.proto", - UPB_STRVIEW_INIT(descriptor, 382) -}; diff --git a/grpc/src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.h b/grpc/src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.h deleted file mode 100644 index 6e0b5733..00000000 --- a/grpc/src/core/ext/upbdefs-generated/udpa/core/v1/resource_name.upbdefs.h +++ /dev/null @@ -1,35 +0,0 @@ -/* This file was generated by upbc (the upb compiler) from the input - * file: - * - * udpa/core/v1/resource_name.proto - * - * Do not edit -- your changes will be discarded when the file is - * regenerated. */ - -#ifndef UDPA_CORE_V1_RESOURCE_NAME_PROTO_UPBDEFS_H_ -#define UDPA_CORE_V1_RESOURCE_NAME_PROTO_UPBDEFS_H_ - -#include "upb/def.h" -#include "upb/port_def.inc" -#ifdef __cplusplus -extern "C" { -#endif - -#include "upb/def.h" - -#include "upb/port_def.inc" - -extern upb_def_init udpa_core_v1_resource_name_proto_upbdefinit; - -UPB_INLINE const upb_msgdef *udpa_core_v1_ResourceName_getmsgdef(upb_symtab *s) { - _upb_symtab_loaddefinit(s, &udpa_core_v1_resource_name_proto_upbdefinit); - return upb_symtab_lookupmsg(s, "udpa.core.v1.ResourceName"); -} - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#include "upb/port_undef.inc" - -#endif /* UDPA_CORE_V1_RESOURCE_NAME_PROTO_UPBDEFS_H_ */ diff --git a/grpc/src/core/ext/upbdefs-generated/udpa/type/v1/typed_struct.upbdefs.c b/grpc/src/core/ext/upbdefs-generated/udpa/type/v1/typed_struct.upbdefs.c new file mode 100644 index 00000000..f786bff3 --- /dev/null +++ b/grpc/src/core/ext/upbdefs-generated/udpa/type/v1/typed_struct.upbdefs.c @@ -0,0 +1,44 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * udpa/type/v1/typed_struct.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#include "upb/def.h" +#include "udpa/type/v1/typed_struct.upbdefs.h" + +extern upb_def_init validate_validate_proto_upbdefinit; +extern upb_def_init google_protobuf_struct_proto_upbdefinit; +extern const upb_msglayout udpa_type_v1_TypedStruct_msginit; + +static const upb_msglayout *layouts[1] = { + &udpa_type_v1_TypedStruct_msginit, +}; + +static const char descriptor[251] = {'\n', '\037', 'u', 'd', 'p', 'a', '/', 't', 'y', 'p', 'e', '/', 'v', '1', '/', 't', 'y', 'p', 'e', 'd', '_', 's', 't', 'r', 'u', +'c', 't', '.', 'p', 'r', 'o', 't', 'o', '\022', '\014', 'u', 'd', 'p', 'a', '.', 't', 'y', 'p', 'e', '.', 'v', '1', '\032', '\027', 'v', +'a', 'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', '\034', 'g', +'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 's', 't', 'r', 'u', 'c', 't', '.', 'p', 'r', 'o', +'t', 'o', '\"', 'W', '\n', '\013', 'T', 'y', 'p', 'e', 'd', 'S', 't', 'r', 'u', 'c', 't', '\022', '\031', '\n', '\010', 't', 'y', 'p', 'e', +'_', 'u', 'r', 'l', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\007', 't', 'y', 'p', 'e', 'U', 'r', 'l', '\022', '-', '\n', '\005', 'v', 'a', +'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '\027', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', +'u', 'f', '.', 'S', 't', 'r', 'u', 'c', 't', 'R', '\005', 'v', 'a', 'l', 'u', 'e', 'B', '2', '\n', '\034', 'c', 'o', 'm', '.', 'g', +'i', 't', 'h', 'u', 'b', '.', 'u', 'd', 'p', 'a', '.', 'u', 'd', 'p', 'a', '.', 't', 'y', 'p', 'e', '.', 'v', '1', 'B', '\020', +'T', 'y', 'p', 'e', 'd', 'S', 't', 'r', 'u', 'c', 't', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'b', '\006', 'p', 'r', 'o', 't', 'o', +'3', +}; + +static upb_def_init *deps[3] = { + &validate_validate_proto_upbdefinit, + &google_protobuf_struct_proto_upbdefinit, + NULL +}; + +upb_def_init udpa_type_v1_typed_struct_proto_upbdefinit = { + deps, + layouts, + "udpa/type/v1/typed_struct.proto", + UPB_STRVIEW_INIT(descriptor, 251) +}; diff --git a/grpc/src/core/ext/upbdefs-generated/udpa/type/v1/typed_struct.upbdefs.h b/grpc/src/core/ext/upbdefs-generated/udpa/type/v1/typed_struct.upbdefs.h new file mode 100644 index 00000000..d30baef2 --- /dev/null +++ b/grpc/src/core/ext/upbdefs-generated/udpa/type/v1/typed_struct.upbdefs.h @@ -0,0 +1,35 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * udpa/type/v1/typed_struct.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#ifndef UDPA_TYPE_V1_TYPED_STRUCT_PROTO_UPBDEFS_H_ +#define UDPA_TYPE_V1_TYPED_STRUCT_PROTO_UPBDEFS_H_ + +#include "upb/def.h" +#include "upb/port_def.inc" +#ifdef __cplusplus +extern "C" { +#endif + +#include "upb/def.h" + +#include "upb/port_def.inc" + +extern upb_def_init udpa_type_v1_typed_struct_proto_upbdefinit; + +UPB_INLINE const upb_msgdef *udpa_type_v1_TypedStruct_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &udpa_type_v1_typed_struct_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "udpa.type.v1.TypedStruct"); +} + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#include "upb/port_undef.inc" + +#endif /* UDPA_TYPE_V1_TYPED_STRUCT_PROTO_UPBDEFS_H_ */ diff --git a/grpc/src/core/ext/upbdefs-generated/validate/validate.upbdefs.c b/grpc/src/core/ext/upbdefs-generated/validate/validate.upbdefs.c index af02b2b9..dc751fa6 100644 --- a/grpc/src/core/ext/upbdefs-generated/validate/validate.upbdefs.c +++ b/grpc/src/core/ext/upbdefs-generated/validate/validate.upbdefs.c @@ -62,7 +62,7 @@ static const upb_msglayout *layouts[23] = { &validate_TimestampRules_msginit, }; -static const char descriptor[5699] = {'\n', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', +static const char descriptor[5759] = {'\n', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\022', '\010', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '\032', ' ', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', '.', 'p', 'r', 'o', 't', 'o', '\032', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'u', 'r', 'a', 't', 'i', 'o', 'n', '.', 'p', 'r', 'o', 't', @@ -281,15 +281,18 @@ static const char descriptor[5699] = {'\n', '\027', 'v', 'a', 'l', 'i', 'd', 'a' 'H', 'T', 'T', 'P', '_', 'H', 'E', 'A', 'D', 'E', 'R', '_', 'V', 'A', 'L', 'U', 'E', '\020', '\002', ':', '<', '\n', '\010', 'd', 'i', 's', 'a', 'b', 'l', 'e', 'd', '\022', '\037', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'M', 'e', 's', 's', 'a', 'g', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '\030', '\257', '\010', ' ', '\001', '(', '\010', 'R', '\010', 'd', 'i', -'s', 'a', 'b', 'l', 'e', 'd', ':', ':', '\n', '\010', 'r', 'e', 'q', 'u', 'i', 'r', 'e', 'd', '\022', '\035', '.', 'g', 'o', 'o', 'g', -'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'O', 'n', 'e', 'o', 'f', 'O', 'p', 't', 'i', 'o', 'n', 's', '\030', -'\257', '\010', ' ', '\001', '(', '\010', 'R', '\010', 'r', 'e', 'q', 'u', 'i', 'r', 'e', 'd', ':', 'J', '\n', '\005', 'r', 'u', 'l', 'e', 's', -'\022', '\035', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'O', -'p', 't', 'i', 'o', 'n', 's', '\030', '\257', '\010', ' ', '\001', '(', '\013', '2', '\024', '.', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', -'F', 'i', 'e', 'l', 'd', 'R', 'u', 'l', 'e', 's', 'R', '\005', 'r', 'u', 'l', 'e', 's', 'B', 'P', '\n', '\032', 'i', 'o', '.', 'e', -'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'p', 'g', 'v', '.', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', 'Z', '2', 'g', -'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '/', 'p', 'r', 'o', 't', -'o', 'c', '-', 'g', 'e', 'n', '-', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', +'s', 'a', 'b', 'l', 'e', 'd', ':', ':', '\n', '\007', 'i', 'g', 'n', 'o', 'r', 'e', 'd', '\022', '\037', '.', 'g', 'o', 'o', 'g', 'l', +'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'M', 'e', 's', 's', 'a', 'g', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', +'\030', '\260', '\010', ' ', '\001', '(', '\010', 'R', '\007', 'i', 'g', 'n', 'o', 'r', 'e', 'd', ':', ':', '\n', '\010', 'r', 'e', 'q', 'u', 'i', +'r', 'e', 'd', '\022', '\035', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'O', 'n', 'e', +'o', 'f', 'O', 'p', 't', 'i', 'o', 'n', 's', '\030', '\257', '\010', ' ', '\001', '(', '\010', 'R', '\010', 'r', 'e', 'q', 'u', 'i', 'r', 'e', +'d', ':', 'J', '\n', '\005', 'r', 'u', 'l', 'e', 's', '\022', '\035', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', +'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'O', 'p', 't', 'i', 'o', 'n', 's', '\030', '\257', '\010', ' ', '\001', '(', '\013', '2', '\024', +'.', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'F', 'i', 'e', 'l', 'd', 'R', 'u', 'l', 'e', 's', 'R', '\005', 'r', 'u', 'l', +'e', 's', 'B', 'P', '\n', '\032', 'i', 'o', '.', 'e', 'n', 'v', 'o', 'y', 'p', 'r', 'o', 'x', 'y', '.', 'p', 'g', 'v', '.', 'v', +'a', 'l', 'i', 'd', 'a', 't', 'e', 'Z', '2', 'g', 'i', 't', 'h', 'u', 'b', '.', 'c', 'o', 'm', '/', 'e', 'n', 'v', 'o', 'y', +'p', 'r', 'o', 'x', 'y', '/', 'p', 'r', 'o', 't', 'o', 'c', '-', 'g', 'e', 'n', '-', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', +'/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', }; static upb_def_init *deps[4] = { @@ -303,5 +306,5 @@ upb_def_init validate_validate_proto_upbdefinit = { deps, layouts, "validate/validate.proto", - UPB_STRVIEW_INIT(descriptor, 5699) + UPB_STRVIEW_INIT(descriptor, 5759) }; diff --git a/grpc/src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.c b/grpc/src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.c new file mode 100644 index 00000000..699ae7d9 --- /dev/null +++ b/grpc/src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.c @@ -0,0 +1,42 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * xds/core/v3/authority.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#include "upb/def.h" +#include "xds/core/v3/authority.upbdefs.h" + +extern upb_def_init udpa_annotations_status_proto_upbdefinit; +extern upb_def_init validate_validate_proto_upbdefinit; +extern const upb_msglayout xds_core_v3_Authority_msginit; + +static const upb_msglayout *layouts[1] = { + &xds_core_v3_Authority_msginit, +}; + +static const char descriptor[205] = {'\n', '\033', 'x', 'd', 's', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'a', 'u', 't', 'h', 'o', 'r', 'i', 't', 'y', '.', 'p', +'r', 'o', 't', 'o', '\022', '\013', 'x', 'd', 's', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', +'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', +'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '(', +'\n', '\t', 'A', 'u', 't', 'h', 'o', 'r', 'i', 't', 'y', '\022', '\033', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', +'B', '\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\004', 'n', 'a', 'm', 'e', 'B', '7', '\n', '\033', 'c', 'o', 'm', '.', 'g', 'i', +'t', 'h', 'u', 'b', '.', 'u', 'd', 'p', 'a', '.', 'x', 'd', 's', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', 'B', '\016', 'A', 'u', +'t', 'h', 'o', 'r', 'i', 't', 'y', 'P', 'r', 'o', 't', 'o', 'P', '\001', '\272', '\200', '\310', '\321', '\006', '\002', '\010', '\001', 'b', '\006', 'p', +'r', 'o', 't', 'o', '3', +}; + +static upb_def_init *deps[3] = { + &udpa_annotations_status_proto_upbdefinit, + &validate_validate_proto_upbdefinit, + NULL +}; + +upb_def_init xds_core_v3_authority_proto_upbdefinit = { + deps, + layouts, + "xds/core/v3/authority.proto", + UPB_STRVIEW_INIT(descriptor, 205) +}; diff --git a/grpc/src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.h b/grpc/src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.h new file mode 100644 index 00000000..191ee65b --- /dev/null +++ b/grpc/src/core/ext/upbdefs-generated/xds/core/v3/authority.upbdefs.h @@ -0,0 +1,35 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * xds/core/v3/authority.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#ifndef XDS_CORE_V3_AUTHORITY_PROTO_UPBDEFS_H_ +#define XDS_CORE_V3_AUTHORITY_PROTO_UPBDEFS_H_ + +#include "upb/def.h" +#include "upb/port_def.inc" +#ifdef __cplusplus +extern "C" { +#endif + +#include "upb/def.h" + +#include "upb/port_def.inc" + +extern upb_def_init xds_core_v3_authority_proto_upbdefinit; + +UPB_INLINE const upb_msgdef *xds_core_v3_Authority_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &xds_core_v3_authority_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "xds.core.v3.Authority"); +} + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#include "upb/port_undef.inc" + +#endif /* XDS_CORE_V3_AUTHORITY_PROTO_UPBDEFS_H_ */ diff --git a/grpc/src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.c b/grpc/src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.c new file mode 100644 index 00000000..93d0581f --- /dev/null +++ b/grpc/src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.c @@ -0,0 +1,62 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * xds/core/v3/collection_entry.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#include "upb/def.h" +#include "xds/core/v3/collection_entry.upbdefs.h" + +extern upb_def_init google_protobuf_any_proto_upbdefinit; +extern upb_def_init udpa_annotations_status_proto_upbdefinit; +extern upb_def_init xds_core_v3_resource_locator_proto_upbdefinit; +extern upb_def_init validate_validate_proto_upbdefinit; +extern const upb_msglayout xds_core_v3_CollectionEntry_msginit; +extern const upb_msglayout xds_core_v3_CollectionEntry_InlineEntry_msginit; + +static const upb_msglayout *layouts[2] = { + &xds_core_v3_CollectionEntry_msginit, + &xds_core_v3_CollectionEntry_InlineEntry_msginit, +}; + +static const char descriptor[565] = {'\n', '\"', 'x', 'd', 's', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'c', 'o', 'l', 'l', 'e', 'c', 't', 'i', 'o', 'n', '_', +'e', 'n', 't', 'r', 'y', '.', 'p', 'r', 'o', 't', 'o', '\022', '\013', 'x', 'd', 's', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '\032', +'\031', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'a', 'n', 'y', '.', 'p', 'r', 'o', 't', +'o', '\032', '\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', +'s', '.', 'p', 'r', 'o', 't', 'o', '\032', '\"', 'x', 'd', 's', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'r', 'e', 's', 'o', +'u', 'r', 'c', 'e', '_', 'l', 'o', 'c', 'a', 't', 'o', 'r', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', 'l', 'i', 'd', +'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '\303', '\002', '\n', '\017', 'C', 'o', +'l', 'l', 'e', 'c', 't', 'i', 'o', 'n', 'E', 'n', 't', 'r', 'y', '\022', '8', '\n', '\007', 'l', 'o', 'c', 'a', 't', 'o', 'r', '\030', +'\001', ' ', '\001', '(', '\013', '2', '\034', '.', 'x', 'd', 's', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'R', 'e', 's', 'o', 'u', +'r', 'c', 'e', 'L', 'o', 'c', 'a', 't', 'o', 'r', 'H', '\000', 'R', '\007', 'l', 'o', 'c', 'a', 't', 'o', 'r', '\022', 'M', '\n', '\014', +'i', 'n', 'l', 'i', 'n', 'e', '_', 'e', 'n', 't', 'r', 'y', '\030', '\002', ' ', '\001', '(', '\013', '2', '(', '.', 'x', 'd', 's', '.', +'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'C', 'o', 'l', 'l', 'e', 'c', 't', 'i', 'o', 'n', 'E', 'n', 't', 'r', 'y', '.', 'I', +'n', 'l', 'i', 'n', 'e', 'E', 'n', 't', 'r', 'y', 'H', '\000', 'R', '\013', 'i', 'n', 'l', 'i', 'n', 'e', 'E', 'n', 't', 'r', 'y', +'\032', '\213', '\001', '\n', '\013', 'I', 'n', 'l', 'i', 'n', 'e', 'E', 'n', 't', 'r', 'y', '\022', '0', '\n', '\004', 'n', 'a', 'm', 'e', '\030', +'\001', ' ', '\001', '(', '\t', 'B', '\034', '\372', 'B', '\031', 'r', '\027', '2', '\025', '^', '[', '0', '-', '9', 'a', '-', 'z', 'A', '-', 'Z', +'_', '\\', '-', '\\', '.', '~', ':', ']', '+', '$', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '\030', '\n', '\007', 'v', 'e', 'r', 's', 'i', +'o', 'n', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\007', 'v', 'e', 'r', 's', 'i', 'o', 'n', '\022', '0', '\n', '\010', 'r', 'e', 's', 'o', +'u', 'r', 'c', 'e', '\030', '\003', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', +'b', 'u', 'f', '.', 'A', 'n', 'y', 'R', '\010', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', 'B', '\031', '\n', '\022', 'r', 'e', 's', 'o', +'u', 'r', 'c', 'e', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', '\022', '\003', '\370', 'B', '\001', 'B', '=', '\n', '\033', 'c', 'o', +'m', '.', 'g', 'i', 't', 'h', 'u', 'b', '.', 'u', 'd', 'p', 'a', '.', 'x', 'd', 's', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', +'B', '\024', 'C', 'o', 'l', 'l', 'e', 'c', 't', 'i', 'o', 'n', 'E', 'n', 't', 'r', 'y', 'P', 'r', 'o', 't', 'o', 'P', '\001', '\272', +'\200', '\310', '\321', '\006', '\002', '\010', '\001', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +}; + +static upb_def_init *deps[5] = { + &google_protobuf_any_proto_upbdefinit, + &udpa_annotations_status_proto_upbdefinit, + &xds_core_v3_resource_locator_proto_upbdefinit, + &validate_validate_proto_upbdefinit, + NULL +}; + +upb_def_init xds_core_v3_collection_entry_proto_upbdefinit = { + deps, + layouts, + "xds/core/v3/collection_entry.proto", + UPB_STRVIEW_INIT(descriptor, 565) +}; diff --git a/grpc/src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.h b/grpc/src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.h new file mode 100644 index 00000000..3efc4531 --- /dev/null +++ b/grpc/src/core/ext/upbdefs-generated/xds/core/v3/collection_entry.upbdefs.h @@ -0,0 +1,40 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * xds/core/v3/collection_entry.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#ifndef XDS_CORE_V3_COLLECTION_ENTRY_PROTO_UPBDEFS_H_ +#define XDS_CORE_V3_COLLECTION_ENTRY_PROTO_UPBDEFS_H_ + +#include "upb/def.h" +#include "upb/port_def.inc" +#ifdef __cplusplus +extern "C" { +#endif + +#include "upb/def.h" + +#include "upb/port_def.inc" + +extern upb_def_init xds_core_v3_collection_entry_proto_upbdefinit; + +UPB_INLINE const upb_msgdef *xds_core_v3_CollectionEntry_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &xds_core_v3_collection_entry_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "xds.core.v3.CollectionEntry"); +} + +UPB_INLINE const upb_msgdef *xds_core_v3_CollectionEntry_InlineEntry_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &xds_core_v3_collection_entry_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "xds.core.v3.CollectionEntry.InlineEntry"); +} + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#include "upb/port_undef.inc" + +#endif /* XDS_CORE_V3_COLLECTION_ENTRY_PROTO_UPBDEFS_H_ */ diff --git a/grpc/src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.c b/grpc/src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.c new file mode 100644 index 00000000..0c6584b0 --- /dev/null +++ b/grpc/src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.c @@ -0,0 +1,45 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * xds/core/v3/context_params.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#include "upb/def.h" +#include "xds/core/v3/context_params.upbdefs.h" + +extern upb_def_init udpa_annotations_status_proto_upbdefinit; +extern const upb_msglayout xds_core_v3_ContextParams_msginit; +extern const upb_msglayout xds_core_v3_ContextParams_ParamsEntry_msginit; + +static const upb_msglayout *layouts[2] = { + &xds_core_v3_ContextParams_msginit, + &xds_core_v3_ContextParams_ParamsEntry_msginit, +}; + +static const char descriptor[288] = {'\n', ' ', 'x', 'd', 's', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'c', 'o', 'n', 't', 'e', 'x', 't', '_', 'p', 'a', 'r', +'a', 'm', 's', '.', 'p', 'r', 'o', 't', 'o', '\022', '\013', 'x', 'd', 's', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '\032', '\035', 'u', +'d', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', +'o', 't', 'o', '\"', '\212', '\001', '\n', '\r', 'C', 'o', 'n', 't', 'e', 'x', 't', 'P', 'a', 'r', 'a', 'm', 's', '\022', '>', '\n', '\006', +'p', 'a', 'r', 'a', 'm', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '&', '.', 'x', 'd', 's', '.', 'c', 'o', 'r', 'e', '.', 'v', +'3', '.', 'C', 'o', 'n', 't', 'e', 'x', 't', 'P', 'a', 'r', 'a', 'm', 's', '.', 'P', 'a', 'r', 'a', 'm', 's', 'E', 'n', 't', +'r', 'y', 'R', '\006', 'p', 'a', 'r', 'a', 'm', 's', '\032', '9', '\n', '\013', 'P', 'a', 'r', 'a', 'm', 's', 'E', 'n', 't', 'r', 'y', +'\022', '\020', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\003', 'k', 'e', 'y', '\022', '\024', '\n', '\005', 'v', 'a', 'l', +'u', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\005', 'v', 'a', 'l', 'u', 'e', ':', '\002', '8', '\001', 'B', ';', '\n', '\033', 'c', 'o', +'m', '.', 'g', 'i', 't', 'h', 'u', 'b', '.', 'u', 'd', 'p', 'a', '.', 'x', 'd', 's', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', +'B', '\022', 'C', 'o', 'n', 't', 'e', 'x', 't', 'P', 'a', 'r', 'a', 'm', 's', 'P', 'r', 'o', 't', 'o', 'P', '\001', '\272', '\200', '\310', +'\321', '\006', '\002', '\010', '\001', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +}; + +static upb_def_init *deps[2] = { + &udpa_annotations_status_proto_upbdefinit, + NULL +}; + +upb_def_init xds_core_v3_context_params_proto_upbdefinit = { + deps, + layouts, + "xds/core/v3/context_params.proto", + UPB_STRVIEW_INIT(descriptor, 288) +}; diff --git a/grpc/src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.h b/grpc/src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.h new file mode 100644 index 00000000..e52928d4 --- /dev/null +++ b/grpc/src/core/ext/upbdefs-generated/xds/core/v3/context_params.upbdefs.h @@ -0,0 +1,40 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * xds/core/v3/context_params.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#ifndef XDS_CORE_V3_CONTEXT_PARAMS_PROTO_UPBDEFS_H_ +#define XDS_CORE_V3_CONTEXT_PARAMS_PROTO_UPBDEFS_H_ + +#include "upb/def.h" +#include "upb/port_def.inc" +#ifdef __cplusplus +extern "C" { +#endif + +#include "upb/def.h" + +#include "upb/port_def.inc" + +extern upb_def_init xds_core_v3_context_params_proto_upbdefinit; + +UPB_INLINE const upb_msgdef *xds_core_v3_ContextParams_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &xds_core_v3_context_params_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "xds.core.v3.ContextParams"); +} + +UPB_INLINE const upb_msgdef *xds_core_v3_ContextParams_ParamsEntry_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &xds_core_v3_context_params_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "xds.core.v3.ContextParams.ParamsEntry"); +} + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#include "upb/port_undef.inc" + +#endif /* XDS_CORE_V3_CONTEXT_PARAMS_PROTO_UPBDEFS_H_ */ diff --git a/grpc/src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.c b/grpc/src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.c new file mode 100644 index 00000000..d299981d --- /dev/null +++ b/grpc/src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.c @@ -0,0 +1,49 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * xds/core/v3/resource.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#include "upb/def.h" +#include "xds/core/v3/resource.upbdefs.h" + +extern upb_def_init google_protobuf_any_proto_upbdefinit; +extern upb_def_init udpa_annotations_status_proto_upbdefinit; +extern upb_def_init xds_core_v3_resource_name_proto_upbdefinit; +extern const upb_msglayout xds_core_v3_Resource_msginit; + +static const upb_msglayout *layouts[1] = { + &xds_core_v3_Resource_msginit, +}; + +static const char descriptor[332] = {'\n', '\032', 'x', 'd', 's', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', '.', 'p', 'r', +'o', 't', 'o', '\022', '\013', 'x', 'd', 's', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '\032', '\031', 'g', 'o', 'o', 'g', 'l', 'e', '/', +'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'a', 'n', 'y', '.', 'p', 'r', 'o', 't', 'o', '\032', '\035', 'u', 'd', 'p', 'a', '/', +'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', +'\037', 'x', 'd', 's', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', '_', 'n', 'a', 'm', +'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '\205', '\001', '\n', '\010', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', '\022', '-', '\n', '\004', 'n', +'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\013', '2', '\031', '.', 'x', 'd', 's', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'R', +'e', 's', 'o', 'u', 'r', 'c', 'e', 'N', 'a', 'm', 'e', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '\030', '\n', '\007', 'v', 'e', 'r', 's', +'i', 'o', 'n', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\007', 'v', 'e', 'r', 's', 'i', 'o', 'n', '\022', '0', '\n', '\010', 'r', 'e', 's', +'o', 'u', 'r', 'c', 'e', '\030', '\003', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', +'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', 'R', '\010', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', 'B', '6', '\n', '\033', 'c', 'o', 'm', +'.', 'g', 'i', 't', 'h', 'u', 'b', '.', 'u', 'd', 'p', 'a', '.', 'x', 'd', 's', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', 'B', +'\r', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', 'P', 'r', 'o', 't', 'o', 'P', '\001', '\272', '\200', '\310', '\321', '\006', '\002', '\010', '\001', 'b', +'\006', 'p', 'r', 'o', 't', 'o', '3', +}; + +static upb_def_init *deps[4] = { + &google_protobuf_any_proto_upbdefinit, + &udpa_annotations_status_proto_upbdefinit, + &xds_core_v3_resource_name_proto_upbdefinit, + NULL +}; + +upb_def_init xds_core_v3_resource_proto_upbdefinit = { + deps, + layouts, + "xds/core/v3/resource.proto", + UPB_STRVIEW_INIT(descriptor, 332) +}; diff --git a/grpc/src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.h b/grpc/src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.h new file mode 100644 index 00000000..d508465e --- /dev/null +++ b/grpc/src/core/ext/upbdefs-generated/xds/core/v3/resource.upbdefs.h @@ -0,0 +1,35 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * xds/core/v3/resource.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#ifndef XDS_CORE_V3_RESOURCE_PROTO_UPBDEFS_H_ +#define XDS_CORE_V3_RESOURCE_PROTO_UPBDEFS_H_ + +#include "upb/def.h" +#include "upb/port_def.inc" +#ifdef __cplusplus +extern "C" { +#endif + +#include "upb/def.h" + +#include "upb/port_def.inc" + +extern upb_def_init xds_core_v3_resource_proto_upbdefinit; + +UPB_INLINE const upb_msgdef *xds_core_v3_Resource_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &xds_core_v3_resource_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "xds.core.v3.Resource"); +} + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#include "upb/port_undef.inc" + +#endif /* XDS_CORE_V3_RESOURCE_PROTO_UPBDEFS_H_ */ diff --git a/grpc/src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.c b/grpc/src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.c new file mode 100644 index 00000000..fefa5a28 --- /dev/null +++ b/grpc/src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.c @@ -0,0 +1,67 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * xds/core/v3/resource_locator.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#include "upb/def.h" +#include "xds/core/v3/resource_locator.upbdefs.h" + +extern upb_def_init udpa_annotations_status_proto_upbdefinit; +extern upb_def_init xds_core_v3_context_params_proto_upbdefinit; +extern upb_def_init validate_validate_proto_upbdefinit; +extern const upb_msglayout xds_core_v3_ResourceLocator_msginit; +extern const upb_msglayout xds_core_v3_ResourceLocator_Directive_msginit; + +static const upb_msglayout *layouts[2] = { + &xds_core_v3_ResourceLocator_msginit, + &xds_core_v3_ResourceLocator_Directive_msginit, +}; + +static const char descriptor[739] = {'\n', '\"', 'x', 'd', 's', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', '_', 'l', 'o', +'c', 'a', 't', 'o', 'r', '.', 'p', 'r', 'o', 't', 'o', '\022', '\013', 'x', 'd', 's', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '\032', +'\035', 'u', 'd', 'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', +'p', 'r', 'o', 't', 'o', '\032', ' ', 'x', 'd', 's', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'c', 'o', 'n', 't', 'e', 'x', +'t', '_', 'p', 'a', 'r', 'a', 'm', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', +'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '\216', '\004', '\n', '\017', 'R', 'e', 's', 'o', 'u', 'r', +'c', 'e', 'L', 'o', 'c', 'a', 't', 'o', 'r', '\022', 'E', '\n', '\006', 's', 'c', 'h', 'e', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\016', +'2', '#', '.', 'x', 'd', 's', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', 'L', 'o', +'c', 'a', 't', 'o', 'r', '.', 'S', 'c', 'h', 'e', 'm', 'e', 'B', '\010', '\372', 'B', '\005', '\202', '\001', '\002', '\020', '\001', 'R', '\006', 's', +'c', 'h', 'e', 'm', 'e', '\022', '\016', '\n', '\002', 'i', 'd', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\002', 'i', 'd', '\022', '\034', '\n', '\t', +'a', 'u', 't', 'h', 'o', 'r', 'i', 't', 'y', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\t', 'a', 'u', 't', 'h', 'o', 'r', 'i', 't', +'y', '\022', ',', '\n', '\r', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', '_', 't', 'y', 'p', 'e', '\030', '\004', ' ', '\001', '(', '\t', 'B', +'\007', '\372', 'B', '\004', 'r', '\002', '\020', '\001', 'R', '\014', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', 'T', 'y', 'p', 'e', '\022', 'A', '\n', +'\r', 'e', 'x', 'a', 'c', 't', '_', 'c', 'o', 'n', 't', 'e', 'x', 't', '\030', '\005', ' ', '\001', '(', '\013', '2', '\032', '.', 'x', 'd', +'s', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'C', 'o', 'n', 't', 'e', 'x', 't', 'P', 'a', 'r', 'a', 'm', 's', 'H', '\000', +'R', '\014', 'e', 'x', 'a', 'c', 't', 'C', 'o', 'n', 't', 'e', 'x', 't', '\022', 'F', '\n', '\n', 'd', 'i', 'r', 'e', 'c', 't', 'i', +'v', 'e', 's', '\030', '\006', ' ', '\003', '(', '\013', '2', '&', '.', 'x', 'd', 's', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '.', 'R', +'e', 's', 'o', 'u', 'r', 'c', 'e', 'L', 'o', 'c', 'a', 't', 'o', 'r', '.', 'D', 'i', 'r', 'e', 'c', 't', 'i', 'v', 'e', 'R', +'\n', 'd', 'i', 'r', 'e', 'c', 't', 'i', 'v', 'e', 's', '\032', '\210', '\001', '\n', '\t', 'D', 'i', 'r', 'e', 'c', 't', 'i', 'v', 'e', +'\022', '0', '\n', '\003', 'a', 'l', 't', '\030', '\001', ' ', '\001', '(', '\013', '2', '\034', '.', 'x', 'd', 's', '.', 'c', 'o', 'r', 'e', '.', +'v', '3', '.', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', 'L', 'o', 'c', 'a', 't', 'o', 'r', 'H', '\000', 'R', '\003', 'a', 'l', 't', +'\022', '7', '\n', '\005', 'e', 'n', 't', 'r', 'y', '\030', '\002', ' ', '\001', '(', '\t', 'B', '\037', '\372', 'B', '\034', 'r', '\032', '\020', '\001', '2', +'\026', '^', '[', '0', '-', '9', 'a', '-', 'z', 'A', '-', 'Z', '_', '\\', '-', '\\', '.', '/', '~', ':', ']', '+', '$', 'H', '\000', +'R', '\005', 'e', 'n', 't', 'r', 'y', 'B', '\020', '\n', '\t', 'd', 'i', 'r', 'e', 'c', 't', 'i', 'v', 'e', '\022', '\003', '\370', 'B', '\001', +'\"', '\'', '\n', '\006', 'S', 'c', 'h', 'e', 'm', 'e', '\022', '\t', '\n', '\005', 'X', 'D', 'S', 'T', 'P', '\020', '\000', '\022', '\010', '\n', '\004', +'H', 'T', 'T', 'P', '\020', '\001', '\022', '\010', '\n', '\004', 'F', 'I', 'L', 'E', '\020', '\002', 'B', '\031', '\n', '\027', 'c', 'o', 'n', 't', 'e', +'x', 't', '_', 'p', 'a', 'r', 'a', 'm', '_', 's', 'p', 'e', 'c', 'i', 'f', 'i', 'e', 'r', 'B', '=', '\n', '\033', 'c', 'o', 'm', +'.', 'g', 'i', 't', 'h', 'u', 'b', '.', 'u', 'd', 'p', 'a', '.', 'x', 'd', 's', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', 'B', +'\024', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', 'L', 'o', 'c', 'a', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 'P', '\001', '\272', '\200', +'\310', '\321', '\006', '\002', '\010', '\001', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +}; + +static upb_def_init *deps[4] = { + &udpa_annotations_status_proto_upbdefinit, + &xds_core_v3_context_params_proto_upbdefinit, + &validate_validate_proto_upbdefinit, + NULL +}; + +upb_def_init xds_core_v3_resource_locator_proto_upbdefinit = { + deps, + layouts, + "xds/core/v3/resource_locator.proto", + UPB_STRVIEW_INIT(descriptor, 739) +}; diff --git a/grpc/src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.h b/grpc/src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.h new file mode 100644 index 00000000..32e622a7 --- /dev/null +++ b/grpc/src/core/ext/upbdefs-generated/xds/core/v3/resource_locator.upbdefs.h @@ -0,0 +1,40 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * xds/core/v3/resource_locator.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#ifndef XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPBDEFS_H_ +#define XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPBDEFS_H_ + +#include "upb/def.h" +#include "upb/port_def.inc" +#ifdef __cplusplus +extern "C" { +#endif + +#include "upb/def.h" + +#include "upb/port_def.inc" + +extern upb_def_init xds_core_v3_resource_locator_proto_upbdefinit; + +UPB_INLINE const upb_msgdef *xds_core_v3_ResourceLocator_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &xds_core_v3_resource_locator_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "xds.core.v3.ResourceLocator"); +} + +UPB_INLINE const upb_msgdef *xds_core_v3_ResourceLocator_Directive_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &xds_core_v3_resource_locator_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "xds.core.v3.ResourceLocator.Directive"); +} + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#include "upb/port_undef.inc" + +#endif /* XDS_CORE_V3_RESOURCE_LOCATOR_PROTO_UPBDEFS_H_ */ diff --git a/grpc/src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.c b/grpc/src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.c new file mode 100644 index 00000000..7b27e3db --- /dev/null +++ b/grpc/src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.c @@ -0,0 +1,50 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * xds/core/v3/resource_name.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#include "upb/def.h" +#include "xds/core/v3/resource_name.upbdefs.h" + +extern upb_def_init udpa_annotations_status_proto_upbdefinit; +extern upb_def_init xds_core_v3_context_params_proto_upbdefinit; +extern upb_def_init validate_validate_proto_upbdefinit; +extern const upb_msglayout xds_core_v3_ResourceName_msginit; + +static const upb_msglayout *layouts[1] = { + &xds_core_v3_ResourceName_msginit, +}; + +static const char descriptor[367] = {'\n', '\037', 'x', 'd', 's', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', '_', 'n', 'a', +'m', 'e', '.', 'p', 'r', 'o', 't', 'o', '\022', '\013', 'x', 'd', 's', '.', 'c', 'o', 'r', 'e', '.', 'v', '3', '\032', '\035', 'u', 'd', +'p', 'a', '/', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 's', '/', 's', 't', 'a', 't', 'u', 's', '.', 'p', 'r', 'o', +'t', 'o', '\032', ' ', 'x', 'd', 's', '/', 'c', 'o', 'r', 'e', '/', 'v', '3', '/', 'c', 'o', 'n', 't', 'e', 'x', 't', '_', 'p', +'a', 'r', 'a', 'm', 's', '.', 'p', 'r', 'o', 't', 'o', '\032', '\027', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', +'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '\240', '\001', '\n', '\014', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', 'N', +'a', 'm', 'e', '\022', '\016', '\n', '\002', 'i', 'd', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\002', 'i', 'd', '\022', '\034', '\n', '\t', 'a', 'u', +'t', 'h', 'o', 'r', 'i', 't', 'y', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\t', 'a', 'u', 't', 'h', 'o', 'r', 'i', 't', 'y', '\022', +',', '\n', '\r', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', '_', 't', 'y', 'p', 'e', '\030', '\003', ' ', '\001', '(', '\t', 'B', '\007', '\372', +'B', '\004', 'r', '\002', '\020', '\001', 'R', '\014', 'r', 'e', 's', 'o', 'u', 'r', 'c', 'e', 'T', 'y', 'p', 'e', '\022', '4', '\n', '\007', 'c', +'o', 'n', 't', 'e', 'x', 't', '\030', '\004', ' ', '\001', '(', '\013', '2', '\032', '.', 'x', 'd', 's', '.', 'c', 'o', 'r', 'e', '.', 'v', +'3', '.', 'C', 'o', 'n', 't', 'e', 'x', 't', 'P', 'a', 'r', 'a', 'm', 's', 'R', '\007', 'c', 'o', 'n', 't', 'e', 'x', 't', 'B', +':', '\n', '\033', 'c', 'o', 'm', '.', 'g', 'i', 't', 'h', 'u', 'b', '.', 'u', 'd', 'p', 'a', '.', 'x', 'd', 's', '.', 'c', 'o', +'r', 'e', '.', 'v', '3', 'B', '\021', 'R', 'e', 's', 'o', 'u', 'r', 'c', 'e', 'N', 'a', 'm', 'e', 'P', 'r', 'o', 't', 'o', 'P', +'\001', '\272', '\200', '\310', '\321', '\006', '\002', '\010', '\001', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', +}; + +static upb_def_init *deps[4] = { + &udpa_annotations_status_proto_upbdefinit, + &xds_core_v3_context_params_proto_upbdefinit, + &validate_validate_proto_upbdefinit, + NULL +}; + +upb_def_init xds_core_v3_resource_name_proto_upbdefinit = { + deps, + layouts, + "xds/core/v3/resource_name.proto", + UPB_STRVIEW_INIT(descriptor, 367) +}; diff --git a/grpc/src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.h b/grpc/src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.h new file mode 100644 index 00000000..b52df056 --- /dev/null +++ b/grpc/src/core/ext/upbdefs-generated/xds/core/v3/resource_name.upbdefs.h @@ -0,0 +1,35 @@ +/* This file was generated by upbc (the upb compiler) from the input + * file: + * + * xds/core/v3/resource_name.proto + * + * Do not edit -- your changes will be discarded when the file is + * regenerated. */ + +#ifndef XDS_CORE_V3_RESOURCE_NAME_PROTO_UPBDEFS_H_ +#define XDS_CORE_V3_RESOURCE_NAME_PROTO_UPBDEFS_H_ + +#include "upb/def.h" +#include "upb/port_def.inc" +#ifdef __cplusplus +extern "C" { +#endif + +#include "upb/def.h" + +#include "upb/port_def.inc" + +extern upb_def_init xds_core_v3_resource_name_proto_upbdefinit; + +UPB_INLINE const upb_msgdef *xds_core_v3_ResourceName_getmsgdef(upb_symtab *s) { + _upb_symtab_loaddefinit(s, &xds_core_v3_resource_name_proto_upbdefinit); + return upb_symtab_lookupmsg(s, "xds.core.v3.ResourceName"); +} + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#include "upb/port_undef.inc" + +#endif /* XDS_CORE_V3_RESOURCE_NAME_PROTO_UPBDEFS_H_ */ diff --git a/grpc/src/core/ext/xds/certificate_provider_factory.h b/grpc/src/core/ext/xds/certificate_provider_factory.h index 84c219e6..e9bba790 100644 --- a/grpc/src/core/ext/xds/certificate_provider_factory.h +++ b/grpc/src/core/ext/xds/certificate_provider_factory.h @@ -49,7 +49,7 @@ class CertificateProviderFactory { virtual const char* name() const = 0; virtual RefCountedPtr<Config> CreateCertificateProviderConfig( - const Json& config_json, grpc_error** error) = 0; + const Json& config_json, grpc_error_handle* error) = 0; // Create a CertificateProvider instance from config. virtual RefCountedPtr<grpc_tls_certificate_provider> diff --git a/grpc/src/core/ext/xds/certificate_provider_store.h b/grpc/src/core/ext/xds/certificate_provider_store.h index 0954bc5e..fb6ca72d 100644 --- a/grpc/src/core/ext/xds/certificate_provider_store.h +++ b/grpc/src/core/ext/xds/certificate_provider_store.h @@ -92,7 +92,7 @@ class CertificateProviderStore }; RefCountedPtr<CertificateProviderWrapper> CreateCertificateProviderLocked( - absl::string_view key); + absl::string_view key) ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_); // Releases a previously created certificate provider from the certificate // provider map if the value matches \a wrapper. @@ -101,10 +101,10 @@ class CertificateProviderStore Mutex mu_; // Map of plugin configurations - PluginDefinitionMap plugin_config_map_; + PluginDefinitionMap plugin_config_map_ ABSL_GUARDED_BY(mu_); // Underlying map for the providers. std::map<absl::string_view, CertificateProviderWrapper*> - certificate_providers_map_; + certificate_providers_map_ ABSL_GUARDED_BY(mu_); }; } // namespace grpc_core diff --git a/grpc/src/core/ext/xds/file_watcher_certificate_provider_factory.cc b/grpc/src/core/ext/xds/file_watcher_certificate_provider_factory.cc index a5250eba..7a793b06 100644 --- a/grpc/src/core/ext/xds/file_watcher_certificate_provider_factory.cc +++ b/grpc/src/core/ext/xds/file_watcher_certificate_provider_factory.cc @@ -64,14 +64,14 @@ std::string FileWatcherCertificateProviderFactory::Config::ToString() const { RefCountedPtr<FileWatcherCertificateProviderFactory::Config> FileWatcherCertificateProviderFactory::Config::Parse(const Json& config_json, - grpc_error** error) { + grpc_error_handle* error) { auto config = MakeRefCounted<FileWatcherCertificateProviderFactory::Config>(); if (config_json.type() != Json::Type::OBJECT) { *error = GRPC_ERROR_CREATE_FROM_STATIC_STRING( "error:config type should be OBJECT."); return nullptr; } - std::vector<grpc_error*> error_list; + std::vector<grpc_error_handle> error_list; ParseJsonObjectField(config_json.object_value(), "certificate_file", &config->identity_cert_file_, &error_list, false); ParseJsonObjectField(config_json.object_value(), "private_key_file", @@ -112,7 +112,7 @@ const char* FileWatcherCertificateProviderFactory::name() const { RefCountedPtr<CertificateProviderFactory::Config> FileWatcherCertificateProviderFactory::CreateCertificateProviderConfig( - const Json& config_json, grpc_error** error) { + const Json& config_json, grpc_error_handle* error) { return FileWatcherCertificateProviderFactory::Config::Parse(config_json, error); } diff --git a/grpc/src/core/ext/xds/file_watcher_certificate_provider_factory.h b/grpc/src/core/ext/xds/file_watcher_certificate_provider_factory.h index c5700625..13e10deb 100644 --- a/grpc/src/core/ext/xds/file_watcher_certificate_provider_factory.h +++ b/grpc/src/core/ext/xds/file_watcher_certificate_provider_factory.h @@ -31,7 +31,7 @@ class FileWatcherCertificateProviderFactory class Config : public CertificateProviderFactory::Config { public: static RefCountedPtr<Config> Parse(const Json& config_json, - grpc_error** error); + grpc_error_handle* error); const char* name() const override; @@ -58,7 +58,7 @@ class FileWatcherCertificateProviderFactory RefCountedPtr<CertificateProviderFactory::Config> CreateCertificateProviderConfig(const Json& config_json, - grpc_error** error) override; + grpc_error_handle* error) override; RefCountedPtr<grpc_tls_certificate_provider> CreateCertificateProvider( RefCountedPtr<CertificateProviderFactory::Config> config) override; diff --git a/grpc/src/core/ext/xds/google_mesh_ca_certificate_provider_factory.cc b/grpc/src/core/ext/xds/google_mesh_ca_certificate_provider_factory.cc index c1b7b84a..6e63ae4e 100644 --- a/grpc/src/core/ext/xds/google_mesh_ca_certificate_provider_factory.cc +++ b/grpc/src/core/ext/xds/google_mesh_ca_certificate_provider_factory.cc @@ -52,10 +52,10 @@ std::string GoogleMeshCaCertificateProviderFactory::Config::ToString() const { return "{}"; } -std::vector<grpc_error*> +std::vector<grpc_error_handle> GoogleMeshCaCertificateProviderFactory::Config::ParseJsonObjectStsService( const Json::Object& sts_service) { - std::vector<grpc_error*> error_list_sts_service; + std::vector<grpc_error_handle> error_list_sts_service; if (!ParseJsonObjectField(sts_service, "token_exchange_service_uri", &sts_config_.token_exchange_service_uri, &error_list_sts_service, false)) { @@ -89,14 +89,14 @@ GoogleMeshCaCertificateProviderFactory::Config::ParseJsonObjectStsService( return error_list_sts_service; } -std::vector<grpc_error*> +std::vector<grpc_error_handle> GoogleMeshCaCertificateProviderFactory::Config::ParseJsonObjectCallCredentials( const Json::Object& call_credentials) { - std::vector<grpc_error*> error_list_call_credentials; + std::vector<grpc_error_handle> error_list_call_credentials; const Json::Object* sts_service = nullptr; if (ParseJsonObjectField(call_credentials, "sts_service", &sts_service, &error_list_call_credentials)) { - std::vector<grpc_error*> error_list_sts_service = + std::vector<grpc_error_handle> error_list_sts_service = ParseJsonObjectStsService(*sts_service); if (!error_list_sts_service.empty()) { error_list_call_credentials.push_back(GRPC_ERROR_CREATE_FROM_VECTOR( @@ -106,10 +106,10 @@ GoogleMeshCaCertificateProviderFactory::Config::ParseJsonObjectCallCredentials( return error_list_call_credentials; } -std::vector<grpc_error*> +std::vector<grpc_error_handle> GoogleMeshCaCertificateProviderFactory::Config::ParseJsonObjectGoogleGrpc( const Json::Object& google_grpc) { - std::vector<grpc_error*> error_list_google_grpc; + std::vector<grpc_error_handle> error_list_google_grpc; if (!ParseJsonObjectField(google_grpc, "target_uri", &endpoint_, &error_list_google_grpc, false)) { endpoint_ = "meshca.googleapis.com"; // Default target @@ -124,7 +124,7 @@ GoogleMeshCaCertificateProviderFactory::Config::ParseJsonObjectGoogleGrpc( const Json::Object* call_credentials = nullptr; if (ExtractJsonType((*call_credentials_array)[0], "call_credentials[0]", &call_credentials, &error_list_google_grpc)) { - std::vector<grpc_error*> error_list_call_credentials = + std::vector<grpc_error_handle> error_list_call_credentials = ParseJsonObjectCallCredentials(*call_credentials); if (!error_list_call_credentials.empty()) { error_list_google_grpc.push_back(GRPC_ERROR_CREATE_FROM_VECTOR( @@ -137,14 +137,14 @@ GoogleMeshCaCertificateProviderFactory::Config::ParseJsonObjectGoogleGrpc( return error_list_google_grpc; } -std::vector<grpc_error*> +std::vector<grpc_error_handle> GoogleMeshCaCertificateProviderFactory::Config::ParseJsonObjectGrpcServices( const Json::Object& grpc_service) { - std::vector<grpc_error*> error_list_grpc_services; + std::vector<grpc_error_handle> error_list_grpc_services; const Json::Object* google_grpc = nullptr; if (ParseJsonObjectField(grpc_service, "google_grpc", &google_grpc, &error_list_grpc_services)) { - std::vector<grpc_error*> error_list_google_grpc = + std::vector<grpc_error_handle> error_list_google_grpc = ParseJsonObjectGoogleGrpc(*google_grpc); if (!error_list_google_grpc.empty()) { error_list_grpc_services.push_back(GRPC_ERROR_CREATE_FROM_VECTOR( @@ -158,10 +158,10 @@ GoogleMeshCaCertificateProviderFactory::Config::ParseJsonObjectGrpcServices( return error_list_grpc_services; } -std::vector<grpc_error*> +std::vector<grpc_error_handle> GoogleMeshCaCertificateProviderFactory::Config::ParseJsonObjectServer( const Json::Object& server) { - std::vector<grpc_error*> error_list_server; + std::vector<grpc_error_handle> error_list_server; std::string api_type; if (ParseJsonObjectField(server, "api_type", &api_type, &error_list_server, false)) { @@ -180,7 +180,7 @@ GoogleMeshCaCertificateProviderFactory::Config::ParseJsonObjectServer( const Json::Object* grpc_service = nullptr; if (ExtractJsonType((*grpc_services)[0], "grpc_services[0]", &grpc_service, &error_list_server)) { - std::vector<grpc_error*> error_list_grpc_services = + std::vector<grpc_error_handle> error_list_grpc_services = ParseJsonObjectGrpcServices(*grpc_service); if (!error_list_grpc_services.empty()) { error_list_server.push_back(GRPC_ERROR_CREATE_FROM_VECTOR( @@ -193,8 +193,8 @@ GoogleMeshCaCertificateProviderFactory::Config::ParseJsonObjectServer( } RefCountedPtr<GoogleMeshCaCertificateProviderFactory::Config> -GoogleMeshCaCertificateProviderFactory::Config::Parse(const Json& config_json, - grpc_error** error) { +GoogleMeshCaCertificateProviderFactory::Config::Parse( + const Json& config_json, grpc_error_handle* error) { auto config = MakeRefCounted<GoogleMeshCaCertificateProviderFactory::Config>(); if (config_json.type() != Json::Type::OBJECT) { @@ -202,11 +202,11 @@ GoogleMeshCaCertificateProviderFactory::Config::Parse(const Json& config_json, "error:config type should be OBJECT."); return nullptr; } - std::vector<grpc_error*> error_list; + std::vector<grpc_error_handle> error_list; const Json::Object* server = nullptr; if (ParseJsonObjectField(config_json.object_value(), "server", &server, &error_list)) { - std::vector<grpc_error*> error_list_server = + std::vector<grpc_error_handle> error_list_server = config->ParseJsonObjectServer(*server); if (!error_list_server.empty()) { error_list.push_back( @@ -257,7 +257,7 @@ const char* GoogleMeshCaCertificateProviderFactory::name() const { RefCountedPtr<CertificateProviderFactory::Config> GoogleMeshCaCertificateProviderFactory::CreateCertificateProviderConfig( - const Json& config_json, grpc_error** error) { + const Json& config_json, grpc_error_handle* error) { return GoogleMeshCaCertificateProviderFactory::Config::Parse(config_json, error); } diff --git a/grpc/src/core/ext/xds/google_mesh_ca_certificate_provider_factory.h b/grpc/src/core/ext/xds/google_mesh_ca_certificate_provider_factory.h index f2765d6d..7a33f977 100644 --- a/grpc/src/core/ext/xds/google_mesh_ca_certificate_provider_factory.h +++ b/grpc/src/core/ext/xds/google_mesh_ca_certificate_provider_factory.h @@ -63,19 +63,20 @@ class GoogleMeshCaCertificateProviderFactory const std::string& location() const { return location_; } static RefCountedPtr<Config> Parse(const Json& config_json, - grpc_error** error); + grpc_error_handle* error); private: // Helpers for parsing the config - std::vector<grpc_error*> ParseJsonObjectStsService( + std::vector<grpc_error_handle> ParseJsonObjectStsService( const Json::Object& sts_service); - std::vector<grpc_error*> ParseJsonObjectCallCredentials( + std::vector<grpc_error_handle> ParseJsonObjectCallCredentials( const Json::Object& call_credentials); - std::vector<grpc_error*> ParseJsonObjectGoogleGrpc( + std::vector<grpc_error_handle> ParseJsonObjectGoogleGrpc( const Json::Object& google_grpc); - std::vector<grpc_error*> ParseJsonObjectGrpcServices( + std::vector<grpc_error_handle> ParseJsonObjectGrpcServices( const Json::Object& grpc_service); - std::vector<grpc_error*> ParseJsonObjectServer(const Json::Object& server); + std::vector<grpc_error_handle> ParseJsonObjectServer( + const Json::Object& server); std::string endpoint_; StsConfig sts_config_; @@ -90,10 +91,10 @@ class GoogleMeshCaCertificateProviderFactory RefCountedPtr<CertificateProviderFactory::Config> CreateCertificateProviderConfig(const Json& config_json, - grpc_error** error) override; + grpc_error_handle* error) override; RefCountedPtr<grpc_tls_certificate_provider> CreateCertificateProvider( - RefCountedPtr<CertificateProviderFactory::Config> config) override { + RefCountedPtr<CertificateProviderFactory::Config> /*config*/) override { // TODO(yashykt) : To be implemented return nullptr; } diff --git a/grpc/src/core/ext/xds/xds_api.cc b/grpc/src/core/ext/xds/xds_api.cc index e9403c2c..e51bc07c 100644 --- a/grpc/src/core/ext/xds/xds_api.cc +++ b/grpc/src/core/ext/xds/xds_api.cc @@ -28,26 +28,13 @@ #include "absl/strings/str_format.h" #include "absl/strings/str_join.h" #include "absl/strings/str_split.h" - -#include "upb/upb.hpp" - -#include <grpc/impl/codegen/log.h> -#include <grpc/support/alloc.h> -#include <grpc/support/string_util.h> - -#include "src/core/ext/xds/xds_api.h" -#include "src/core/lib/gpr/env.h" -#include "src/core/lib/gpr/string.h" -#include "src/core/lib/gpr/useful.h" -#include "src/core/lib/iomgr/error.h" -#include "src/core/lib/iomgr/sockaddr_utils.h" -#include "src/core/lib/slice/slice_utils.h" - +#include "envoy/admin/v3/config_dump.upb.h" #include "envoy/config/cluster/v3/circuit_breaker.upb.h" #include "envoy/config/cluster/v3/cluster.upb.h" #include "envoy/config/cluster/v3/cluster.upbdefs.h" #include "envoy/config/core/v3/address.upb.h" #include "envoy/config/core/v3/base.upb.h" +#include "envoy/config/core/v3/base.upbdefs.h" #include "envoy/config/core/v3/config_source.upb.h" #include "envoy/config/core/v3/health_check.upb.h" #include "envoy/config/core/v3/protocol.upb.h" @@ -57,12 +44,19 @@ #include "envoy/config/endpoint/v3/load_report.upb.h" #include "envoy/config/listener/v3/api_listener.upb.h" #include "envoy/config/listener/v3/listener.upb.h" +#include "envoy/config/listener/v3/listener.upbdefs.h" +#include "envoy/config/listener/v3/listener_components.upb.h" #include "envoy/config/route/v3/route.upb.h" #include "envoy/config/route/v3/route.upbdefs.h" #include "envoy/config/route/v3/route_components.upb.h" +#include "envoy/config/route/v3/route_components.upbdefs.h" +#include "envoy/extensions/clusters/aggregate/v3/cluster.upb.h" +#include "envoy/extensions/clusters/aggregate/v3/cluster.upbdefs.h" #include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h" +#include "envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upbdefs.h" #include "envoy/extensions/transport_sockets/tls/v3/common.upb.h" #include "envoy/extensions/transport_sockets/tls/v3/tls.upb.h" +#include "envoy/extensions/transport_sockets/tls/v3/tls.upbdefs.h" #include "envoy/service/cluster/v3/cds.upb.h" #include "envoy/service/cluster/v3/cds.upbdefs.h" #include "envoy/service/discovery/v3/discovery.upb.h" @@ -74,6 +68,8 @@ #include "envoy/service/load_stats/v3/lrs.upbdefs.h" #include "envoy/service/route/v3/rds.upb.h" #include "envoy/service/route/v3/rds.upbdefs.h" +#include "envoy/service/status/v3/csds.upb.h" +#include "envoy/service/status/v3/csds.upbdefs.h" #include "envoy/type/matcher/v3/regex.upb.h" #include "envoy/type/matcher/v3/string.upb.h" #include "envoy/type/v3/percent.upb.h" @@ -81,18 +77,49 @@ #include "google/protobuf/any.upb.h" #include "google/protobuf/duration.upb.h" #include "google/protobuf/struct.upb.h" +#include "google/protobuf/timestamp.upb.h" #include "google/protobuf/wrappers.upb.h" #include "google/rpc/status.upb.h" +#include "udpa/type/v1/typed_struct.upb.h" #include "upb/text_encode.h" #include "upb/upb.h" +#include "upb/upb.hpp" + +#include <grpc/impl/codegen/log.h> +#include <grpc/support/alloc.h> +#include <grpc/support/string_util.h> + +#include "src/core/ext/xds/xds_api.h" +#include "src/core/lib/address_utils/sockaddr_utils.h" +#include "src/core/lib/gpr/env.h" +#include "src/core/lib/gpr/string.h" +#include "src/core/lib/gpr/useful.h" +#include "src/core/lib/gprpp/host_port.h" +#include "src/core/lib/iomgr/error.h" +#include "src/core/lib/iomgr/sockaddr.h" +#include "src/core/lib/iomgr/socket_utils.h" +#include "src/core/lib/slice/slice_utils.h" namespace grpc_core { -// TODO (donnadionne): Check to see if timeout is enabled, this will be -// removed once timeout feature is fully integration-tested and enabled by +// TODO(donnadionne): Check to see if cluster types aggregate_cluster and +// logical_dns are enabled, this will be +// removed once the cluster types are fully integration-tested and enabled by +// default. +bool XdsAggregateAndLogicalDnsClusterEnabled() { + char* value = gpr_getenv( + "GRPC_XDS_EXPERIMENTAL_ENABLE_AGGREGATE_AND_LOGICAL_DNS_CLUSTER"); + bool parsed_value; + bool parse_succeeded = gpr_parse_bool_value(value, &parsed_value); + gpr_free(value); + return parse_succeeded && parsed_value; +} + +// TODO(donnadionne): Check to see if ring hash policy is enabled, this will be +// removed once ring hash policy is fully integration-tested and enabled by // default. -bool XdsTimeoutEnabled() { - char* value = gpr_getenv("GRPC_XDS_EXPERIMENTAL_ENABLE_TIMEOUT"); +bool XdsRingHashEnabled() { + char* value = gpr_getenv("GRPC_XDS_EXPERIMENTAL_ENABLE_RING_HASH"); bool parsed_value; bool parse_succeeded = gpr_parse_bool_value(value, &parsed_value); gpr_free(value); @@ -111,160 +138,80 @@ bool XdsSecurityEnabled() { } // -// XdsApi::Route::Matchers::PathMatcher +// XdsApi::Route::HashPolicy // -XdsApi::Route::Matchers::PathMatcher::PathMatcher(const PathMatcher& other) - : type(other.type), case_sensitive(other.case_sensitive) { - if (type == PathMatcherType::REGEX) { - RE2::Options options; - options.set_case_sensitive(case_sensitive); - regex_matcher = - absl::make_unique<RE2>(other.regex_matcher->pattern(), options); - } else { - string_matcher = other.string_matcher; +XdsApi::Route::HashPolicy::HashPolicy(const HashPolicy& other) + : type(other.type), + header_name(other.header_name), + regex_substitution(other.regex_substitution) { + if (other.regex != nullptr) { + regex = + absl::make_unique<RE2>(other.regex->pattern(), other.regex->options()); } } -XdsApi::Route::Matchers::PathMatcher& XdsApi::Route::Matchers::PathMatcher:: -operator=(const PathMatcher& other) { +XdsApi::Route::HashPolicy& XdsApi::Route::HashPolicy::operator=( + const HashPolicy& other) { type = other.type; - case_sensitive = other.case_sensitive; - if (type == PathMatcherType::REGEX) { - RE2::Options options; - options.set_case_sensitive(case_sensitive); - regex_matcher = - absl::make_unique<RE2>(other.regex_matcher->pattern(), options); - } else { - string_matcher = other.string_matcher; + header_name = other.header_name; + if (other.regex != nullptr) { + regex = + absl::make_unique<RE2>(other.regex->pattern(), other.regex->options()); } + regex_substitution = other.regex_substitution; return *this; } -bool XdsApi::Route::Matchers::PathMatcher::operator==( - const PathMatcher& other) const { - if (type != other.type) return false; - if (case_sensitive != other.case_sensitive) return false; - if (type == PathMatcherType::REGEX) { - // Should never be null. - if (regex_matcher == nullptr || other.regex_matcher == nullptr) { - return false; - } - return regex_matcher->pattern() == other.regex_matcher->pattern(); - } - return string_matcher == other.string_matcher; -} - -std::string XdsApi::Route::Matchers::PathMatcher::ToString() const { - std::string path_type_string; - switch (type) { - case PathMatcherType::PATH: - path_type_string = "path match"; - break; - case PathMatcherType::PREFIX: - path_type_string = "prefix match"; - break; - case PathMatcherType::REGEX: - path_type_string = "regex match"; - break; - default: - break; - } - return absl::StrFormat("Path %s:%s%s", path_type_string, - type == PathMatcherType::REGEX - ? regex_matcher->pattern() - : string_matcher, - case_sensitive ? "" : "[case_sensitive=false]"); -} - -// -// XdsApi::Route::Matchers::HeaderMatcher -// - -XdsApi::Route::Matchers::HeaderMatcher::HeaderMatcher( - const HeaderMatcher& other) - : name(other.name), type(other.type), invert_match(other.invert_match) { - switch (type) { - case HeaderMatcherType::REGEX: - regex_match = absl::make_unique<RE2>(other.regex_match->pattern()); - break; - case HeaderMatcherType::RANGE: - range_start = other.range_start; - range_end = other.range_end; - break; - case HeaderMatcherType::PRESENT: - present_match = other.present_match; - break; - default: - string_matcher = other.string_matcher; - } -} +XdsApi::Route::HashPolicy::HashPolicy(HashPolicy&& other) noexcept + : type(other.type), + header_name(std::move(other.header_name)), + regex(std::move(other.regex)), + regex_substitution(std::move(other.regex_substitution)) {} -XdsApi::Route::Matchers::HeaderMatcher& XdsApi::Route::Matchers::HeaderMatcher:: -operator=(const HeaderMatcher& other) { - name = other.name; +XdsApi::Route::HashPolicy& XdsApi::Route::HashPolicy::operator=( + HashPolicy&& other) noexcept { type = other.type; - invert_match = other.invert_match; - switch (type) { - case HeaderMatcherType::REGEX: - regex_match = absl::make_unique<RE2>(other.regex_match->pattern()); - break; - case HeaderMatcherType::RANGE: - range_start = other.range_start; - range_end = other.range_end; - break; - case HeaderMatcherType::PRESENT: - present_match = other.present_match; - break; - default: - string_matcher = other.string_matcher; - } + header_name = std::move(other.header_name); + regex = std::move(other.regex); + regex_substitution = std::move(other.regex_substitution); return *this; } -bool XdsApi::Route::Matchers::HeaderMatcher::operator==( - const HeaderMatcher& other) const { - if (name != other.name) return false; +bool XdsApi::Route::HashPolicy::HashPolicy::operator==( + const HashPolicy& other) const { if (type != other.type) return false; - if (invert_match != other.invert_match) return false; - switch (type) { - case HeaderMatcherType::REGEX: - return regex_match->pattern() != other.regex_match->pattern(); - case HeaderMatcherType::RANGE: - return range_start != other.range_start && range_end != other.range_end; - case HeaderMatcherType::PRESENT: - return present_match != other.present_match; - default: - return string_matcher != other.string_matcher; + if (type == Type::HEADER) { + if (regex == nullptr) { + if (other.regex != nullptr) return false; + } else { + if (other.regex == nullptr) return false; + return header_name == other.header_name && + regex->pattern() == other.regex->pattern() && + regex_substitution == other.regex_substitution; + } } + return true; } -std::string XdsApi::Route::Matchers::HeaderMatcher::ToString() const { +std::string XdsApi::Route::HashPolicy::ToString() const { + std::vector<std::string> contents; switch (type) { - case HeaderMatcherType::EXACT: - return absl::StrFormat("Header exact match:%s %s:%s", - invert_match ? " not" : "", name, string_matcher); - case HeaderMatcherType::REGEX: - return absl::StrFormat("Header regex match:%s %s:%s", - invert_match ? " not" : "", name, - regex_match->pattern()); - case HeaderMatcherType::RANGE: - return absl::StrFormat("Header range match:%s %s:[%d, %d)", - invert_match ? " not" : "", name, range_start, - range_end); - case HeaderMatcherType::PRESENT: - return absl::StrFormat("Header present match:%s %s:%s", - invert_match ? " not" : "", name, - present_match ? "true" : "false"); - case HeaderMatcherType::PREFIX: - return absl::StrFormat("Header prefix match:%s %s:%s", - invert_match ? " not" : "", name, string_matcher); - case HeaderMatcherType::SUFFIX: - return absl::StrFormat("Header suffix match:%s %s:%s", - invert_match ? " not" : "", name, string_matcher); - default: - return ""; + case Type::HEADER: + contents.push_back("type=HEADER"); + break; + case Type::CHANNEL_ID: + contents.push_back("type=CHANNEL_ID"); + break; + } + contents.push_back( + absl::StrFormat("terminal=%s", terminal ? "true" : "false")); + if (type == Type::HEADER) { + contents.push_back(absl::StrFormat( + "Header %s:/%s/%s", header_name, + (regex == nullptr) ? "" : regex->pattern(), regex_substitution)); } + return absl::StrCat("{", absl::StrJoin(contents, ", "), "}"); } // @@ -273,7 +220,8 @@ std::string XdsApi::Route::Matchers::HeaderMatcher::ToString() const { std::string XdsApi::Route::Matchers::ToString() const { std::vector<std::string> contents; - contents.push_back(path_matcher.ToString()); + contents.push_back( + absl::StrFormat("PathMatcher{%s}", path_matcher.ToString())); for (const HeaderMatcher& header_matcher : header_matchers) { contents.push_back(header_matcher.ToString()); } @@ -285,12 +233,28 @@ std::string XdsApi::Route::Matchers::ToString() const { } std::string XdsApi::Route::ClusterWeight::ToString() const { - return absl::StrFormat("{cluster=%s, weight=%d}", name, weight); + std::vector<std::string> contents; + contents.push_back(absl::StrCat("cluster=", name)); + contents.push_back(absl::StrCat("weight=", weight)); + if (!typed_per_filter_config.empty()) { + std::vector<std::string> parts; + for (const auto& p : typed_per_filter_config) { + const std::string& key = p.first; + const auto& config = p.second; + parts.push_back(absl::StrCat(key, "=", config.ToString())); + } + contents.push_back(absl::StrCat("typed_per_filter_config={", + absl::StrJoin(parts, ", "), "}")); + } + return absl::StrCat("{", absl::StrJoin(contents, ", "), "}"); } std::string XdsApi::Route::ToString() const { std::vector<std::string> contents; contents.push_back(matchers.ToString()); + for (const HashPolicy& hash_policy : hash_policies) { + contents.push_back(absl::StrCat("hash_policy=", hash_policy.ToString())); + } if (!cluster_name.empty()) { contents.push_back(absl::StrFormat("Cluster name: %s", cluster_name)); } @@ -300,6 +264,15 @@ std::string XdsApi::Route::ToString() const { if (max_stream_duration.has_value()) { contents.push_back(max_stream_duration->ToString()); } + if (!typed_per_filter_config.empty()) { + contents.push_back("typed_per_filter_config={"); + for (const auto& p : typed_per_filter_config) { + const std::string& name = p.first; + const auto& config = p.second; + contents.push_back(absl::StrCat(" ", name, "=", config.ToString())); + } + contents.push_back("}"); + } return absl::StrJoin(contents, "\n"); } @@ -322,6 +295,14 @@ std::string XdsApi::RdsUpdate::ToString() const { vhosts.push_back("\n }\n"); } vhosts.push_back(" ]\n"); + vhosts.push_back(" typed_per_filter_config={\n"); + for (const auto& p : vhost.typed_per_filter_config) { + const std::string& name = p.first; + const auto& config = p.second; + vhosts.push_back( + absl::StrCat(" ", name, "=", config.ToString(), "\n")); + } + vhosts.push_back(" }\n"); vhosts.push_back("]\n"); } return absl::StrJoin(vhosts, ""); @@ -426,102 +407,6 @@ XdsApi::RdsUpdate::VirtualHost* XdsApi::RdsUpdate::FindVirtualHostForDomain( } // -// XdsApi::StringMatcher -// - -XdsApi::StringMatcher::StringMatcher(StringMatcherType type, - const std::string& matcher, - bool ignore_case) - : type_(type), ignore_case_(ignore_case) { - if (type_ == StringMatcherType::SAFE_REGEX) { - regex_matcher_ = absl::make_unique<RE2>(matcher); - } else { - string_matcher_ = matcher; - } -} - -XdsApi::StringMatcher::StringMatcher(const StringMatcher& other) - : type_(other.type_), ignore_case_(other.ignore_case_) { - switch (type_) { - case StringMatcherType::SAFE_REGEX: - regex_matcher_ = absl::make_unique<RE2>(other.regex_matcher_->pattern()); - break; - default: - string_matcher_ = other.string_matcher_; - } -} - -XdsApi::StringMatcher& XdsApi::StringMatcher::operator=( - const StringMatcher& other) { - type_ = other.type_; - switch (type_) { - case StringMatcherType::SAFE_REGEX: - regex_matcher_ = absl::make_unique<RE2>(other.regex_matcher_->pattern()); - break; - default: - string_matcher_ = other.string_matcher_; - } - ignore_case_ = other.ignore_case_; - return *this; -} - -bool XdsApi::StringMatcher::operator==(const StringMatcher& other) const { - if (type_ != other.type_ || ignore_case_ != other.ignore_case_) return false; - switch (type_) { - case StringMatcherType::SAFE_REGEX: - return regex_matcher_->pattern() == other.regex_matcher_->pattern(); - default: - return string_matcher_ == other.string_matcher_; - } -} - -bool XdsApi::StringMatcher::Match(absl::string_view value) const { - switch (type_) { - case XdsApi::StringMatcher::StringMatcherType::EXACT: - return ignore_case_ ? absl::EqualsIgnoreCase(value, string_matcher_) - : value == string_matcher_; - case XdsApi::StringMatcher::StringMatcherType::PREFIX: - return ignore_case_ ? absl::StartsWithIgnoreCase(value, string_matcher_) - : absl::StartsWith(value, string_matcher_); - case XdsApi::StringMatcher::StringMatcherType::SUFFIX: - return ignore_case_ ? absl::EndsWithIgnoreCase(value, string_matcher_) - : absl::EndsWith(value, string_matcher_); - case XdsApi::StringMatcher::StringMatcherType::CONTAINS: - return ignore_case_ - ? absl::StrContains(absl::AsciiStrToLower(value), - absl::AsciiStrToLower(string_matcher_)) - : absl::StrContains(value, string_matcher_); - case XdsApi::StringMatcher::StringMatcherType::SAFE_REGEX: - // ignore_case_ is ignored for SAFE_REGEX - return RE2::FullMatch(std::string(value), *regex_matcher_); - default: - return false; - } -} - -std::string XdsApi::StringMatcher::ToString() const { - switch (type_) { - case StringMatcherType::EXACT: - return absl::StrFormat("StringMatcher{exact=%s%s}", string_matcher_, - ignore_case_ ? ", ignore_case" : ""); - case StringMatcherType::PREFIX: - return absl::StrFormat("StringMatcher{prefix=%s%s}", string_matcher_, - ignore_case_ ? ", ignore_case" : ""); - case StringMatcherType::SUFFIX: - return absl::StrFormat("StringMatcher{suffix=%s%s}", string_matcher_, - ignore_case_ ? ", ignore_case" : ""); - case StringMatcherType::CONTAINS: - return absl::StrFormat("StringMatcher{contains=%s%s}", string_matcher_, - ignore_case_ ? ", ignore_case" : ""); - case StringMatcherType::SAFE_REGEX: - return absl::StrFormat("StringMatcher{safe_regex=%s}", - regex_matcher_->pattern()); - default: - return ""; - } -} - -// // XdsApi::CommonTlsContext::CertificateValidationContext // @@ -610,6 +495,204 @@ bool XdsApi::CommonTlsContext::Empty() const { } // +// XdsApi::DownstreamTlsContext +// + +std::string XdsApi::DownstreamTlsContext::ToString() const { + return absl::StrFormat("common_tls_context=%s, require_client_certificate=%s", + common_tls_context.ToString(), + require_client_certificate ? "true" : "false"); +} + +bool XdsApi::DownstreamTlsContext::Empty() const { + return common_tls_context.Empty(); +} + +// +// XdsApi::LdsUpdate::HttpConnectionManager +// + +std::string XdsApi::LdsUpdate::HttpConnectionManager::ToString() const { + absl::InlinedVector<std::string, 4> contents; + contents.push_back(absl::StrFormat( + "route_config_name=%s", + !route_config_name.empty() ? route_config_name.c_str() : "<inlined>")); + contents.push_back(absl::StrFormat("http_max_stream_duration=%s", + http_max_stream_duration.ToString())); + if (rds_update.has_value()) { + contents.push_back( + absl::StrFormat("rds_update=%s", rds_update->ToString())); + } + if (!http_filters.empty()) { + std::vector<std::string> filter_strings; + for (const auto& http_filter : http_filters) { + filter_strings.push_back(http_filter.ToString()); + } + contents.push_back(absl::StrCat("http_filters=[", + absl::StrJoin(filter_strings, ", "), "]")); + } + return absl::StrCat("{", absl::StrJoin(contents, ", "), "}"); +} + +// +// XdsApi::LdsUpdate::HttpFilter +// + +std::string XdsApi::LdsUpdate::HttpConnectionManager::HttpFilter::ToString() + const { + return absl::StrCat("{name=", name, ", config=", config.ToString(), "}"); +} + +// +// XdsApi::LdsUpdate::FilterChainData +// + +std::string XdsApi::LdsUpdate::FilterChainData::ToString() const { + return absl::StrCat( + "{downstream_tls_context=", downstream_tls_context.ToString(), + " http_connection_manager=", http_connection_manager.ToString(), "}"); +} + +// +// XdsApi::LdsUpdate::FilterChainMap::CidrRange +// + +std::string XdsApi::LdsUpdate::FilterChainMap::CidrRange::ToString() const { + return absl::StrCat( + "{address_prefix=", grpc_sockaddr_to_string(&address, false), + ", prefix_len=", prefix_len, "}"); +} + +// +// FilterChain +// + +struct FilterChain { + struct FilterChainMatch { + uint32_t destination_port = 0; + std::vector<XdsApi::LdsUpdate::FilterChainMap::CidrRange> prefix_ranges; + XdsApi::LdsUpdate::FilterChainMap::ConnectionSourceType source_type = + XdsApi::LdsUpdate::FilterChainMap::ConnectionSourceType::kAny; + std::vector<XdsApi::LdsUpdate::FilterChainMap::CidrRange> + source_prefix_ranges; + std::vector<uint32_t> source_ports; + std::vector<std::string> server_names; + std::string transport_protocol; + std::vector<std::string> application_protocols; + + std::string ToString() const; + } filter_chain_match; + + std::shared_ptr<XdsApi::LdsUpdate::FilterChainData> filter_chain_data; +}; + +std::string FilterChain::FilterChainMatch::ToString() const { + absl::InlinedVector<std::string, 8> contents; + if (destination_port != 0) { + contents.push_back(absl::StrCat("destination_port=", destination_port)); + } + if (!prefix_ranges.empty()) { + std::vector<std::string> prefix_ranges_content; + for (const auto& range : prefix_ranges) { + prefix_ranges_content.push_back(range.ToString()); + } + contents.push_back(absl::StrCat( + "prefix_ranges={", absl::StrJoin(prefix_ranges_content, ", "), "}")); + } + if (source_type == XdsApi::LdsUpdate::FilterChainMap::ConnectionSourceType:: + kSameIpOrLoopback) { + contents.push_back("source_type=SAME_IP_OR_LOOPBACK"); + } else if (source_type == XdsApi::LdsUpdate::FilterChainMap:: + ConnectionSourceType::kExternal) { + contents.push_back("source_type=EXTERNAL"); + } + if (!source_prefix_ranges.empty()) { + std::vector<std::string> source_prefix_ranges_content; + for (const auto& range : source_prefix_ranges) { + source_prefix_ranges_content.push_back(range.ToString()); + } + contents.push_back( + absl::StrCat("source_prefix_ranges={", + absl::StrJoin(source_prefix_ranges_content, ", "), "}")); + } + if (!source_ports.empty()) { + contents.push_back( + absl::StrCat("source_ports={", absl::StrJoin(source_ports, ", "), "}")); + } + if (!server_names.empty()) { + contents.push_back( + absl::StrCat("server_names={", absl::StrJoin(server_names, ", "), "}")); + } + if (!transport_protocol.empty()) { + contents.push_back(absl::StrCat("transport_protocol=", transport_protocol)); + } + if (!application_protocols.empty()) { + contents.push_back(absl::StrCat("application_protocols={", + absl::StrJoin(application_protocols, ", "), + "}")); + } + return absl::StrCat("{", absl::StrJoin(contents, ", "), "}"); +} + +// +// XdsApi::LdsUpdate::FilterChainMap +// + +std::string XdsApi::LdsUpdate::FilterChainMap::ToString() const { + std::vector<std::string> contents; + for (const auto& destination_ip : destination_ip_vector) { + for (int source_type = 0; source_type < 3; ++source_type) { + for (const auto& source_ip : + destination_ip.source_types_array[source_type]) { + for (const auto& source_port_pair : source_ip.ports_map) { + FilterChain::FilterChainMatch filter_chain_match; + if (destination_ip.prefix_range.has_value()) { + filter_chain_match.prefix_ranges.push_back( + *destination_ip.prefix_range); + } + filter_chain_match.source_type = static_cast< + XdsApi::LdsUpdate::FilterChainMap::ConnectionSourceType>( + source_type); + if (source_ip.prefix_range.has_value()) { + filter_chain_match.source_prefix_ranges.push_back( + *source_ip.prefix_range); + } + if (source_port_pair.first != 0) { + filter_chain_match.source_ports.push_back(source_port_pair.first); + } + contents.push_back(absl::StrCat( + "{filter_chain_match=", filter_chain_match.ToString(), + ", filter_chain=", source_port_pair.second.data->ToString(), + "}")); + } + } + } + } + return absl::StrCat("{", absl::StrJoin(contents, ", "), "}"); +} + +// +// XdsApi::LdsUpdate +// + +std::string XdsApi::LdsUpdate::ToString() const { + absl::InlinedVector<std::string, 4> contents; + if (type == ListenerType::kTcpListener) { + contents.push_back(absl::StrCat("address=", address)); + contents.push_back( + absl::StrCat("filter_chain_map=", filter_chain_map.ToString())); + if (default_filter_chain.has_value()) { + contents.push_back(absl::StrCat("default_filter_chain=", + default_filter_chain->ToString())); + } + } else if (type == ListenerType::kHttpApiListener) { + contents.push_back(absl::StrFormat("http_connection_manager=%s", + http_connection_manager.ToString())); + } + return absl::StrCat("{", absl::StrJoin(contents, ", "), "}"); +} + +// // XdsApi::CdsUpdate // @@ -724,8 +807,13 @@ const char* kCdsV2TypeUrl = "type.googleapis.com/envoy.api.v2.Cluster"; const char* kEdsV2TypeUrl = "type.googleapis.com/envoy.api.v2.ClusterLoadAssignment"; -bool IsLds(absl::string_view type_url) { - return type_url == XdsApi::kLdsTypeUrl || type_url == kLdsV2TypeUrl; +bool IsLds(absl::string_view type_url, bool* is_v2 = nullptr) { + if (type_url == XdsApi::kLdsTypeUrl) return true; + if (type_url == kLdsV2TypeUrl) { + if (is_v2 != nullptr) *is_v2 = true; + return true; + } + return false; } bool IsRds(absl::string_view type_url) { @@ -749,39 +837,67 @@ XdsApi::XdsApi(XdsClient* client, TraceFlag* tracer, node_(node), build_version_(absl::StrCat("gRPC C-core ", GPR_PLATFORM_STRING, " ", grpc_version_string())), - user_agent_name_(absl::StrCat("gRPC C-core ", GPR_PLATFORM_STRING)) {} + user_agent_name_(absl::StrCat("gRPC C-core ", GPR_PLATFORM_STRING)) { + // Populate upb symtab with xDS proto messages that we want to print + // properly in logs. + // Note: This won't actually work properly until upb adds support for + // Any fields in textproto printing (internal b/178821188). + envoy_config_listener_v3_Listener_getmsgdef(symtab_.ptr()); + envoy_config_route_v3_RouteConfiguration_getmsgdef(symtab_.ptr()); + envoy_config_cluster_v3_Cluster_getmsgdef(symtab_.ptr()); + envoy_extensions_clusters_aggregate_v3_ClusterConfig_getmsgdef(symtab_.ptr()); + envoy_config_cluster_v3_Cluster_getmsgdef(symtab_.ptr()); + envoy_config_endpoint_v3_ClusterLoadAssignment_getmsgdef(symtab_.ptr()); + envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_getmsgdef( + symtab_.ptr()); + envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_getmsgdef( + symtab_.ptr()); + // Load HTTP filter proto messages into the upb symtab. + XdsHttpFilterRegistry::PopulateSymtab(symtab_.ptr()); +} namespace { +struct EncodingContext { + XdsClient* client; + TraceFlag* tracer; + upb_symtab* symtab; + upb_arena* arena; + bool use_v3; +}; + // Works for both std::string and absl::string_view. template <typename T> inline upb_strview StdStringToUpbString(const T& str) { return upb_strview_make(str.data(), str.size()); } -void PopulateMetadataValue(upb_arena* arena, google_protobuf_Value* value_pb, - const Json& value); +void PopulateMetadataValue(const EncodingContext& context, + google_protobuf_Value* value_pb, const Json& value); -void PopulateListValue(upb_arena* arena, google_protobuf_ListValue* list_value, +void PopulateListValue(const EncodingContext& context, + google_protobuf_ListValue* list_value, const Json::Array& values) { for (const auto& value : values) { - auto* value_pb = google_protobuf_ListValue_add_values(list_value, arena); - PopulateMetadataValue(arena, value_pb, value); + auto* value_pb = + google_protobuf_ListValue_add_values(list_value, context.arena); + PopulateMetadataValue(context, value_pb, value); } } -void PopulateMetadata(upb_arena* arena, google_protobuf_Struct* metadata_pb, +void PopulateMetadata(const EncodingContext& context, + google_protobuf_Struct* metadata_pb, const Json::Object& metadata) { for (const auto& p : metadata) { - google_protobuf_Value* value = google_protobuf_Value_new(arena); - PopulateMetadataValue(arena, value, p.second); + google_protobuf_Value* value = google_protobuf_Value_new(context.arena); + PopulateMetadataValue(context, value, p.second); google_protobuf_Struct_fields_set( - metadata_pb, StdStringToUpbString(p.first), value, arena); + metadata_pb, StdStringToUpbString(p.first), value, context.arena); } } -void PopulateMetadataValue(upb_arena* arena, google_protobuf_Value* value_pb, - const Json& value) { +void PopulateMetadataValue(const EncodingContext& context, + google_protobuf_Value* value_pb, const Json& value) { switch (value.type()) { case Json::Type::JSON_NULL: google_protobuf_Value_set_null_value(value_pb, 0); @@ -802,14 +918,14 @@ void PopulateMetadataValue(upb_arena* arena, google_protobuf_Value* value_pb, break; case Json::Type::OBJECT: { google_protobuf_Struct* struct_value = - google_protobuf_Value_mutable_struct_value(value_pb, arena); - PopulateMetadata(arena, struct_value, value.object_value()); + google_protobuf_Value_mutable_struct_value(value_pb, context.arena); + PopulateMetadata(context, struct_value, value.object_value()); break; } case Json::Type::ARRAY: { google_protobuf_ListValue* list_value = - google_protobuf_Value_mutable_list_value(value_pb, arena); - PopulateListValue(arena, list_value, value.array_value()); + google_protobuf_Value_mutable_list_value(value_pb, context.arena); + PopulateListValue(context, list_value, value.array_value()); break; } } @@ -836,7 +952,8 @@ std::string EncodeStringField(uint32_t field_number, const std::string& str) { EncodeVarint(str.size()) + str; } -void PopulateBuildVersion(upb_arena* arena, envoy_config_core_v3_Node* node_msg, +void PopulateBuildVersion(const EncodingContext& context, + envoy_config_core_v3_Node* node_msg, const std::string& build_version) { std::string encoded_build_version = EncodeStringField(5, build_version); // TODO(roth): This should use upb_msg_addunknown(), but that API is @@ -844,10 +961,11 @@ void PopulateBuildVersion(upb_arena* arena, envoy_config_core_v3_Node* node_msg, // API for now. Change this once we upgrade to a version of upb that // fixes this bug. _upb_msg_addunknown(node_msg, encoded_build_version.data(), - encoded_build_version.size(), arena); + encoded_build_version.size(), context.arena); } -void PopulateNode(upb_arena* arena, const XdsBootstrap::Node* node, bool use_v3, +void PopulateNode(const EncodingContext& context, + const XdsBootstrap::Node* node, const std::string& build_version, const std::string& user_agent_name, envoy_config_core_v3_Node* node_msg) { @@ -862,13 +980,13 @@ void PopulateNode(upb_arena* arena, const XdsBootstrap::Node* node, bool use_v3, } if (!node->metadata.object_value().empty()) { google_protobuf_Struct* metadata = - envoy_config_core_v3_Node_mutable_metadata(node_msg, arena); - PopulateMetadata(arena, metadata, node->metadata.object_value()); + envoy_config_core_v3_Node_mutable_metadata(node_msg, context.arena); + PopulateMetadata(context, metadata, node->metadata.object_value()); } if (!node->locality_region.empty() || !node->locality_zone.empty() || - !node->locality_subzone.empty()) { + !node->locality_sub_zone.empty()) { envoy_config_core_v3_Locality* locality = - envoy_config_core_v3_Node_mutable_locality(node_msg, arena); + envoy_config_core_v3_Node_mutable_locality(node_msg, context.arena); if (!node->locality_region.empty()) { envoy_config_core_v3_Locality_set_region( locality, StdStringToUpbString(node->locality_region)); @@ -877,14 +995,14 @@ void PopulateNode(upb_arena* arena, const XdsBootstrap::Node* node, bool use_v3, envoy_config_core_v3_Locality_set_zone( locality, StdStringToUpbString(node->locality_zone)); } - if (!node->locality_subzone.empty()) { + if (!node->locality_sub_zone.empty()) { envoy_config_core_v3_Locality_set_sub_zone( - locality, StdStringToUpbString(node->locality_subzone)); + locality, StdStringToUpbString(node->locality_sub_zone)); } } } - if (!use_v3) { - PopulateBuildVersion(arena, node_msg, build_version); + if (!context.use_v3) { + PopulateBuildVersion(context, node_msg, build_version); } envoy_config_core_v3_Node_set_user_agent_name( node_msg, StdStringToUpbString(user_agent_name)); @@ -892,7 +1010,7 @@ void PopulateNode(upb_arena* arena, const XdsBootstrap::Node* node, bool use_v3, node_msg, upb_strview_makez(grpc_version_string())); envoy_config_core_v3_Node_add_client_features( node_msg, upb_strview_makez("envoy.lb.does_not_support_overprovisioning"), - arena); + context.arena); } inline absl::string_view UpbStringToAbsl(const upb_strview& str) { @@ -904,24 +1022,25 @@ inline std::string UpbStringToStdString(const upb_strview& str) { } void MaybeLogDiscoveryRequest( - XdsClient* client, TraceFlag* tracer, upb_symtab* symtab, + const EncodingContext& context, const envoy_service_discovery_v3_DiscoveryRequest* request) { - if (GRPC_TRACE_FLAG_ENABLED(*tracer) && + if (GRPC_TRACE_FLAG_ENABLED(*context.tracer) && gpr_should_log(GPR_LOG_SEVERITY_DEBUG)) { const upb_msgdef* msg_type = - envoy_service_discovery_v3_DiscoveryRequest_getmsgdef(symtab); + envoy_service_discovery_v3_DiscoveryRequest_getmsgdef(context.symtab); char buf[10240]; upb_text_encode(request, msg_type, nullptr, 0, buf, sizeof(buf)); - gpr_log(GPR_DEBUG, "[xds_client %p] constructed ADS request: %s", client, - buf); + gpr_log(GPR_DEBUG, "[xds_client %p] constructed ADS request: %s", + context.client, buf); } } grpc_slice SerializeDiscoveryRequest( - upb_arena* arena, envoy_service_discovery_v3_DiscoveryRequest* request) { + const EncodingContext& context, + envoy_service_discovery_v3_DiscoveryRequest* request) { size_t output_length; char* output = envoy_service_discovery_v3_DiscoveryRequest_serialize( - request, arena, &output_length); + request, context.arena, &output_length); return grpc_slice_from_copied_buffer(output, output_length); } @@ -949,9 +1068,11 @@ absl::string_view TypeUrlExternalToInternal(bool use_v3, grpc_slice XdsApi::CreateAdsRequest( const XdsBootstrap::XdsServer& server, const std::string& type_url, const std::set<absl::string_view>& resource_names, - const std::string& version, const std::string& nonce, grpc_error* error, - bool populate_node) { + const std::string& version, const std::string& nonce, + grpc_error_handle error, bool populate_node) { upb::Arena arena; + const EncodingContext context = {client_, tracer_, symtab_.ptr(), arena.ptr(), + server.ShouldUseV3()}; // Create a request. envoy_service_discovery_v3_DiscoveryRequest* request = envoy_service_discovery_v3_DiscoveryRequest_new(arena.ptr()); @@ -971,6 +1092,7 @@ grpc_slice XdsApi::CreateAdsRequest( request, StdStringToUpbString(nonce)); } // Set error_detail if it's a NACK. + std::string error_string_storage; if (error != GRPC_ERROR_NONE) { google_rpc_Status* error_detail = envoy_service_discovery_v3_DiscoveryRequest_mutable_error_detail( @@ -981,12 +1103,9 @@ grpc_slice XdsApi::CreateAdsRequest( // generate them in the parsing code, and then use that here. google_rpc_Status_set_code(error_detail, GRPC_STATUS_INVALID_ARGUMENT); // Error description comes from the error that was passed in. - grpc_slice error_description_slice; - GPR_ASSERT(grpc_error_get_str(error, GRPC_ERROR_STR_DESCRIPTION, - &error_description_slice)); - upb_strview error_description_strview = - StdStringToUpbString(StringViewFromSlice(error_description_slice)); - google_rpc_Status_set_message(error_detail, error_description_strview); + error_string_storage = grpc_error_std_string(error); + upb_strview error_description = StdStringToUpbString(error_string_storage); + google_rpc_Status_set_message(error_detail, error_description); GRPC_ERROR_UNREF(error); } // Populate node. @@ -994,79 +1113,102 @@ grpc_slice XdsApi::CreateAdsRequest( envoy_config_core_v3_Node* node_msg = envoy_service_discovery_v3_DiscoveryRequest_mutable_node(request, arena.ptr()); - PopulateNode(arena.ptr(), node_, server.ShouldUseV3(), build_version_, - user_agent_name_, node_msg); + PopulateNode(context, node_, build_version_, user_agent_name_, node_msg); } // Add resource_names. for (const auto& resource_name : resource_names) { envoy_service_discovery_v3_DiscoveryRequest_add_resource_names( request, StdStringToUpbString(resource_name), arena.ptr()); } - MaybeLogDiscoveryRequest(client_, tracer_, symtab_.ptr(), request); - return SerializeDiscoveryRequest(arena.ptr(), request); + MaybeLogDiscoveryRequest(context, request); + return SerializeDiscoveryRequest(context, request); } namespace { void MaybeLogDiscoveryResponse( - XdsClient* client, TraceFlag* tracer, upb_symtab* symtab, + const EncodingContext& context, const envoy_service_discovery_v3_DiscoveryResponse* response) { - if (GRPC_TRACE_FLAG_ENABLED(*tracer) && + if (GRPC_TRACE_FLAG_ENABLED(*context.tracer) && gpr_should_log(GPR_LOG_SEVERITY_DEBUG)) { const upb_msgdef* msg_type = - envoy_service_discovery_v3_DiscoveryResponse_getmsgdef(symtab); + envoy_service_discovery_v3_DiscoveryResponse_getmsgdef(context.symtab); char buf[10240]; upb_text_encode(response, msg_type, nullptr, 0, buf, sizeof(buf)); - gpr_log(GPR_DEBUG, "[xds_client %p] received response: %s", client, buf); + gpr_log(GPR_DEBUG, "[xds_client %p] received response: %s", context.client, + buf); + } +} + +void MaybeLogHttpConnectionManager( + const EncodingContext& context, + const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* + http_connection_manager_config) { + if (GRPC_TRACE_FLAG_ENABLED(*context.tracer) && + gpr_should_log(GPR_LOG_SEVERITY_DEBUG)) { + const upb_msgdef* msg_type = + envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_getmsgdef( + context.symtab); + char buf[10240]; + upb_text_encode(http_connection_manager_config, msg_type, nullptr, 0, buf, + sizeof(buf)); + gpr_log(GPR_DEBUG, "[xds_client %p] HttpConnectionManager: %s", + context.client, buf); } } void MaybeLogRouteConfiguration( - XdsClient* client, TraceFlag* tracer, upb_symtab* symtab, + const EncodingContext& context, const envoy_config_route_v3_RouteConfiguration* route_config) { - if (GRPC_TRACE_FLAG_ENABLED(*tracer) && + if (GRPC_TRACE_FLAG_ENABLED(*context.tracer) && gpr_should_log(GPR_LOG_SEVERITY_DEBUG)) { const upb_msgdef* msg_type = - envoy_config_route_v3_RouteConfiguration_getmsgdef(symtab); + envoy_config_route_v3_RouteConfiguration_getmsgdef(context.symtab); char buf[10240]; upb_text_encode(route_config, msg_type, nullptr, 0, buf, sizeof(buf)); - gpr_log(GPR_DEBUG, "[xds_client %p] RouteConfiguration: %s", client, buf); + gpr_log(GPR_DEBUG, "[xds_client %p] RouteConfiguration: %s", context.client, + buf); } } -void MaybeLogCluster(XdsClient* client, TraceFlag* tracer, upb_symtab* symtab, +void MaybeLogCluster(const EncodingContext& context, const envoy_config_cluster_v3_Cluster* cluster) { - if (GRPC_TRACE_FLAG_ENABLED(*tracer) && + if (GRPC_TRACE_FLAG_ENABLED(*context.tracer) && gpr_should_log(GPR_LOG_SEVERITY_DEBUG)) { const upb_msgdef* msg_type = - envoy_config_cluster_v3_Cluster_getmsgdef(symtab); + envoy_config_cluster_v3_Cluster_getmsgdef(context.symtab); char buf[10240]; upb_text_encode(cluster, msg_type, nullptr, 0, buf, sizeof(buf)); - gpr_log(GPR_DEBUG, "[xds_client %p] Cluster: %s", client, buf); + gpr_log(GPR_DEBUG, "[xds_client %p] Cluster: %s", context.client, buf); } } void MaybeLogClusterLoadAssignment( - XdsClient* client, TraceFlag* tracer, upb_symtab* symtab, + const EncodingContext& context, const envoy_config_endpoint_v3_ClusterLoadAssignment* cla) { - if (GRPC_TRACE_FLAG_ENABLED(*tracer) && + if (GRPC_TRACE_FLAG_ENABLED(*context.tracer) && gpr_should_log(GPR_LOG_SEVERITY_DEBUG)) { const upb_msgdef* msg_type = - envoy_config_endpoint_v3_ClusterLoadAssignment_getmsgdef(symtab); + envoy_config_endpoint_v3_ClusterLoadAssignment_getmsgdef( + context.symtab); char buf[10240]; upb_text_encode(cla, msg_type, nullptr, 0, buf, sizeof(buf)); - gpr_log(GPR_DEBUG, "[xds_client %p] ClusterLoadAssignment: %s", client, - buf); + gpr_log(GPR_DEBUG, "[xds_client %p] ClusterLoadAssignment: %s", + context.client, buf); } } -grpc_error* RoutePathMatchParse(const envoy_config_route_v3_RouteMatch* match, - XdsApi::Route* route, bool* ignore_route) { - auto* case_sensitive = envoy_config_route_v3_RouteMatch_case_sensitive(match); - if (case_sensitive != nullptr) { - route->matchers.path_matcher.case_sensitive = - google_protobuf_BoolValue_value(case_sensitive); +grpc_error_handle RoutePathMatchParse( + const envoy_config_route_v3_RouteMatch* match, XdsApi::Route* route, + bool* ignore_route) { + auto* case_sensitive_ptr = + envoy_config_route_v3_RouteMatch_case_sensitive(match); + bool case_sensitive = true; + if (case_sensitive_ptr != nullptr) { + case_sensitive = google_protobuf_BoolValue_value(case_sensitive_ptr); } + StringMatcher::Type type; + std::string match_string; if (envoy_config_route_v3_RouteMatch_has_prefix(match)) { absl::string_view prefix = UpbStringToAbsl(envoy_config_route_v3_RouteMatch_prefix(match)); @@ -1091,9 +1233,8 @@ grpc_error* RoutePathMatchParse(const envoy_config_route_v3_RouteMatch* match, return GRPC_ERROR_NONE; } } - route->matchers.path_matcher.type = - XdsApi::Route::Matchers::PathMatcher::PathMatcherType::PREFIX; - route->matchers.path_matcher.string_matcher = std::string(prefix); + type = StringMatcher::Type::kPrefix; + match_string = std::string(prefix); } else if (envoy_config_route_v3_RouteMatch_has_path(match)) { absl::string_view path = UpbStringToAbsl(envoy_config_route_v3_RouteMatch_path(match)); @@ -1126,102 +1267,99 @@ grpc_error* RoutePathMatchParse(const envoy_config_route_v3_RouteMatch* match, *ignore_route = true; return GRPC_ERROR_NONE; } - route->matchers.path_matcher.type = - XdsApi::Route::Matchers::PathMatcher::PathMatcherType::PATH; - route->matchers.path_matcher.string_matcher = std::string(path); + type = StringMatcher::Type::kExact; + match_string = std::string(path); } else if (envoy_config_route_v3_RouteMatch_has_safe_regex(match)) { const envoy_type_matcher_v3_RegexMatcher* regex_matcher = envoy_config_route_v3_RouteMatch_safe_regex(match); GPR_ASSERT(regex_matcher != nullptr); - std::string matcher = UpbStringToStdString( + type = StringMatcher::Type::kSafeRegex; + match_string = UpbStringToStdString( envoy_type_matcher_v3_RegexMatcher_regex(regex_matcher)); - RE2::Options options; - options.set_case_sensitive(route->matchers.path_matcher.case_sensitive); - auto regex = absl::make_unique<RE2>(std::move(matcher), options); - if (!regex->ok()) { - return GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "Invalid regex string specified in path matcher."); - } - route->matchers.path_matcher.type = - XdsApi::Route::Matchers::PathMatcher::PathMatcherType::REGEX; - route->matchers.path_matcher.regex_matcher = std::move(regex); } else { return GRPC_ERROR_CREATE_FROM_STATIC_STRING( "Invalid route path specifier specified."); } + absl::StatusOr<StringMatcher> string_matcher = + StringMatcher::Create(type, match_string, case_sensitive); + if (!string_matcher.ok()) { + return GRPC_ERROR_CREATE_FROM_COPIED_STRING( + absl::StrCat("path matcher: ", string_matcher.status().message()) + .c_str()); + ; + } + route->matchers.path_matcher = std::move(string_matcher.value()); return GRPC_ERROR_NONE; } -grpc_error* RouteHeaderMatchersParse( +grpc_error_handle RouteHeaderMatchersParse( const envoy_config_route_v3_RouteMatch* match, XdsApi::Route* route) { size_t size; const envoy_config_route_v3_HeaderMatcher* const* headers = envoy_config_route_v3_RouteMatch_headers(match, &size); for (size_t i = 0; i < size; ++i) { const envoy_config_route_v3_HeaderMatcher* header = headers[i]; - XdsApi::Route::Matchers::HeaderMatcher header_matcher; - header_matcher.name = + const std::string name = UpbStringToStdString(envoy_config_route_v3_HeaderMatcher_name(header)); + HeaderMatcher::Type type; + std::string match_string; + int64_t range_start = 0; + int64_t range_end = 0; + bool present_match = false; if (envoy_config_route_v3_HeaderMatcher_has_exact_match(header)) { - header_matcher.type = - XdsApi::Route::Matchers::HeaderMatcher::HeaderMatcherType::EXACT; - header_matcher.string_matcher = UpbStringToStdString( + type = HeaderMatcher::Type::kExact; + match_string = UpbStringToStdString( envoy_config_route_v3_HeaderMatcher_exact_match(header)); } else if (envoy_config_route_v3_HeaderMatcher_has_safe_regex_match( header)) { const envoy_type_matcher_v3_RegexMatcher* regex_matcher = envoy_config_route_v3_HeaderMatcher_safe_regex_match(header); GPR_ASSERT(regex_matcher != nullptr); - const std::string matcher = UpbStringToStdString( + type = HeaderMatcher::Type::kSafeRegex; + match_string = UpbStringToStdString( envoy_type_matcher_v3_RegexMatcher_regex(regex_matcher)); - std::unique_ptr<RE2> regex = absl::make_unique<RE2>(matcher); - if (!regex->ok()) { - return GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "Invalid regex string specified in header matcher."); - } - header_matcher.type = - XdsApi::Route::Matchers::HeaderMatcher::HeaderMatcherType::REGEX; - header_matcher.regex_match = std::move(regex); } else if (envoy_config_route_v3_HeaderMatcher_has_range_match(header)) { - header_matcher.type = - XdsApi::Route::Matchers::HeaderMatcher::HeaderMatcherType::RANGE; + type = HeaderMatcher::Type::kRange; const envoy_type_v3_Int64Range* range_matcher = envoy_config_route_v3_HeaderMatcher_range_match(header); - header_matcher.range_start = - envoy_type_v3_Int64Range_start(range_matcher); - header_matcher.range_end = envoy_type_v3_Int64Range_end(range_matcher); - if (header_matcher.range_end < header_matcher.range_start) { - return GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "Invalid range header matcher specifier specified: end " - "cannot be smaller than start."); - } + range_start = envoy_type_v3_Int64Range_start(range_matcher); + range_end = envoy_type_v3_Int64Range_end(range_matcher); } else if (envoy_config_route_v3_HeaderMatcher_has_present_match(header)) { - header_matcher.type = - XdsApi::Route::Matchers::HeaderMatcher::HeaderMatcherType::PRESENT; - header_matcher.present_match = - envoy_config_route_v3_HeaderMatcher_present_match(header); + type = HeaderMatcher::Type::kPresent; + present_match = envoy_config_route_v3_HeaderMatcher_present_match(header); } else if (envoy_config_route_v3_HeaderMatcher_has_prefix_match(header)) { - header_matcher.type = - XdsApi::Route::Matchers::HeaderMatcher::HeaderMatcherType::PREFIX; - header_matcher.string_matcher = UpbStringToStdString( + type = HeaderMatcher::Type::kPrefix; + match_string = UpbStringToStdString( envoy_config_route_v3_HeaderMatcher_prefix_match(header)); } else if (envoy_config_route_v3_HeaderMatcher_has_suffix_match(header)) { - header_matcher.type = - XdsApi::Route::Matchers::HeaderMatcher::HeaderMatcherType::SUFFIX; - header_matcher.string_matcher = UpbStringToStdString( + type = HeaderMatcher::Type::kSuffix; + match_string = UpbStringToStdString( envoy_config_route_v3_HeaderMatcher_suffix_match(header)); + } else if (envoy_config_route_v3_HeaderMatcher_has_contains_match(header)) { + type = HeaderMatcher::Type::kContains; + match_string = UpbStringToStdString( + envoy_config_route_v3_HeaderMatcher_contains_match(header)); } else { return GRPC_ERROR_CREATE_FROM_STATIC_STRING( "Invalid route header matcher specified."); } - header_matcher.invert_match = + bool invert_match = envoy_config_route_v3_HeaderMatcher_invert_match(header); - route->matchers.header_matchers.emplace_back(std::move(header_matcher)); + absl::StatusOr<HeaderMatcher> header_matcher = + HeaderMatcher::Create(name, type, match_string, range_start, range_end, + present_match, invert_match); + if (!header_matcher.ok()) { + return GRPC_ERROR_CREATE_FROM_COPIED_STRING( + absl::StrCat("header matcher: ", header_matcher.status().message()) + .c_str()); + } + route->matchers.header_matchers.emplace_back( + std::move(header_matcher.value())); } return GRPC_ERROR_NONE; } -grpc_error* RouteRuntimeFractionParse( +grpc_error_handle RouteRuntimeFractionParse( const envoy_config_route_v3_RouteMatch* match, XdsApi::Route* route) { const envoy_config_core_v3_RuntimeFractionalPercent* runtime_fraction = envoy_config_route_v3_RouteMatch_runtime_fraction(match); @@ -1254,8 +1392,98 @@ grpc_error* RouteRuntimeFractionParse( return GRPC_ERROR_NONE; } -grpc_error* RouteActionParse(const envoy_config_route_v3_Route* route_msg, - XdsApi::Route* route, bool* ignore_route) { +grpc_error_handle ExtractHttpFilterTypeName(const EncodingContext& context, + const google_protobuf_Any* any, + absl::string_view* filter_type) { + *filter_type = UpbStringToAbsl(google_protobuf_Any_type_url(any)); + if (*filter_type == "type.googleapis.com/udpa.type.v1.TypedStruct") { + upb_strview any_value = google_protobuf_Any_value(any); + const auto* typed_struct = udpa_type_v1_TypedStruct_parse( + any_value.data, any_value.size, context.arena); + if (typed_struct == nullptr) { + return GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "could not parse TypedStruct from filter config"); + } + *filter_type = + UpbStringToAbsl(udpa_type_v1_TypedStruct_type_url(typed_struct)); + } + *filter_type = absl::StripPrefix(*filter_type, "type.googleapis.com/"); + return GRPC_ERROR_NONE; +} + +template <typename ParentType, typename EntryType> +grpc_error_handle ParseTypedPerFilterConfig( + const EncodingContext& context, const ParentType* parent, + const EntryType* (*entry_func)(const ParentType*, size_t*), + upb_strview (*key_func)(const EntryType*), + const google_protobuf_Any* (*value_func)(const EntryType*), + XdsApi::TypedPerFilterConfig* typed_per_filter_config) { + size_t filter_it = UPB_MAP_BEGIN; + while (true) { + const auto* filter_entry = entry_func(parent, &filter_it); + if (filter_entry == nullptr) break; + absl::string_view key = UpbStringToAbsl(key_func(filter_entry)); + if (key.empty()) { + return GRPC_ERROR_CREATE_FROM_STATIC_STRING("empty filter name in map"); + } + const google_protobuf_Any* any = value_func(filter_entry); + GPR_ASSERT(any != nullptr); + absl::string_view filter_type = + UpbStringToAbsl(google_protobuf_Any_type_url(any)); + if (filter_type.empty()) { + return GRPC_ERROR_CREATE_FROM_COPIED_STRING( + absl::StrCat("no filter config specified for filter name ", key) + .c_str()); + } + bool is_optional = false; + if (filter_type == + "type.googleapis.com/envoy.config.route.v3.FilterConfig") { + upb_strview any_value = google_protobuf_Any_value(any); + const auto* filter_config = envoy_config_route_v3_FilterConfig_parse( + any_value.data, any_value.size, context.arena); + if (filter_config == nullptr) { + return GRPC_ERROR_CREATE_FROM_COPIED_STRING( + absl::StrCat("could not parse FilterConfig wrapper for ", key) + .c_str()); + } + is_optional = + envoy_config_route_v3_FilterConfig_is_optional(filter_config); + any = envoy_config_route_v3_FilterConfig_config(filter_config); + if (any == nullptr) { + if (is_optional) continue; + return GRPC_ERROR_CREATE_FROM_COPIED_STRING( + absl::StrCat("no filter config specified for filter name ", key) + .c_str()); + } + } + grpc_error_handle error = + ExtractHttpFilterTypeName(context, any, &filter_type); + if (error != GRPC_ERROR_NONE) return error; + const XdsHttpFilterImpl* filter_impl = + XdsHttpFilterRegistry::GetFilterForType(filter_type); + if (filter_impl == nullptr) { + if (is_optional) continue; + return GRPC_ERROR_CREATE_FROM_COPIED_STRING( + absl::StrCat("no filter registered for config type ", filter_type) + .c_str()); + } + absl::StatusOr<XdsHttpFilterImpl::FilterConfig> filter_config = + filter_impl->GenerateFilterConfigOverride( + google_protobuf_Any_value(any), context.arena); + if (!filter_config.ok()) { + return GRPC_ERROR_CREATE_FROM_COPIED_STRING( + absl::StrCat("filter config for type ", filter_type, + " failed to parse: ", filter_config.status().ToString()) + .c_str()); + } + (*typed_per_filter_config)[std::string(key)] = std::move(*filter_config); + } + return GRPC_ERROR_NONE; +} + +grpc_error_handle RouteActionParse(const EncodingContext& context, + const envoy_config_route_v3_Route* route_msg, + XdsApi::Route* route, bool* ignore_route) { if (!envoy_config_route_v3_Route_has_route(route_msg)) { return GRPC_ERROR_CREATE_FROM_STATIC_STRING( "No RouteAction found in route."); @@ -1307,6 +1535,17 @@ grpc_error* RouteActionParse(const envoy_config_route_v3_Route* route_msg, cluster.weight = google_protobuf_UInt32Value_value(weight); if (cluster.weight == 0) continue; sum_of_weights += cluster.weight; + if (context.use_v3) { + grpc_error_handle error = ParseTypedPerFilterConfig< + envoy_config_route_v3_WeightedCluster_ClusterWeight, + envoy_config_route_v3_WeightedCluster_ClusterWeight_TypedPerFilterConfigEntry>( + context, cluster_weight, + envoy_config_route_v3_WeightedCluster_ClusterWeight_typed_per_filter_config_next, + envoy_config_route_v3_WeightedCluster_ClusterWeight_TypedPerFilterConfigEntry_key, + envoy_config_route_v3_WeightedCluster_ClusterWeight_TypedPerFilterConfigEntry_value, + &cluster.typed_per_filter_config); + if (error != GRPC_ERROR_NONE) return error; + } route->weighted_clusters.emplace_back(std::move(cluster)); } if (total_weight != sum_of_weights) { @@ -1321,7 +1560,7 @@ grpc_error* RouteActionParse(const envoy_config_route_v3_Route* route_msg, // No cluster or weighted_clusters found in RouteAction, ignore this route. *ignore_route = true; } - if (XdsTimeoutEnabled() && !*ignore_route) { + if (!*ignore_route) { const envoy_config_route_v3_RouteAction_MaxStreamDuration* max_stream_duration = envoy_config_route_v3_RouteAction_max_stream_duration(route_action); @@ -1342,20 +1581,102 @@ grpc_error* RouteActionParse(const envoy_config_route_v3_Route* route_msg, } } } + // Get HashPolicy from RouteAction + if (XdsRingHashEnabled()) { + size_t size = 0; + const envoy_config_route_v3_RouteAction_HashPolicy* const* hash_policies = + envoy_config_route_v3_RouteAction_hash_policy(route_action, &size); + for (size_t i = 0; i < size; ++i) { + const envoy_config_route_v3_RouteAction_HashPolicy* hash_policy = + hash_policies[i]; + XdsApi::Route::HashPolicy policy; + policy.terminal = + envoy_config_route_v3_RouteAction_HashPolicy_terminal(hash_policy); + const envoy_config_route_v3_RouteAction_HashPolicy_Header* header; + const envoy_config_route_v3_RouteAction_HashPolicy_FilterState* + filter_state; + if ((header = envoy_config_route_v3_RouteAction_HashPolicy_header( + hash_policy)) != nullptr) { + policy.type = XdsApi::Route::HashPolicy::Type::HEADER; + policy.header_name = UpbStringToStdString( + envoy_config_route_v3_RouteAction_HashPolicy_Header_header_name( + header)); + const struct envoy_type_matcher_v3_RegexMatchAndSubstitute* + regex_rewrite = + envoy_config_route_v3_RouteAction_HashPolicy_Header_regex_rewrite( + header); + if (regex_rewrite == nullptr) { + gpr_log( + GPR_DEBUG, + "RouteAction HashPolicy contains policy specifier Header with " + "RegexMatchAndSubstitution but Regex is missing"); + continue; + } + const envoy_type_matcher_v3_RegexMatcher* regex_matcher = + envoy_type_matcher_v3_RegexMatchAndSubstitute_pattern( + regex_rewrite); + if (regex_matcher == nullptr) { + gpr_log( + GPR_DEBUG, + "RouteAction HashPolicy contains policy specifier Header with " + "RegexMatchAndSubstitution but RegexMatcher pattern is " + "missing"); + continue; + } + RE2::Options options; + policy.regex = absl::make_unique<RE2>( + UpbStringToStdString( + envoy_type_matcher_v3_RegexMatcher_regex(regex_matcher)), + options); + if (!policy.regex->ok()) { + gpr_log( + GPR_DEBUG, + "RouteAction HashPolicy contains policy specifier Header with " + "RegexMatchAndSubstitution but RegexMatcher pattern does not " + "compile"); + continue; + } + policy.regex_substitution = UpbStringToStdString( + envoy_type_matcher_v3_RegexMatchAndSubstitute_substitution( + regex_rewrite)); + } else if ((filter_state = + envoy_config_route_v3_RouteAction_HashPolicy_filter_state( + hash_policy)) != nullptr) { + std::string key = UpbStringToStdString( + envoy_config_route_v3_RouteAction_HashPolicy_FilterState_key( + filter_state)); + if (key == "io.grpc.channel_id") { + policy.type = XdsApi::Route::HashPolicy::Type::CHANNEL_ID; + } else { + gpr_log(GPR_DEBUG, + "RouteAction HashPolicy contains policy specifier " + "FilterState but " + "key is not io.grpc.channel_id."); + continue; + } + } else { + gpr_log( + GPR_DEBUG, + "RouteAction HashPolicy contains unsupported policy specifier."); + continue; + } + route->hash_policies.emplace_back(std::move(policy)); + } + } return GRPC_ERROR_NONE; } -grpc_error* RouteConfigParse( - XdsClient* client, TraceFlag* tracer, upb_symtab* symtab, +grpc_error_handle RouteConfigParse( + const EncodingContext& context, const envoy_config_route_v3_RouteConfiguration* route_config, XdsApi::RdsUpdate* rds_update) { - MaybeLogRouteConfiguration(client, tracer, symtab, route_config); + MaybeLogRouteConfiguration(context, route_config); // Get the virtual hosts. - size_t size; + size_t num_virtual_hosts; const envoy_config_route_v3_VirtualHost* const* virtual_hosts = - envoy_config_route_v3_RouteConfiguration_virtual_hosts(route_config, - &size); - for (size_t i = 0; i < size; ++i) { + envoy_config_route_v3_RouteConfiguration_virtual_hosts( + route_config, &num_virtual_hosts); + for (size_t i = 0; i < num_virtual_hosts; ++i) { rds_update->virtual_hosts.emplace_back(); XdsApi::RdsUpdate::VirtualHost& vhost = rds_update->virtual_hosts.back(); // Parse domains. @@ -1375,6 +1696,18 @@ grpc_error* RouteConfigParse( if (vhost.domains.empty()) { return GRPC_ERROR_CREATE_FROM_STATIC_STRING("VirtualHost has no domains"); } + // Parse typed_per_filter_config. + if (context.use_v3) { + grpc_error_handle error = ParseTypedPerFilterConfig< + envoy_config_route_v3_VirtualHost, + envoy_config_route_v3_VirtualHost_TypedPerFilterConfigEntry>( + context, virtual_hosts[i], + envoy_config_route_v3_VirtualHost_typed_per_filter_config_next, + envoy_config_route_v3_VirtualHost_TypedPerFilterConfigEntry_key, + envoy_config_route_v3_VirtualHost_TypedPerFilterConfigEntry_value, + &vhost.typed_per_filter_config); + if (error != GRPC_ERROR_NONE) return error; + } // Parse routes. size_t num_routes; const envoy_config_route_v3_Route* const* routes = @@ -1387,6 +1720,9 @@ grpc_error* RouteConfigParse( for (size_t j = 0; j < num_routes; ++j) { const envoy_config_route_v3_RouteMatch* match = envoy_config_route_v3_Route_match(routes[j]); + if (match == nullptr) { + return GRPC_ERROR_CREATE_FROM_STATIC_STRING("Match can't be null."); + } size_t query_parameters_size; static_cast<void>(envoy_config_route_v3_RouteMatch_query_parameters( match, &query_parameters_size)); @@ -1395,16 +1731,28 @@ grpc_error* RouteConfigParse( } XdsApi::Route route; bool ignore_route = false; - grpc_error* error = RoutePathMatchParse(match, &route, &ignore_route); + grpc_error_handle error = + RoutePathMatchParse(match, &route, &ignore_route); if (error != GRPC_ERROR_NONE) return error; if (ignore_route) continue; error = RouteHeaderMatchersParse(match, &route); if (error != GRPC_ERROR_NONE) return error; error = RouteRuntimeFractionParse(match, &route); if (error != GRPC_ERROR_NONE) return error; - error = RouteActionParse(routes[j], &route, &ignore_route); + error = RouteActionParse(context, routes[j], &route, &ignore_route); if (error != GRPC_ERROR_NONE) return error; if (ignore_route) continue; + if (context.use_v3) { + grpc_error_handle error = ParseTypedPerFilterConfig< + envoy_config_route_v3_Route, + envoy_config_route_v3_Route_TypedPerFilterConfigEntry>( + context, routes[j], + envoy_config_route_v3_Route_typed_per_filter_config_next, + envoy_config_route_v3_Route_TypedPerFilterConfigEntry_key, + envoy_config_route_v3_Route_TypedPerFilterConfigEntry_value, + &route.typed_per_filter_config); + if (error != GRPC_ERROR_NONE) return error; + } vhost.routes.emplace_back(std::move(route)); } if (vhost.routes.empty()) { @@ -1414,170 +1762,6 @@ grpc_error* RouteConfigParse( return GRPC_ERROR_NONE; } -grpc_error* LdsResponseParse( - XdsClient* client, TraceFlag* tracer, upb_symtab* symtab, - const envoy_service_discovery_v3_DiscoveryResponse* response, - const std::set<absl::string_view>& expected_listener_names, - XdsApi::LdsUpdateMap* lds_update_map, upb_arena* arena) { - // Get the resources from the response. - size_t size; - const google_protobuf_Any* const* resources = - envoy_service_discovery_v3_DiscoveryResponse_resources(response, &size); - for (size_t i = 0; i < size; ++i) { - // Check the type_url of the resource. - absl::string_view type_url = - UpbStringToAbsl(google_protobuf_Any_type_url(resources[i])); - if (!IsLds(type_url)) { - return GRPC_ERROR_CREATE_FROM_STATIC_STRING("Resource is not LDS."); - } - // Decode the listener. - const upb_strview encoded_listener = - google_protobuf_Any_value(resources[i]); - const envoy_config_listener_v3_Listener* listener = - envoy_config_listener_v3_Listener_parse(encoded_listener.data, - encoded_listener.size, arena); - if (listener == nullptr) { - return GRPC_ERROR_CREATE_FROM_STATIC_STRING("Can't decode listener."); - } - // Check listener name. Ignore unexpected listeners. - std::string listener_name = - UpbStringToStdString(envoy_config_listener_v3_Listener_name(listener)); - if (expected_listener_names.find(listener_name) == - expected_listener_names.end()) { - continue; - } - // Fail if listener name is duplicated. - if (lds_update_map->find(listener_name) != lds_update_map->end()) { - return GRPC_ERROR_CREATE_FROM_COPIED_STRING( - absl::StrCat("duplicate listener name \"", listener_name, "\"") - .c_str()); - } - XdsApi::LdsUpdate& lds_update = (*lds_update_map)[listener_name]; - // Get api_listener and decode it to http_connection_manager. - const envoy_config_listener_v3_ApiListener* api_listener = - envoy_config_listener_v3_Listener_api_listener(listener); - if (api_listener == nullptr) { - return GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "Listener has no ApiListener."); - } - const upb_strview encoded_api_listener = google_protobuf_Any_value( - envoy_config_listener_v3_ApiListener_api_listener(api_listener)); - const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* - http_connection_manager = - envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_parse( - encoded_api_listener.data, encoded_api_listener.size, arena); - if (http_connection_manager == nullptr) { - return GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "Could not parse HttpConnectionManager config from ApiListener"); - } - if (XdsTimeoutEnabled()) { - // Obtain max_stream_duration from Http Protocol Options. - const envoy_config_core_v3_HttpProtocolOptions* options = - envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_common_http_protocol_options( - http_connection_manager); - if (options != nullptr) { - const google_protobuf_Duration* duration = - envoy_config_core_v3_HttpProtocolOptions_max_stream_duration( - options); - if (duration != nullptr) { - lds_update.http_max_stream_duration.seconds = - google_protobuf_Duration_seconds(duration); - lds_update.http_max_stream_duration.nanos = - google_protobuf_Duration_nanos(duration); - } - } - } - // Found inlined route_config. Parse it to find the cluster_name. - if (envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_has_route_config( - http_connection_manager)) { - const envoy_config_route_v3_RouteConfiguration* route_config = - envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_route_config( - http_connection_manager); - XdsApi::RdsUpdate rds_update; - grpc_error* error = - RouteConfigParse(client, tracer, symtab, route_config, &rds_update); - if (error != GRPC_ERROR_NONE) return error; - lds_update.rds_update = std::move(rds_update); - continue; - } - // Validate that RDS must be used to get the route_config dynamically. - if (!envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_has_rds( - http_connection_manager)) { - return GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "HttpConnectionManager neither has inlined route_config nor RDS."); - } - const envoy_extensions_filters_network_http_connection_manager_v3_Rds* rds = - envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_rds( - http_connection_manager); - // Check that the ConfigSource specifies ADS. - const envoy_config_core_v3_ConfigSource* config_source = - envoy_extensions_filters_network_http_connection_manager_v3_Rds_config_source( - rds); - if (config_source == nullptr) { - return GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "HttpConnectionManager missing config_source for RDS."); - } - if (!envoy_config_core_v3_ConfigSource_has_ads(config_source)) { - return GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "HttpConnectionManager ConfigSource for RDS does not specify ADS."); - } - // Get the route_config_name. - lds_update.route_config_name = UpbStringToStdString( - envoy_extensions_filters_network_http_connection_manager_v3_Rds_route_config_name( - rds)); - } - return GRPC_ERROR_NONE; -} - -grpc_error* RdsResponseParse( - XdsClient* client, TraceFlag* tracer, upb_symtab* symtab, - const envoy_service_discovery_v3_DiscoveryResponse* response, - const std::set<absl::string_view>& expected_route_configuration_names, - XdsApi::RdsUpdateMap* rds_update_map, upb_arena* arena) { - // Get the resources from the response. - size_t size; - const google_protobuf_Any* const* resources = - envoy_service_discovery_v3_DiscoveryResponse_resources(response, &size); - for (size_t i = 0; i < size; ++i) { - // Check the type_url of the resource. - absl::string_view type_url = - UpbStringToAbsl(google_protobuf_Any_type_url(resources[i])); - if (!IsRds(type_url)) { - return GRPC_ERROR_CREATE_FROM_STATIC_STRING("Resource is not RDS."); - } - // Decode the route_config. - const upb_strview encoded_route_config = - google_protobuf_Any_value(resources[i]); - const envoy_config_route_v3_RouteConfiguration* route_config = - envoy_config_route_v3_RouteConfiguration_parse( - encoded_route_config.data, encoded_route_config.size, arena); - if (route_config == nullptr) { - return GRPC_ERROR_CREATE_FROM_STATIC_STRING("Can't decode route_config."); - } - // Check route_config_name. Ignore unexpected route_config. - std::string route_config_name = UpbStringToStdString( - envoy_config_route_v3_RouteConfiguration_name(route_config)); - if (expected_route_configuration_names.find(route_config_name) == - expected_route_configuration_names.end()) { - continue; - } - // Fail if route config name is duplicated. - if (rds_update_map->find(route_config_name) != rds_update_map->end()) { - return GRPC_ERROR_CREATE_FROM_COPIED_STRING( - absl::StrCat("duplicate route config name \"", route_config_name, - "\"") - .c_str()); - } - // Parse the route_config. - XdsApi::RdsUpdate& rds_update = - (*rds_update_map)[std::move(route_config_name)]; - grpc_error* error = - RouteConfigParse(client, tracer, symtab, route_config, &rds_update); - if (error != GRPC_ERROR_NONE) return error; - } - return GRPC_ERROR_NONE; -} - XdsApi::CommonTlsContext::CertificateProviderInstance CertificateProviderInstanceParse( const envoy_extensions_transport_sockets_tls_v3_CommonTlsContext_CertificateProviderInstance* @@ -1591,11 +1775,11 @@ CertificateProviderInstanceParse( certificate_provider_instance_proto))}; } -grpc_error* CommonTlsContextParse( +grpc_error_handle CommonTlsContextParse( const envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* common_tls_context_proto, XdsApi::CommonTlsContext* common_tls_context) GRPC_MUST_USE_RESULT; -grpc_error* CommonTlsContextParse( +grpc_error_handle CommonTlsContextParse( const envoy_extensions_transport_sockets_tls_v3_CommonTlsContext* common_tls_context_proto, XdsApi::CommonTlsContext* common_tls_context) { @@ -1612,35 +1796,35 @@ grpc_error* CommonTlsContextParse( envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_match_subject_alt_names( default_validation_context, &len); for (size_t i = 0; i < len; ++i) { - XdsApi::StringMatcher::StringMatcherType type; + StringMatcher::Type type; std::string matcher; if (envoy_type_matcher_v3_StringMatcher_has_exact( subject_alt_names_matchers[i])) { - type = XdsApi::StringMatcher::StringMatcherType::EXACT; + type = StringMatcher::Type::kExact; matcher = UpbStringToStdString(envoy_type_matcher_v3_StringMatcher_exact( subject_alt_names_matchers[i])); } else if (envoy_type_matcher_v3_StringMatcher_has_prefix( subject_alt_names_matchers[i])) { - type = XdsApi::StringMatcher::StringMatcherType::PREFIX; + type = StringMatcher::Type::kPrefix; matcher = UpbStringToStdString(envoy_type_matcher_v3_StringMatcher_prefix( subject_alt_names_matchers[i])); } else if (envoy_type_matcher_v3_StringMatcher_has_suffix( subject_alt_names_matchers[i])) { - type = XdsApi::StringMatcher::StringMatcherType::SUFFIX; + type = StringMatcher::Type::kSuffix; matcher = UpbStringToStdString(envoy_type_matcher_v3_StringMatcher_suffix( subject_alt_names_matchers[i])); } else if (envoy_type_matcher_v3_StringMatcher_has_contains( subject_alt_names_matchers[i])) { - type = XdsApi::StringMatcher::StringMatcherType::CONTAINS; + type = StringMatcher::Type::kContains; matcher = UpbStringToStdString(envoy_type_matcher_v3_StringMatcher_contains( subject_alt_names_matchers[i])); } else if (envoy_type_matcher_v3_StringMatcher_has_safe_regex( subject_alt_names_matchers[i])) { - type = XdsApi::StringMatcher::StringMatcherType::SAFE_REGEX; + type = StringMatcher::Type::kSafeRegex; auto* regex_matcher = envoy_type_matcher_v3_StringMatcher_safe_regex( subject_alt_names_matchers[i]); matcher = UpbStringToStdString( @@ -1651,20 +1835,22 @@ grpc_error* CommonTlsContextParse( } bool ignore_case = envoy_type_matcher_v3_StringMatcher_ignore_case( subject_alt_names_matchers[i]); - XdsApi::StringMatcher string_matcher(type, matcher, ignore_case); - if (type == XdsApi::StringMatcher::StringMatcherType::SAFE_REGEX) { - if (!string_matcher.regex_matcher()->ok()) { - return GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "Invalid regex string specified in string matcher."); - } - if (ignore_case) { - return GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "StringMatcher: ignore_case has no effect for SAFE_REGEX."); - } + absl::StatusOr<StringMatcher> string_matcher = + StringMatcher::Create(type, matcher, + /*case_sensitive=*/!ignore_case); + if (!string_matcher.ok()) { + return GRPC_ERROR_CREATE_FROM_COPIED_STRING( + absl::StrCat("string matcher: ", + string_matcher.status().message()) + .c_str()); + } + if (type == StringMatcher::Type::kSafeRegex && ignore_case) { + return GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "StringMatcher: ignore_case has no effect for SAFE_REGEX."); } common_tls_context->combined_validation_context .default_validation_context.match_subject_alt_names.push_back( - std::move(string_matcher)); + std::move(string_matcher.value())); } } auto* validation_context_certificate_provider_instance = @@ -1688,11 +1874,797 @@ grpc_error* CommonTlsContextParse( return GRPC_ERROR_NONE; } -grpc_error* CdsResponseParse( - XdsClient* client, TraceFlag* tracer, upb_symtab* symtab, +grpc_error_handle HttpConnectionManagerParse( + bool is_client, const EncodingContext& context, + const envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager* + http_connection_manager_proto, + bool is_v2, + XdsApi::LdsUpdate::HttpConnectionManager* http_connection_manager) { + MaybeLogHttpConnectionManager(context, http_connection_manager_proto); + // Obtain max_stream_duration from Http Protocol Options. + const envoy_config_core_v3_HttpProtocolOptions* options = + envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_common_http_protocol_options( + http_connection_manager_proto); + if (options != nullptr) { + const google_protobuf_Duration* duration = + envoy_config_core_v3_HttpProtocolOptions_max_stream_duration(options); + if (duration != nullptr) { + http_connection_manager->http_max_stream_duration.seconds = + google_protobuf_Duration_seconds(duration); + http_connection_manager->http_max_stream_duration.nanos = + google_protobuf_Duration_nanos(duration); + } + } + // Parse filters. + if (!is_v2) { + size_t num_filters = 0; + const auto* http_filters = + envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_http_filters( + http_connection_manager_proto, &num_filters); + std::set<absl::string_view> names_seen; + for (size_t i = 0; i < num_filters; ++i) { + const auto* http_filter = http_filters[i]; + absl::string_view name = UpbStringToAbsl( + envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_name( + http_filter)); + if (name.empty()) { + return GRPC_ERROR_CREATE_FROM_COPIED_STRING( + absl::StrCat("empty filter name at index ", i).c_str()); + } + if (names_seen.find(name) != names_seen.end()) { + return GRPC_ERROR_CREATE_FROM_COPIED_STRING( + absl::StrCat("duplicate HTTP filter name: ", name).c_str()); + } + names_seen.insert(name); + const bool is_optional = + envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_is_optional( + http_filter); + const google_protobuf_Any* any = + envoy_extensions_filters_network_http_connection_manager_v3_HttpFilter_typed_config( + http_filter); + if (any == nullptr) { + if (is_optional) continue; + return GRPC_ERROR_CREATE_FROM_COPIED_STRING( + absl::StrCat("no filter config specified for filter name ", name) + .c_str()); + } + absl::string_view filter_type; + grpc_error_handle error = + ExtractHttpFilterTypeName(context, any, &filter_type); + if (error != GRPC_ERROR_NONE) return error; + const XdsHttpFilterImpl* filter_impl = + XdsHttpFilterRegistry::GetFilterForType(filter_type); + if (filter_impl == nullptr) { + if (is_optional) continue; + return GRPC_ERROR_CREATE_FROM_COPIED_STRING( + absl::StrCat("no filter registered for config type ", filter_type) + .c_str()); + } + if ((is_client && !filter_impl->IsSupportedOnClients()) || + (!is_client && !filter_impl->IsSupportedOnServers())) { + if (is_optional) continue; + return GRPC_ERROR_CREATE_FROM_COPIED_STRING( + absl::StrFormat("Filter %s is not supported on %s", filter_type, + is_client ? "clients" : "servers") + .c_str()); + } + absl::StatusOr<XdsHttpFilterImpl::FilterConfig> filter_config = + filter_impl->GenerateFilterConfig(google_protobuf_Any_value(any), + context.arena); + if (!filter_config.ok()) { + return GRPC_ERROR_CREATE_FROM_COPIED_STRING( + absl::StrCat( + "filter config for type ", filter_type, + " failed to parse: ", filter_config.status().ToString()) + .c_str()); + } + http_connection_manager->http_filters.emplace_back( + XdsApi::LdsUpdate::HttpConnectionManager::HttpFilter{ + std::string(name), std::move(*filter_config)}); + } + } else { + // If using a v2 config, we just hard-code a list containing only the + // router filter without actually looking at the config. This ensures + // that the right thing happens in the xds resolver without having + // to expose whether the resource we received was v2 or v3. + http_connection_manager->http_filters.emplace_back( + XdsApi::LdsUpdate::HttpConnectionManager::HttpFilter{ + "router", {kXdsHttpRouterFilterConfigName, Json()}}); + } + if (is_client) { + // Found inlined route_config. Parse it to find the cluster_name. + if (envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_has_route_config( + http_connection_manager_proto)) { + const envoy_config_route_v3_RouteConfiguration* route_config = + envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_route_config( + http_connection_manager_proto); + XdsApi::RdsUpdate rds_update; + grpc_error_handle error = + RouteConfigParse(context, route_config, &rds_update); + if (error != GRPC_ERROR_NONE) return error; + http_connection_manager->rds_update = std::move(rds_update); + return GRPC_ERROR_NONE; + } + // Validate that RDS must be used to get the route_config dynamically. + const envoy_extensions_filters_network_http_connection_manager_v3_Rds* rds = + envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_rds( + http_connection_manager_proto); + if (rds == nullptr) { + return GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "HttpConnectionManager neither has inlined route_config nor RDS."); + } + // Check that the ConfigSource specifies ADS. + const envoy_config_core_v3_ConfigSource* config_source = + envoy_extensions_filters_network_http_connection_manager_v3_Rds_config_source( + rds); + if (config_source == nullptr) { + return GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "HttpConnectionManager missing config_source for RDS."); + } + if (!envoy_config_core_v3_ConfigSource_has_ads(config_source)) { + return GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "HttpConnectionManager ConfigSource for RDS does not specify ADS."); + } + // Get the route_config_name. + http_connection_manager->route_config_name = UpbStringToStdString( + envoy_extensions_filters_network_http_connection_manager_v3_Rds_route_config_name( + rds)); + } + return GRPC_ERROR_NONE; +} + +grpc_error_handle LdsResponseParseClient( + const EncodingContext& context, + const envoy_config_listener_v3_ApiListener* api_listener, bool is_v2, + XdsApi::LdsUpdate* lds_update) { + lds_update->type = XdsApi::LdsUpdate::ListenerType::kHttpApiListener; + const upb_strview encoded_api_listener = google_protobuf_Any_value( + envoy_config_listener_v3_ApiListener_api_listener(api_listener)); + const auto* http_connection_manager = + envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_parse( + encoded_api_listener.data, encoded_api_listener.size, context.arena); + if (http_connection_manager == nullptr) { + return GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "Could not parse HttpConnectionManager config from ApiListener"); + } + return HttpConnectionManagerParse(true /* is_client */, context, + http_connection_manager, is_v2, + &lds_update->http_connection_manager); +} + +grpc_error_handle DownstreamTlsContextParse( + const EncodingContext& context, + const envoy_config_core_v3_TransportSocket* transport_socket, + XdsApi::DownstreamTlsContext* downstream_tls_context) { + absl::string_view name = UpbStringToAbsl( + envoy_config_core_v3_TransportSocket_name(transport_socket)); + if (name == "envoy.transport_sockets.tls") { + auto* typed_config = + envoy_config_core_v3_TransportSocket_typed_config(transport_socket); + if (typed_config != nullptr) { + const upb_strview encoded_downstream_tls_context = + google_protobuf_Any_value(typed_config); + auto* downstream_tls_context_proto = + envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_parse( + encoded_downstream_tls_context.data, + encoded_downstream_tls_context.size, context.arena); + if (downstream_tls_context_proto == nullptr) { + return GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "Can't decode downstream tls context."); + } + auto* common_tls_context = + envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_common_tls_context( + downstream_tls_context_proto); + if (common_tls_context != nullptr) { + grpc_error_handle error = CommonTlsContextParse( + common_tls_context, &downstream_tls_context->common_tls_context); + if (error != GRPC_ERROR_NONE) return error; + } + auto* require_client_certificate = + envoy_extensions_transport_sockets_tls_v3_DownstreamTlsContext_require_client_certificate( + downstream_tls_context_proto); + if (require_client_certificate != nullptr) { + downstream_tls_context->require_client_certificate = + google_protobuf_BoolValue_value(require_client_certificate); + } + } + if (downstream_tls_context->common_tls_context + .tls_certificate_certificate_provider_instance.instance_name + .empty()) { + return GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "TLS configuration provided but no " + "tls_certificate_certificate_provider_instance found."); + } + } + return GRPC_ERROR_NONE; +} + +grpc_error_handle CidrRangeParse( + const envoy_config_core_v3_CidrRange* cidr_range_proto, + XdsApi::LdsUpdate::FilterChainMap::CidrRange* cidr_range) { + std::string address_prefix = UpbStringToStdString( + envoy_config_core_v3_CidrRange_address_prefix(cidr_range_proto)); + grpc_error_handle error = + grpc_string_to_sockaddr(&cidr_range->address, address_prefix.c_str(), 0); + if (error != GRPC_ERROR_NONE) return error; + cidr_range->prefix_len = 0; + auto* prefix_len_proto = + envoy_config_core_v3_CidrRange_prefix_len(cidr_range_proto); + if (prefix_len_proto != nullptr) { + cidr_range->prefix_len = std::min( + google_protobuf_UInt32Value_value(prefix_len_proto), + (reinterpret_cast<const grpc_sockaddr*>(cidr_range->address.addr)) + ->sa_family == GRPC_AF_INET + ? uint32_t(32) + : uint32_t(128)); + } + // Normalize the network address by masking it with prefix_len + grpc_sockaddr_mask_bits(&cidr_range->address, cidr_range->prefix_len); + return GRPC_ERROR_NONE; +} + +grpc_error_handle FilterChainMatchParse( + const envoy_config_listener_v3_FilterChainMatch* filter_chain_match_proto, + FilterChain::FilterChainMatch* filter_chain_match) { + auto* destination_port = + envoy_config_listener_v3_FilterChainMatch_destination_port( + filter_chain_match_proto); + if (destination_port != nullptr) { + filter_chain_match->destination_port = + google_protobuf_UInt32Value_value(destination_port); + } + size_t size = 0; + auto* prefix_ranges = envoy_config_listener_v3_FilterChainMatch_prefix_ranges( + filter_chain_match_proto, &size); + filter_chain_match->prefix_ranges.reserve(size); + for (size_t i = 0; i < size; i++) { + XdsApi::LdsUpdate::FilterChainMap::CidrRange cidr_range; + grpc_error_handle error = CidrRangeParse(prefix_ranges[i], &cidr_range); + if (error != GRPC_ERROR_NONE) return error; + filter_chain_match->prefix_ranges.push_back(cidr_range); + } + filter_chain_match->source_type = + static_cast<XdsApi::LdsUpdate::FilterChainMap::ConnectionSourceType>( + envoy_config_listener_v3_FilterChainMatch_source_type( + filter_chain_match_proto)); + auto* source_prefix_ranges = + envoy_config_listener_v3_FilterChainMatch_source_prefix_ranges( + filter_chain_match_proto, &size); + filter_chain_match->source_prefix_ranges.reserve(size); + for (size_t i = 0; i < size; i++) { + XdsApi::LdsUpdate::FilterChainMap::CidrRange cidr_range; + grpc_error_handle error = + CidrRangeParse(source_prefix_ranges[i], &cidr_range); + if (error != GRPC_ERROR_NONE) return error; + filter_chain_match->source_prefix_ranges.push_back(cidr_range); + } + auto* source_ports = envoy_config_listener_v3_FilterChainMatch_source_ports( + filter_chain_match_proto, &size); + filter_chain_match->source_ports.reserve(size); + for (size_t i = 0; i < size; i++) { + filter_chain_match->source_ports.push_back(source_ports[i]); + } + auto* server_names = envoy_config_listener_v3_FilterChainMatch_server_names( + filter_chain_match_proto, &size); + for (size_t i = 0; i < size; i++) { + filter_chain_match->server_names.push_back( + UpbStringToStdString(server_names[i])); + } + filter_chain_match->transport_protocol = UpbStringToStdString( + envoy_config_listener_v3_FilterChainMatch_transport_protocol( + filter_chain_match_proto)); + auto* application_protocols = + envoy_config_listener_v3_FilterChainMatch_application_protocols( + filter_chain_match_proto, &size); + for (size_t i = 0; i < size; i++) { + filter_chain_match->application_protocols.push_back( + UpbStringToStdString(application_protocols[i])); + } + return GRPC_ERROR_NONE; +} + +grpc_error_handle FilterChainParse( + const EncodingContext& context, + const envoy_config_listener_v3_FilterChain* filter_chain_proto, bool is_v2, + FilterChain* filter_chain) { + grpc_error_handle error = GRPC_ERROR_NONE; + auto* filter_chain_match = + envoy_config_listener_v3_FilterChain_filter_chain_match( + filter_chain_proto); + if (filter_chain_match != nullptr) { + error = FilterChainMatchParse(filter_chain_match, + &filter_chain->filter_chain_match); + if (error != GRPC_ERROR_NONE) return error; + } + // Parse the filters list. Currently we only support HttpConnectionManager. + size_t size = 0; + auto* filters = + envoy_config_listener_v3_FilterChain_filters(filter_chain_proto, &size); + if (size != 1) { + return GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "FilterChain should have exactly one filter: HttpConnectionManager; no " + "other filter is supported at the moment"); + } + auto* typed_config = envoy_config_listener_v3_Filter_typed_config(filters[0]); + if (typed_config == nullptr) { + return GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "No typed_config found in filter."); + } + absl::string_view type_url = + UpbStringToAbsl(google_protobuf_Any_type_url(typed_config)); + if (type_url != + "type.googleapis.com/" + "envoy.extensions.filters.network.http_connection_manager.v3." + "HttpConnectionManager") { + return GRPC_ERROR_CREATE_FROM_COPIED_STRING( + absl::StrCat("Unsupported filter type ", type_url).c_str()); + } + const upb_strview encoded_http_connection_manager = + google_protobuf_Any_value(typed_config); + const auto* http_connection_manager = + envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_parse( + encoded_http_connection_manager.data, + encoded_http_connection_manager.size, context.arena); + if (http_connection_manager == nullptr) { + return GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "Could not parse HttpConnectionManager config from filter " + "typed_config"); + } + filter_chain->filter_chain_data = + std::make_shared<XdsApi::LdsUpdate::FilterChainData>(); + error = HttpConnectionManagerParse( + false /* is_client */, context, http_connection_manager, is_v2, + &filter_chain->filter_chain_data->http_connection_manager); + if (error != GRPC_ERROR_NONE) return error; + // Get the DownstreamTlsContext for the filter chain + if (XdsSecurityEnabled()) { + auto* transport_socket = + envoy_config_listener_v3_FilterChain_transport_socket( + filter_chain_proto); + if (transport_socket != nullptr) { + error = DownstreamTlsContextParse( + context, transport_socket, + &filter_chain->filter_chain_data->downstream_tls_context); + } + } + return error; +} + +grpc_error_handle AddressParse( + const envoy_config_core_v3_Address* address_proto, std::string* address) { + const auto* socket_address = + envoy_config_core_v3_Address_socket_address(address_proto); + if (socket_address == nullptr) { + return GRPC_ERROR_CREATE_FROM_COPIED_STRING( + "Address does not have socket_address"); + } + if (envoy_config_core_v3_SocketAddress_protocol(socket_address) != + envoy_config_core_v3_SocketAddress_TCP) { + return GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "SocketAddress protocol is not TCP"); + } + uint32_t port = envoy_config_core_v3_SocketAddress_port_value(socket_address); + if (port > 65535) { + return GRPC_ERROR_CREATE_FROM_STATIC_STRING("Invalid port"); + } + *address = JoinHostPort( + UpbStringToAbsl( + envoy_config_core_v3_SocketAddress_address(socket_address)), + port); + return GRPC_ERROR_NONE; +} + +// An intermediate map for filter chains that we create to validate the list of +// filter chains received from the control plane and to finally create +// XdsApi::LdsUpdate::FilterChainMap +struct InternalFilterChainMap { + using SourceIpMap = + std::map<std::string, XdsApi::LdsUpdate::FilterChainMap::SourceIp>; + using ConnectionSourceTypesArray = std::array<SourceIpMap, 3>; + struct DestinationIp { + absl::optional<XdsApi::LdsUpdate::FilterChainMap::CidrRange> prefix_range; + bool transport_protocol_raw_buffer_provided = false; + ConnectionSourceTypesArray source_types_array; + }; + using DestinationIpMap = std::map<std::string, DestinationIp>; + DestinationIpMap destination_ip_map; +}; + +grpc_error_handle AddFilterChainDataForSourcePort( + const FilterChain& filter_chain, + XdsApi::LdsUpdate::FilterChainMap::SourcePortsMap* ports_map, + uint32_t port) { + auto insert_result = ports_map->emplace( + port, XdsApi::LdsUpdate::FilterChainMap::FilterChainDataSharedPtr{ + filter_chain.filter_chain_data}); + if (!insert_result.second) { + return GRPC_ERROR_CREATE_FROM_COPIED_STRING( + absl::StrCat( + "Duplicate matching rules detected when adding filter chain: ", + filter_chain.filter_chain_match.ToString()) + .c_str()); + } + return GRPC_ERROR_NONE; +} + +grpc_error_handle AddFilterChainDataForSourcePorts( + const FilterChain& filter_chain, + XdsApi::LdsUpdate::FilterChainMap::SourcePortsMap* ports_map) { + if (filter_chain.filter_chain_match.source_ports.empty()) { + return AddFilterChainDataForSourcePort(filter_chain, ports_map, 0); + } else { + for (uint32_t port : filter_chain.filter_chain_match.source_ports) { + grpc_error_handle error = + AddFilterChainDataForSourcePort(filter_chain, ports_map, port); + if (error != GRPC_ERROR_NONE) return error; + } + } + return GRPC_ERROR_NONE; +} + +grpc_error_handle AddFilterChainDataForSourceIpRange( + const FilterChain& filter_chain, + InternalFilterChainMap::SourceIpMap* source_ip_map) { + if (filter_chain.filter_chain_match.source_prefix_ranges.empty()) { + auto insert_result = source_ip_map->emplace( + "", XdsApi::LdsUpdate::FilterChainMap::SourceIp()); + return AddFilterChainDataForSourcePorts( + filter_chain, &insert_result.first->second.ports_map); + } else { + for (const auto& prefix_range : + filter_chain.filter_chain_match.source_prefix_ranges) { + auto insert_result = source_ip_map->emplace( + absl::StrCat(grpc_sockaddr_to_string(&prefix_range.address, false), + "/", prefix_range.prefix_len), + XdsApi::LdsUpdate::FilterChainMap::SourceIp()); + if (insert_result.second) { + insert_result.first->second.prefix_range.emplace(prefix_range); + } + grpc_error_handle error = AddFilterChainDataForSourcePorts( + filter_chain, &insert_result.first->second.ports_map); + if (error != GRPC_ERROR_NONE) return error; + } + } + return GRPC_ERROR_NONE; +} + +grpc_error_handle AddFilterChainDataForSourceType( + const FilterChain& filter_chain, + InternalFilterChainMap::DestinationIp* destination_ip) { + GPR_ASSERT(static_cast<unsigned int>( + filter_chain.filter_chain_match.source_type) < 3); + return AddFilterChainDataForSourceIpRange( + filter_chain, &destination_ip->source_types_array[static_cast<int>( + filter_chain.filter_chain_match.source_type)]); +} + +grpc_error_handle AddFilterChainDataForApplicationProtocols( + const FilterChain& filter_chain, + InternalFilterChainMap::DestinationIp* destination_ip) { + // Only allow filter chains that do not mention application protocols + if (!filter_chain.filter_chain_match.application_protocols.empty()) { + return GRPC_ERROR_NONE; + } + return AddFilterChainDataForSourceType(filter_chain, destination_ip); +} + +grpc_error_handle AddFilterChainDataForTransportProtocol( + const FilterChain& filter_chain, + InternalFilterChainMap::DestinationIp* destination_ip) { + const std::string& transport_protocol = + filter_chain.filter_chain_match.transport_protocol; + // Only allow filter chains with no transport protocol or "raw_buffer" + if (!transport_protocol.empty() && transport_protocol != "raw_buffer") { + return GRPC_ERROR_NONE; + } + // If for this configuration, we've already seen filter chains that mention + // the transport protocol as "raw_buffer", we will never match filter chains + // that do not mention it. + if (destination_ip->transport_protocol_raw_buffer_provided && + transport_protocol.empty()) { + return GRPC_ERROR_NONE; + } + if (!transport_protocol.empty() && + !destination_ip->transport_protocol_raw_buffer_provided) { + destination_ip->transport_protocol_raw_buffer_provided = true; + // Clear out the previous entries if any since those entries did not mention + // "raw_buffer" + destination_ip->source_types_array = + InternalFilterChainMap::ConnectionSourceTypesArray(); + } + return AddFilterChainDataForApplicationProtocols(filter_chain, + destination_ip); +} + +grpc_error_handle AddFilterChainDataForServerNames( + const FilterChain& filter_chain, + InternalFilterChainMap::DestinationIp* destination_ip) { + // Don't continue adding filter chains with server names mentioned + if (!filter_chain.filter_chain_match.server_names.empty()) { + return GRPC_ERROR_NONE; + } + return AddFilterChainDataForTransportProtocol(filter_chain, destination_ip); +} + +grpc_error_handle AddFilterChainDataForDestinationIpRange( + const FilterChain& filter_chain, + InternalFilterChainMap::DestinationIpMap* destination_ip_map) { + if (filter_chain.filter_chain_match.prefix_ranges.empty()) { + auto insert_result = destination_ip_map->emplace( + "", InternalFilterChainMap::DestinationIp()); + return AddFilterChainDataForServerNames(filter_chain, + &insert_result.first->second); + } else { + for (const auto& prefix_range : + filter_chain.filter_chain_match.prefix_ranges) { + auto insert_result = destination_ip_map->emplace( + absl::StrCat(grpc_sockaddr_to_string(&prefix_range.address, false), + "/", prefix_range.prefix_len), + InternalFilterChainMap::DestinationIp()); + if (insert_result.second) { + insert_result.first->second.prefix_range.emplace(prefix_range); + } + grpc_error_handle error = AddFilterChainDataForServerNames( + filter_chain, &insert_result.first->second); + if (error != GRPC_ERROR_NONE) return error; + } + } + return GRPC_ERROR_NONE; +} + +XdsApi::LdsUpdate::FilterChainMap BuildFromInternalFilterChainMap( + InternalFilterChainMap* internal_filter_chain_map) { + XdsApi::LdsUpdate::FilterChainMap filter_chain_map; + for (auto& destination_ip_pair : + internal_filter_chain_map->destination_ip_map) { + XdsApi::LdsUpdate::FilterChainMap::DestinationIp destination_ip; + destination_ip.prefix_range = destination_ip_pair.second.prefix_range; + for (int i = 0; i < 3; i++) { + auto& source_ip_map = destination_ip_pair.second.source_types_array[i]; + for (auto& source_ip_pair : source_ip_map) { + destination_ip.source_types_array[i].push_back( + std::move(source_ip_pair.second)); + } + } + filter_chain_map.destination_ip_vector.push_back(std::move(destination_ip)); + } + return filter_chain_map; +} + +grpc_error_handle BuildFilterChainMap( + const std::vector<FilterChain>& filter_chains, + XdsApi::LdsUpdate::FilterChainMap* filter_chain_map) { + InternalFilterChainMap internal_filter_chain_map; + for (const auto& filter_chain : filter_chains) { + // Discard filter chain entries that specify destination port + if (filter_chain.filter_chain_match.destination_port != 0) continue; + grpc_error_handle error = AddFilterChainDataForDestinationIpRange( + filter_chain, &internal_filter_chain_map.destination_ip_map); + if (error != GRPC_ERROR_NONE) return error; + } + *filter_chain_map = + BuildFromInternalFilterChainMap(&internal_filter_chain_map); + return GRPC_ERROR_NONE; +} + +grpc_error_handle LdsResponseParseServer( + const EncodingContext& context, + const envoy_config_listener_v3_Listener* listener, bool is_v2, + XdsApi::LdsUpdate* lds_update) { + lds_update->type = XdsApi::LdsUpdate::ListenerType::kTcpListener; + grpc_error_handle error = + AddressParse(envoy_config_listener_v3_Listener_address(listener), + &lds_update->address); + if (error != GRPC_ERROR_NONE) return error; + const auto* use_original_dst = + envoy_config_listener_v3_Listener_use_original_dst(listener); + if (use_original_dst != nullptr) { + if (google_protobuf_BoolValue_value(use_original_dst)) { + return GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "Field \'use_original_dst\' is not supported."); + } + } + size_t size = 0; + auto* filter_chains = + envoy_config_listener_v3_Listener_filter_chains(listener, &size); + std::vector<FilterChain> parsed_filter_chains; + parsed_filter_chains.reserve(size); + for (size_t i = 0; i < size; i++) { + FilterChain filter_chain; + error = FilterChainParse(context, filter_chains[i], is_v2, &filter_chain); + if (error != GRPC_ERROR_NONE) return error; + parsed_filter_chains.push_back(std::move(filter_chain)); + } + error = + BuildFilterChainMap(parsed_filter_chains, &lds_update->filter_chain_map); + if (error != GRPC_ERROR_NONE) return error; + auto* default_filter_chain = + envoy_config_listener_v3_Listener_default_filter_chain(listener); + if (default_filter_chain != nullptr) { + FilterChain filter_chain; + error = + FilterChainParse(context, default_filter_chain, is_v2, &filter_chain); + if (error != GRPC_ERROR_NONE) return error; + if (filter_chain.filter_chain_data != nullptr) { + lds_update->default_filter_chain = + std::move(*filter_chain.filter_chain_data); + } + } + if (size == 0 && default_filter_chain == nullptr) { + return GRPC_ERROR_CREATE_FROM_STATIC_STRING("No filter chain provided."); + } + return GRPC_ERROR_NONE; +} + +grpc_error_handle LdsResponseParse( + const EncodingContext& context, + const envoy_service_discovery_v3_DiscoveryResponse* response, + const std::set<absl::string_view>& expected_listener_names, + XdsApi::LdsUpdateMap* lds_update_map, + std::set<std::string>* resource_names_failed) { + std::vector<grpc_error_handle> errors; + // Get the resources from the response. + size_t size; + const google_protobuf_Any* const* resources = + envoy_service_discovery_v3_DiscoveryResponse_resources(response, &size); + for (size_t i = 0; i < size; ++i) { + // Check the type_url of the resource. + absl::string_view type_url = + UpbStringToAbsl(google_protobuf_Any_type_url(resources[i])); + bool is_v2 = false; + if (!IsLds(type_url, &is_v2)) { + errors.push_back(GRPC_ERROR_CREATE_FROM_COPIED_STRING( + absl::StrCat("resource index ", i, ": Resource is not LDS.") + .c_str())); + continue; + } + // Decode the listener. + const upb_strview encoded_listener = + google_protobuf_Any_value(resources[i]); + const envoy_config_listener_v3_Listener* listener = + envoy_config_listener_v3_Listener_parse( + encoded_listener.data, encoded_listener.size, context.arena); + if (listener == nullptr) { + errors.push_back(GRPC_ERROR_CREATE_FROM_COPIED_STRING( + absl::StrCat("resource index ", i, ": Can't decode listener.") + .c_str())); + continue; + } + // Check listener name. Ignore unexpected listeners. + std::string listener_name = + UpbStringToStdString(envoy_config_listener_v3_Listener_name(listener)); + if (expected_listener_names.find(listener_name) == + expected_listener_names.end()) { + continue; + } + // Fail if listener name is duplicated. + if (lds_update_map->find(listener_name) != lds_update_map->end()) { + errors.push_back(GRPC_ERROR_CREATE_FROM_COPIED_STRING( + absl::StrCat("duplicate listener name \"", listener_name, "\"") + .c_str())); + resource_names_failed->insert(listener_name); + continue; + } + // Serialize into JSON and store it in the LdsUpdateMap + XdsApi::LdsResourceData& lds_resource_data = + (*lds_update_map)[listener_name]; + XdsApi::LdsUpdate& lds_update = lds_resource_data.resource; + lds_resource_data.serialized_proto = UpbStringToStdString(encoded_listener); + // Check whether it's a client or server listener. + const envoy_config_listener_v3_ApiListener* api_listener = + envoy_config_listener_v3_Listener_api_listener(listener); + const envoy_config_core_v3_Address* address = + envoy_config_listener_v3_Listener_address(listener); + if (api_listener != nullptr && address != nullptr) { + errors.push_back(GRPC_ERROR_CREATE_FROM_COPIED_STRING( + absl::StrCat(listener_name, + ": Listener has both address and ApiListener") + .c_str())); + resource_names_failed->insert(listener_name); + continue; + } + if (api_listener == nullptr && address == nullptr) { + errors.push_back(GRPC_ERROR_CREATE_FROM_COPIED_STRING( + absl::StrCat(listener_name, + ": Listener has neither address nor ApiListener") + .c_str())); + resource_names_failed->insert(listener_name); + continue; + } + grpc_error_handle error = GRPC_ERROR_NONE; + if (api_listener != nullptr) { + error = LdsResponseParseClient(context, api_listener, is_v2, &lds_update); + } else { + error = LdsResponseParseServer(context, listener, is_v2, &lds_update); + } + if (error != GRPC_ERROR_NONE) { + errors.push_back(grpc_error_add_child( + GRPC_ERROR_CREATE_FROM_COPIED_STRING( + absl::StrCat(listener_name, ": validation error").c_str()), + error)); + resource_names_failed->insert(listener_name); + } + } + return GRPC_ERROR_CREATE_FROM_VECTOR("errors parsing LDS response", &errors); +} + +grpc_error_handle RdsResponseParse( + const EncodingContext& context, + const envoy_service_discovery_v3_DiscoveryResponse* response, + const std::set<absl::string_view>& expected_route_configuration_names, + XdsApi::RdsUpdateMap* rds_update_map, + std::set<std::string>* resource_names_failed) { + std::vector<grpc_error_handle> errors; + // Get the resources from the response. + size_t size; + const google_protobuf_Any* const* resources = + envoy_service_discovery_v3_DiscoveryResponse_resources(response, &size); + for (size_t i = 0; i < size; ++i) { + // Check the type_url of the resource. + absl::string_view type_url = + UpbStringToAbsl(google_protobuf_Any_type_url(resources[i])); + if (!IsRds(type_url)) { + errors.push_back(GRPC_ERROR_CREATE_FROM_COPIED_STRING( + absl::StrCat("resource index ", i, ": Resource is not RDS.") + .c_str())); + continue; + } + // Decode the route_config. + const upb_strview encoded_route_config = + google_protobuf_Any_value(resources[i]); + const envoy_config_route_v3_RouteConfiguration* route_config = + envoy_config_route_v3_RouteConfiguration_parse( + encoded_route_config.data, encoded_route_config.size, + context.arena); + if (route_config == nullptr) { + errors.push_back(GRPC_ERROR_CREATE_FROM_COPIED_STRING( + absl::StrCat("resource index ", i, ": Can't decode route_config.") + .c_str())); + continue; + } + // Check route_config_name. Ignore unexpected route_config. + std::string route_config_name = UpbStringToStdString( + envoy_config_route_v3_RouteConfiguration_name(route_config)); + if (expected_route_configuration_names.find(route_config_name) == + expected_route_configuration_names.end()) { + continue; + } + // Fail if route config name is duplicated. + if (rds_update_map->find(route_config_name) != rds_update_map->end()) { + errors.push_back(GRPC_ERROR_CREATE_FROM_COPIED_STRING( + absl::StrCat("duplicate route config name \"", route_config_name, + "\"") + .c_str())); + resource_names_failed->insert(route_config_name); + continue; + } + // Serialize into JSON and store it in the RdsUpdateMap + XdsApi::RdsResourceData& rds_resource_data = + (*rds_update_map)[route_config_name]; + XdsApi::RdsUpdate& rds_update = rds_resource_data.resource; + rds_resource_data.serialized_proto = + UpbStringToStdString(encoded_route_config); + // Parse the route_config. + grpc_error_handle error = + RouteConfigParse(context, route_config, &rds_update); + if (error != GRPC_ERROR_NONE) { + errors.push_back(grpc_error_add_child( + GRPC_ERROR_CREATE_FROM_COPIED_STRING( + absl::StrCat(route_config_name, ": validation error").c_str()), + error)); + resource_names_failed->insert(route_config_name); + } + } + return GRPC_ERROR_CREATE_FROM_VECTOR("errors parsing RDS response", &errors); +} + +grpc_error_handle CdsResponseParse( + const EncodingContext& context, const envoy_service_discovery_v3_DiscoveryResponse* response, const std::set<absl::string_view>& expected_cluster_names, - XdsApi::CdsUpdateMap* cds_update_map, upb_arena* arena) { + XdsApi::CdsUpdateMap* cds_update_map, + std::set<std::string>* resource_names_failed) { + std::vector<grpc_error_handle> errors; // Get the resources from the response. size_t size; const google_protobuf_Any* const* resources = @@ -1703,17 +2675,23 @@ grpc_error* CdsResponseParse( absl::string_view type_url = UpbStringToAbsl(google_protobuf_Any_type_url(resources[i])); if (!IsCds(type_url)) { - return GRPC_ERROR_CREATE_FROM_STATIC_STRING("Resource is not CDS."); + errors.push_back(GRPC_ERROR_CREATE_FROM_COPIED_STRING( + absl::StrCat("resource index ", i, ": Resource is not CDS.") + .c_str())); + continue; } // Decode the cluster. const upb_strview encoded_cluster = google_protobuf_Any_value(resources[i]); const envoy_config_cluster_v3_Cluster* cluster = - envoy_config_cluster_v3_Cluster_parse(encoded_cluster.data, - encoded_cluster.size, arena); + envoy_config_cluster_v3_Cluster_parse( + encoded_cluster.data, encoded_cluster.size, context.arena); if (cluster == nullptr) { - return GRPC_ERROR_CREATE_FROM_STATIC_STRING("Can't decode cluster."); + errors.push_back(GRPC_ERROR_CREATE_FROM_COPIED_STRING( + absl::StrCat("resource index ", i, ": Can't decode cluster.") + .c_str())); + continue; } - MaybeLogCluster(client, tracer, symtab, cluster); + MaybeLogCluster(context, cluster); // Ignore unexpected cluster names. std::string cluster_name = UpbStringToStdString(envoy_config_cluster_v3_Cluster_name(cluster)); @@ -1723,41 +2701,194 @@ grpc_error* CdsResponseParse( } // Fail on duplicate resources. if (cds_update_map->find(cluster_name) != cds_update_map->end()) { - return GRPC_ERROR_CREATE_FROM_COPIED_STRING( + errors.push_back(GRPC_ERROR_CREATE_FROM_COPIED_STRING( absl::StrCat("duplicate resource name \"", cluster_name, "\"") - .c_str()); + .c_str())); + resource_names_failed->insert(cluster_name); + continue; } - XdsApi::CdsUpdate& cds_update = (*cds_update_map)[std::move(cluster_name)]; + // Serialize into JSON and store it in the CdsUpdateMap + XdsApi::CdsResourceData& cds_resource_data = + (*cds_update_map)[cluster_name]; + XdsApi::CdsUpdate& cds_update = cds_resource_data.resource; + cds_resource_data.serialized_proto = UpbStringToStdString(encoded_cluster); // Check the cluster_discovery_type. - if (!envoy_config_cluster_v3_Cluster_has_type(cluster)) { - return GRPC_ERROR_CREATE_FROM_STATIC_STRING("DiscoveryType not found."); + if (!envoy_config_cluster_v3_Cluster_has_type(cluster) && + !envoy_config_cluster_v3_Cluster_has_cluster_type(cluster)) { + errors.push_back(GRPC_ERROR_CREATE_FROM_COPIED_STRING( + absl::StrCat(cluster_name, ": DiscoveryType not found.").c_str())); + resource_names_failed->insert(cluster_name); + continue; } - if (envoy_config_cluster_v3_Cluster_type(cluster) != + if (envoy_config_cluster_v3_Cluster_type(cluster) == envoy_config_cluster_v3_Cluster_EDS) { - return GRPC_ERROR_CREATE_FROM_STATIC_STRING("DiscoveryType is not EDS."); - } - // Check the EDS config source. - const envoy_config_cluster_v3_Cluster_EdsClusterConfig* eds_cluster_config = - envoy_config_cluster_v3_Cluster_eds_cluster_config(cluster); - const envoy_config_core_v3_ConfigSource* eds_config = - envoy_config_cluster_v3_Cluster_EdsClusterConfig_eds_config( - eds_cluster_config); - if (!envoy_config_core_v3_ConfigSource_has_ads(eds_config)) { - return GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "EDS ConfigSource is not ADS."); - } - // Record EDS service_name (if any). - upb_strview service_name = - envoy_config_cluster_v3_Cluster_EdsClusterConfig_service_name( - eds_cluster_config); - if (service_name.size != 0) { - cds_update.eds_service_name = UpbStringToStdString(service_name); + cds_update.cluster_type = XdsApi::CdsUpdate::ClusterType::EDS; + // Check the EDS config source. + const envoy_config_cluster_v3_Cluster_EdsClusterConfig* + eds_cluster_config = + envoy_config_cluster_v3_Cluster_eds_cluster_config(cluster); + const envoy_config_core_v3_ConfigSource* eds_config = + envoy_config_cluster_v3_Cluster_EdsClusterConfig_eds_config( + eds_cluster_config); + if (!envoy_config_core_v3_ConfigSource_has_ads(eds_config)) { + errors.push_back(GRPC_ERROR_CREATE_FROM_COPIED_STRING( + absl::StrCat(cluster_name, ": EDS ConfigSource is not ADS.") + .c_str())); + resource_names_failed->insert(cluster_name); + continue; + } + // Record EDS service_name (if any). + upb_strview service_name = + envoy_config_cluster_v3_Cluster_EdsClusterConfig_service_name( + eds_cluster_config); + if (service_name.size != 0) { + cds_update.eds_service_name = UpbStringToStdString(service_name); + } + } else if (!XdsAggregateAndLogicalDnsClusterEnabled()) { + errors.push_back(GRPC_ERROR_CREATE_FROM_COPIED_STRING( + absl::StrCat(cluster_name, ": DiscoveryType is not valid.").c_str())); + resource_names_failed->insert(cluster_name); + continue; + } else if (envoy_config_cluster_v3_Cluster_type(cluster) == + envoy_config_cluster_v3_Cluster_LOGICAL_DNS) { + cds_update.cluster_type = XdsApi::CdsUpdate::ClusterType::LOGICAL_DNS; + } else { + if (envoy_config_cluster_v3_Cluster_has_cluster_type(cluster)) { + const envoy_config_cluster_v3_Cluster_CustomClusterType* + custom_cluster_type = + envoy_config_cluster_v3_Cluster_cluster_type(cluster); + upb_strview type_name = + envoy_config_cluster_v3_Cluster_CustomClusterType_name( + custom_cluster_type); + if (UpbStringToAbsl(type_name) == "envoy.clusters.aggregate") { + cds_update.cluster_type = XdsApi::CdsUpdate::ClusterType::AGGREGATE; + // Retrieve aggregate clusters. + const google_protobuf_Any* typed_config = + envoy_config_cluster_v3_Cluster_CustomClusterType_typed_config( + custom_cluster_type); + const upb_strview aggregate_cluster_config_upb_strview = + google_protobuf_Any_value(typed_config); + const envoy_extensions_clusters_aggregate_v3_ClusterConfig* + aggregate_cluster_config = + envoy_extensions_clusters_aggregate_v3_ClusterConfig_parse( + aggregate_cluster_config_upb_strview.data, + aggregate_cluster_config_upb_strview.size, context.arena); + if (aggregate_cluster_config == nullptr) { + errors.push_back(GRPC_ERROR_CREATE_FROM_COPIED_STRING( + absl::StrCat(cluster_name, ": Can't parse aggregate cluster.") + .c_str())); + resource_names_failed->insert(cluster_name); + continue; + } + size_t size; + const upb_strview* clusters = + envoy_extensions_clusters_aggregate_v3_ClusterConfig_clusters( + aggregate_cluster_config, &size); + for (size_t i = 0; i < size; ++i) { + const upb_strview cluster = clusters[i]; + cds_update.prioritized_cluster_names.emplace_back( + UpbStringToStdString(cluster)); + } + } else { + errors.push_back(GRPC_ERROR_CREATE_FROM_COPIED_STRING( + absl::StrCat(cluster_name, ": DiscoveryType is not valid.") + .c_str())); + resource_names_failed->insert(cluster_name); + continue; + } + } else { + errors.push_back(GRPC_ERROR_CREATE_FROM_COPIED_STRING( + absl::StrCat(cluster_name, ": DiscoveryType is not valid.") + .c_str())); + resource_names_failed->insert(cluster_name); + continue; + } } // Check the LB policy. - if (envoy_config_cluster_v3_Cluster_lb_policy(cluster) != + if (envoy_config_cluster_v3_Cluster_lb_policy(cluster) == envoy_config_cluster_v3_Cluster_ROUND_ROBIN) { - return GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "LB policy is not ROUND_ROBIN."); + cds_update.lb_policy = "ROUND_ROBIN"; + } else if (XdsRingHashEnabled() && + envoy_config_cluster_v3_Cluster_lb_policy(cluster) == + envoy_config_cluster_v3_Cluster_RING_HASH) { + cds_update.lb_policy = "RING_HASH"; + // Record ring hash lb config + auto* ring_hash_config = + envoy_config_cluster_v3_Cluster_ring_hash_lb_config(cluster); + if (ring_hash_config == nullptr) { + errors.push_back(GRPC_ERROR_CREATE_FROM_COPIED_STRING( + absl::StrCat(cluster_name, + ": ring hash lb config required but not present.") + .c_str())); + resource_names_failed->insert(cluster_name); + continue; + } + const google_protobuf_UInt64Value* max_ring_size = + envoy_config_cluster_v3_Cluster_RingHashLbConfig_maximum_ring_size( + ring_hash_config); + if (max_ring_size != nullptr) { + cds_update.max_ring_size = + google_protobuf_UInt64Value_value(max_ring_size); + if (cds_update.max_ring_size > 8388608 || + cds_update.max_ring_size == 0) { + errors.push_back(GRPC_ERROR_CREATE_FROM_COPIED_STRING( + absl::StrCat( + cluster_name, + ": max_ring_size is not in the range of 1 to 8388608.") + .c_str())); + resource_names_failed->insert(cluster_name); + continue; + } + } + const google_protobuf_UInt64Value* min_ring_size = + envoy_config_cluster_v3_Cluster_RingHashLbConfig_minimum_ring_size( + ring_hash_config); + if (min_ring_size != nullptr) { + cds_update.min_ring_size = + google_protobuf_UInt64Value_value(min_ring_size); + if (cds_update.min_ring_size > 8388608 || + cds_update.min_ring_size == 0) { + errors.push_back(GRPC_ERROR_CREATE_FROM_COPIED_STRING( + absl::StrCat( + cluster_name, + ": min_ring_size is not in the range of 1 to 8388608.") + .c_str())); + resource_names_failed->insert(cluster_name); + continue; + } + if (cds_update.min_ring_size > cds_update.max_ring_size) { + errors.push_back(GRPC_ERROR_CREATE_FROM_COPIED_STRING( + absl::StrCat( + cluster_name, + ": min_ring_size cannot be greater than max_ring_size.") + .c_str())); + resource_names_failed->insert(cluster_name); + continue; + } + } + if (envoy_config_cluster_v3_Cluster_RingHashLbConfig_hash_function( + ring_hash_config) == + envoy_config_cluster_v3_Cluster_RingHashLbConfig_XX_HASH) { + cds_update.hash_function = XdsApi::CdsUpdate::HashFunction::XX_HASH; + } else if ( + envoy_config_cluster_v3_Cluster_RingHashLbConfig_hash_function( + ring_hash_config) == + envoy_config_cluster_v3_Cluster_RingHashLbConfig_MURMUR_HASH_2) { + cds_update.hash_function = + XdsApi::CdsUpdate::HashFunction::MURMUR_HASH_2; + } else { + errors.push_back(GRPC_ERROR_CREATE_FROM_COPIED_STRING( + absl::StrCat(cluster_name, + ": ring hash lb config has invalid hash function.") + .c_str())); + resource_names_failed->insert(cluster_name); + continue; + } + } else { + errors.push_back(GRPC_ERROR_CREATE_FROM_COPIED_STRING( + absl::StrCat(cluster_name, ": LB policy is not supported.").c_str())); + resource_names_failed->insert(cluster_name); + continue; } if (XdsSecurityEnabled()) { // Record Upstream tls context @@ -1776,26 +2907,43 @@ grpc_error* CdsResponseParse( auto* upstream_tls_context = envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_parse( encoded_upstream_tls_context.data, - encoded_upstream_tls_context.size, arena); + encoded_upstream_tls_context.size, context.arena); if (upstream_tls_context == nullptr) { - return GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "Can't decode upstream tls context."); + errors.push_back(GRPC_ERROR_CREATE_FROM_COPIED_STRING( + absl::StrCat(cluster_name, + ": Can't decode upstream tls context.") + .c_str())); + resource_names_failed->insert(cluster_name); + continue; } auto* common_tls_context = envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_common_tls_context( upstream_tls_context); if (common_tls_context != nullptr) { - grpc_error* error = CommonTlsContextParse( + grpc_error_handle error = CommonTlsContextParse( common_tls_context, &cds_update.common_tls_context); - if (error != GRPC_ERROR_NONE) return error; + if (error != GRPC_ERROR_NONE) { + errors.push_back(grpc_error_add_child( + GRPC_ERROR_CREATE_FROM_COPIED_STRING( + absl::StrCat(cluster_name, ": error in TLS context") + .c_str()), + error)); + resource_names_failed->insert(cluster_name); + continue; + } } } if (cds_update.common_tls_context.combined_validation_context .validation_context_certificate_provider_instance .instance_name.empty()) { - return GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "TLS configuration provided but no " - "validation_context_certificate_provider_instance found."); + errors.push_back(GRPC_ERROR_CREATE_FROM_COPIED_STRING( + absl::StrCat(cluster_name, + "TLS configuration provided but no " + "validation_context_certificate_provider_instance " + "found.") + .c_str())); + resource_names_failed->insert(cluster_name); + continue; } } } @@ -1805,8 +2953,11 @@ grpc_error* CdsResponseParse( envoy_config_cluster_v3_Cluster_lrs_server(cluster); if (lrs_server != nullptr) { if (!envoy_config_core_v3_ConfigSource_has_self(lrs_server)) { - return GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "LRS ConfigSource is not self."); + errors.push_back(GRPC_ERROR_CREATE_FROM_COPIED_STRING( + absl::StrCat(cluster_name, ": LRS ConfigSource is not self.") + .c_str())); + resource_names_failed->insert(cluster_name); + continue; } cds_update.lrs_load_reporting_server_name.emplace(""); } @@ -1837,10 +2988,10 @@ grpc_error* CdsResponseParse( } } } - return GRPC_ERROR_NONE; + return GRPC_ERROR_CREATE_FROM_VECTOR("errors parsing CDS response", &errors); } -grpc_error* ServerAddressParseAndAppend( +grpc_error_handle ServerAddressParseAndAppend( const envoy_config_endpoint_v3_LbEndpoint* lb_endpoint, ServerAddressList* list) { // If health_status is not HEALTHY or UNKNOWN, skip this endpoint. @@ -1865,13 +3016,15 @@ grpc_error* ServerAddressParseAndAppend( } // Populate grpc_resolved_address. grpc_resolved_address addr; - grpc_string_to_sockaddr(&addr, address_str.c_str(), port); + grpc_error_handle error = + grpc_string_to_sockaddr(&addr, address_str.c_str(), port); + if (error != GRPC_ERROR_NONE) return error; // Append the address to the list. list->emplace_back(addr, nullptr); return GRPC_ERROR_NONE; } -grpc_error* LocalityParse( +grpc_error_handle LocalityParse( const envoy_config_endpoint_v3_LocalityLbEndpoints* locality_lb_endpoints, XdsApi::EdsUpdate::Priority::Locality* output_locality, size_t* priority) { // Parse LB weight. @@ -1888,6 +3041,9 @@ grpc_error* LocalityParse( const envoy_config_core_v3_Locality* locality = envoy_config_endpoint_v3_LocalityLbEndpoints_locality( locality_lb_endpoints); + if (locality == nullptr) { + return GRPC_ERROR_CREATE_FROM_STATIC_STRING("Empty locality."); + } std::string region = UpbStringToStdString(envoy_config_core_v3_Locality_region(locality)); std::string zone = @@ -1902,7 +3058,7 @@ grpc_error* LocalityParse( envoy_config_endpoint_v3_LocalityLbEndpoints_lb_endpoints( locality_lb_endpoints, &size); for (size_t i = 0; i < size; ++i) { - grpc_error* error = ServerAddressParseAndAppend( + grpc_error_handle error = ServerAddressParseAndAppend( lb_endpoints[i], &output_locality->endpoints); if (error != GRPC_ERROR_NONE) return error; } @@ -1912,7 +3068,7 @@ grpc_error* LocalityParse( return GRPC_ERROR_NONE; } -grpc_error* DropParseAndAppend( +grpc_error_handle DropParseAndAppend( const envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_DropOverload* drop_overload, XdsApi::EdsUpdate::DropConfig* drop_config) { @@ -1951,11 +3107,13 @@ grpc_error* DropParseAndAppend( return GRPC_ERROR_NONE; } -grpc_error* EdsResponseParse( - XdsClient* client, TraceFlag* tracer, upb_symtab* symtab, +grpc_error_handle EdsResponseParse( + const EncodingContext& context, const envoy_service_discovery_v3_DiscoveryResponse* response, const std::set<absl::string_view>& expected_eds_service_names, - XdsApi::EdsUpdateMap* eds_update_map, upb_arena* arena) { + XdsApi::EdsUpdateMap* eds_update_map, + std::set<std::string>* resource_names_failed) { + std::vector<grpc_error_handle> errors; // Get the resources from the response. size_t size; const google_protobuf_Any* const* resources = @@ -1965,7 +3123,10 @@ grpc_error* EdsResponseParse( absl::string_view type_url = UpbStringToAbsl(google_protobuf_Any_type_url(resources[i])); if (!IsEds(type_url)) { - return GRPC_ERROR_CREATE_FROM_STATIC_STRING("Resource is not EDS."); + errors.push_back(GRPC_ERROR_CREATE_FROM_COPIED_STRING( + absl::StrCat("resource index ", i, ": Resource is not EDS.") + .c_str())); + continue; } // Get the cluster_load_assignment. upb_strview encoded_cluster_load_assignment = @@ -1973,13 +3134,15 @@ grpc_error* EdsResponseParse( envoy_config_endpoint_v3_ClusterLoadAssignment* cluster_load_assignment = envoy_config_endpoint_v3_ClusterLoadAssignment_parse( encoded_cluster_load_assignment.data, - encoded_cluster_load_assignment.size, arena); + encoded_cluster_load_assignment.size, context.arena); if (cluster_load_assignment == nullptr) { - return GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "Can't parse cluster_load_assignment."); + errors.push_back(GRPC_ERROR_CREATE_FROM_COPIED_STRING( + absl::StrCat("resource index ", i, + ": Can't parse cluster_load_assignment.") + .c_str())); + continue; } - MaybeLogClusterLoadAssignment(client, tracer, symtab, - cluster_load_assignment); + MaybeLogClusterLoadAssignment(context, cluster_load_assignment); // Check the EDS service name. Ignore unexpected names. std::string eds_service_name = UpbStringToStdString( envoy_config_endpoint_v3_ClusterLoadAssignment_cluster_name( @@ -1990,22 +3153,29 @@ grpc_error* EdsResponseParse( } // Fail on duplicate resources. if (eds_update_map->find(eds_service_name) != eds_update_map->end()) { - return GRPC_ERROR_CREATE_FROM_COPIED_STRING( + errors.push_back(GRPC_ERROR_CREATE_FROM_COPIED_STRING( absl::StrCat("duplicate resource name \"", eds_service_name, "\"") - .c_str()); + .c_str())); + resource_names_failed->insert(eds_service_name); + continue; } - XdsApi::EdsUpdate& eds_update = - (*eds_update_map)[std::move(eds_service_name)]; + // Serialize into JSON and store it in the EdsUpdateMap + XdsApi::EdsResourceData& eds_resource_data = + (*eds_update_map)[eds_service_name]; + XdsApi::EdsUpdate& eds_update = eds_resource_data.resource; + eds_resource_data.serialized_proto = + UpbStringToStdString(encoded_cluster_load_assignment); // Get the endpoints. size_t locality_size; const envoy_config_endpoint_v3_LocalityLbEndpoints* const* endpoints = envoy_config_endpoint_v3_ClusterLoadAssignment_endpoints( cluster_load_assignment, &locality_size); + grpc_error_handle error = GRPC_ERROR_NONE; for (size_t j = 0; j < locality_size; ++j) { size_t priority; XdsApi::EdsUpdate::Priority::Locality locality; - grpc_error* error = LocalityParse(endpoints[j], &locality, &priority); - if (error != GRPC_ERROR_NONE) return error; + error = LocalityParse(endpoints[j], &locality, &priority); + if (error != GRPC_ERROR_NONE) break; // Filter out locality with weight 0. if (locality.lb_weight == 0) continue; // Make sure prorities is big enough. Note that they might not @@ -2016,10 +3186,21 @@ grpc_error* EdsResponseParse( eds_update.priorities[priority].localities.emplace(locality.name.get(), std::move(locality)); } + if (error != GRPC_ERROR_NONE) { + errors.push_back(grpc_error_add_child( + GRPC_ERROR_CREATE_FROM_COPIED_STRING( + absl::StrCat(eds_service_name, ": locality validation error") + .c_str()), + error)); + resource_names_failed->insert(eds_service_name); + continue; + } for (const auto& priority : eds_update.priorities) { if (priority.localities.empty()) { - return GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "EDS update includes sparse priority list"); + errors.push_back(GRPC_ERROR_CREATE_FROM_COPIED_STRING( + absl::StrCat(eds_service_name, ": sparse priority list").c_str())); + resource_names_failed->insert(eds_service_name); + continue; } } // Get the drop config. @@ -2034,13 +3215,22 @@ grpc_error* EdsResponseParse( envoy_config_endpoint_v3_ClusterLoadAssignment_Policy_drop_overloads( policy, &drop_size); for (size_t j = 0; j < drop_size; ++j) { - grpc_error* error = + error = DropParseAndAppend(drop_overload[j], eds_update.drop_config.get()); - if (error != GRPC_ERROR_NONE) return error; + if (error != GRPC_ERROR_NONE) break; + } + if (error != GRPC_ERROR_NONE) { + errors.push_back(grpc_error_add_child( + GRPC_ERROR_CREATE_FROM_COPIED_STRING( + absl::StrCat(eds_service_name, ": drop config validation error") + .c_str()), + error)); + resource_names_failed->insert(eds_service_name); + continue; } } } - return GRPC_ERROR_NONE; + return GRPC_ERROR_CREATE_FROM_VECTOR("errors parsing EDS response", &errors); } std::string TypeUrlInternalToExternal(absl::string_view type_url) { @@ -2056,16 +3246,27 @@ std::string TypeUrlInternalToExternal(absl::string_view type_url) { return std::string(type_url); } +template <typename UpdateMap> +void MoveUpdatesToFailedSet(UpdateMap* update_map, + std::set<std::string>* resource_names_failed) { + for (const auto& p : *update_map) { + resource_names_failed->insert(p.first); + } + update_map->clear(); +} + } // namespace XdsApi::AdsParseResult XdsApi::ParseAdsResponse( - const grpc_slice& encoded_response, + const XdsBootstrap::XdsServer& server, const grpc_slice& encoded_response, const std::set<absl::string_view>& expected_listener_names, const std::set<absl::string_view>& expected_route_configuration_names, const std::set<absl::string_view>& expected_cluster_names, const std::set<absl::string_view>& expected_eds_service_names) { AdsParseResult result; upb::Arena arena; + const EncodingContext context = {client_, tracer_, symtab_.ptr(), arena.ptr(), + server.ShouldUseV3()}; // Decode the response. const envoy_service_discovery_v3_DiscoveryResponse* response = envoy_service_discovery_v3_DiscoveryResponse_parse( @@ -2077,7 +3278,7 @@ XdsApi::AdsParseResult XdsApi::ParseAdsResponse( GRPC_ERROR_CREATE_FROM_STATIC_STRING("Can't decode DiscoveryResponse."); return result; } - MaybeLogDiscoveryResponse(client_, tracer_, symtab_.ptr(), response); + MaybeLogDiscoveryResponse(context, response); // Record the type_url, the version_info, and the nonce of the response. result.type_url = TypeUrlInternalToExternal(UpbStringToAbsl( envoy_service_discovery_v3_DiscoveryResponse_type_url(response))); @@ -2087,22 +3288,37 @@ XdsApi::AdsParseResult XdsApi::ParseAdsResponse( envoy_service_discovery_v3_DiscoveryResponse_nonce(response)); // Parse the response according to the resource type. if (IsLds(result.type_url)) { - result.parse_error = LdsResponseParse(client_, tracer_, symtab_.ptr(), - response, expected_listener_names, - &result.lds_update_map, arena.ptr()); + result.parse_error = + LdsResponseParse(context, response, expected_listener_names, + &result.lds_update_map, &result.resource_names_failed); + if (result.parse_error != GRPC_ERROR_NONE) { + MoveUpdatesToFailedSet(&result.lds_update_map, + &result.resource_names_failed); + } } else if (IsRds(result.type_url)) { result.parse_error = - RdsResponseParse(client_, tracer_, symtab_.ptr(), response, - expected_route_configuration_names, - &result.rds_update_map, arena.ptr()); + RdsResponseParse(context, response, expected_route_configuration_names, + &result.rds_update_map, &result.resource_names_failed); + if (result.parse_error != GRPC_ERROR_NONE) { + MoveUpdatesToFailedSet(&result.rds_update_map, + &result.resource_names_failed); + } } else if (IsCds(result.type_url)) { - result.parse_error = CdsResponseParse(client_, tracer_, symtab_.ptr(), - response, expected_cluster_names, - &result.cds_update_map, arena.ptr()); + result.parse_error = + CdsResponseParse(context, response, expected_cluster_names, + &result.cds_update_map, &result.resource_names_failed); + if (result.parse_error != GRPC_ERROR_NONE) { + MoveUpdatesToFailedSet(&result.cds_update_map, + &result.resource_names_failed); + } } else if (IsEds(result.type_url)) { - result.parse_error = EdsResponseParse(client_, tracer_, symtab_.ptr(), - response, expected_eds_service_names, - &result.eds_update_map, arena.ptr()); + result.parse_error = + EdsResponseParse(context, response, expected_eds_service_names, + &result.eds_update_map, &result.resource_names_failed); + if (result.parse_error != GRPC_ERROR_NONE) { + MoveUpdatesToFailedSet(&result.eds_update_map, + &result.resource_names_failed); + } } return result; } @@ -2110,25 +3326,25 @@ XdsApi::AdsParseResult XdsApi::ParseAdsResponse( namespace { void MaybeLogLrsRequest( - XdsClient* client, TraceFlag* tracer, upb_symtab* symtab, + const EncodingContext& context, const envoy_service_load_stats_v3_LoadStatsRequest* request) { - if (GRPC_TRACE_FLAG_ENABLED(*tracer) && + if (GRPC_TRACE_FLAG_ENABLED(*context.tracer) && gpr_should_log(GPR_LOG_SEVERITY_DEBUG)) { const upb_msgdef* msg_type = - envoy_service_load_stats_v3_LoadStatsRequest_getmsgdef(symtab); + envoy_service_load_stats_v3_LoadStatsRequest_getmsgdef(context.symtab); char buf[10240]; upb_text_encode(request, msg_type, nullptr, 0, buf, sizeof(buf)); - gpr_log(GPR_DEBUG, "[xds_client %p] constructed LRS request: %s", client, - buf); + gpr_log(GPR_DEBUG, "[xds_client %p] constructed LRS request: %s", + context.client, buf); } } grpc_slice SerializeLrsRequest( - const envoy_service_load_stats_v3_LoadStatsRequest* request, - upb_arena* arena) { + const EncodingContext& context, + const envoy_service_load_stats_v3_LoadStatsRequest* request) { size_t output_length; char* output = envoy_service_load_stats_v3_LoadStatsRequest_serialize( - request, arena, &output_length); + request, context.arena, &output_length); return grpc_slice_from_copied_buffer(output, output_length); } @@ -2137,6 +3353,8 @@ grpc_slice SerializeLrsRequest( grpc_slice XdsApi::CreateLrsInitialRequest( const XdsBootstrap::XdsServer& server) { upb::Arena arena; + const EncodingContext context = {client_, tracer_, symtab_.ptr(), arena.ptr(), + server.ShouldUseV3()}; // Create a request. envoy_service_load_stats_v3_LoadStatsRequest* request = envoy_service_load_stats_v3_LoadStatsRequest_new(arena.ptr()); @@ -2144,25 +3362,25 @@ grpc_slice XdsApi::CreateLrsInitialRequest( envoy_config_core_v3_Node* node_msg = envoy_service_load_stats_v3_LoadStatsRequest_mutable_node(request, arena.ptr()); - PopulateNode(arena.ptr(), node_, server.ShouldUseV3(), build_version_, - user_agent_name_, node_msg); + PopulateNode(context, node_, build_version_, user_agent_name_, node_msg); envoy_config_core_v3_Node_add_client_features( node_msg, upb_strview_makez("envoy.lrs.supports_send_all_clusters"), arena.ptr()); - MaybeLogLrsRequest(client_, tracer_, symtab_.ptr(), request); - return SerializeLrsRequest(request, arena.ptr()); + MaybeLogLrsRequest(context, request); + return SerializeLrsRequest(context, request); } namespace { void LocalityStatsPopulate( + const EncodingContext& context, envoy_config_endpoint_v3_UpstreamLocalityStats* output, const XdsLocalityName& locality_name, - const XdsClusterLocalityStats::Snapshot& snapshot, upb_arena* arena) { + const XdsClusterLocalityStats::Snapshot& snapshot) { // Set locality. envoy_config_core_v3_Locality* locality = - envoy_config_endpoint_v3_UpstreamLocalityStats_mutable_locality(output, - arena); + envoy_config_endpoint_v3_UpstreamLocalityStats_mutable_locality( + output, context.arena); if (!locality_name.region().empty()) { envoy_config_core_v3_Locality_set_region( locality, StdStringToUpbString(locality_name.region())); @@ -2190,7 +3408,7 @@ void LocalityStatsPopulate( const XdsClusterLocalityStats::BackendMetric& metric_value = p.second; envoy_config_endpoint_v3_EndpointLoadMetricStats* load_metric = envoy_config_endpoint_v3_UpstreamLocalityStats_add_load_metric_stats( - output, arena); + output, context.arena); envoy_config_endpoint_v3_EndpointLoadMetricStats_set_metric_name( load_metric, StdStringToUpbString(metric_name)); envoy_config_endpoint_v3_EndpointLoadMetricStats_set_num_requests_finished_with_metric( @@ -2205,6 +3423,8 @@ void LocalityStatsPopulate( grpc_slice XdsApi::CreateLrsRequest( ClusterLoadReportMap cluster_load_report_map) { upb::Arena arena; + const EncodingContext context = {client_, tracer_, symtab_.ptr(), arena.ptr(), + false}; // Create a request. envoy_service_load_stats_v3_LoadStatsRequest* request = envoy_service_load_stats_v3_LoadStatsRequest_new(arena.ptr()); @@ -2231,8 +3451,7 @@ grpc_slice XdsApi::CreateLrsRequest( envoy_config_endpoint_v3_UpstreamLocalityStats* locality_stats = envoy_config_endpoint_v3_ClusterStats_add_upstream_locality_stats( cluster_stats, arena.ptr()); - LocalityStatsPopulate(locality_stats, locality_name, snapshot, - arena.ptr()); + LocalityStatsPopulate(context, locality_stats, locality_name, snapshot); } // Add dropped requests. uint64_t total_dropped_requests = 0; @@ -2261,14 +3480,14 @@ grpc_slice XdsApi::CreateLrsRequest( google_protobuf_Duration_set_seconds(load_report_interval, timespec.tv_sec); google_protobuf_Duration_set_nanos(load_report_interval, timespec.tv_nsec); } - MaybeLogLrsRequest(client_, tracer_, symtab_.ptr(), request); - return SerializeLrsRequest(request, arena.ptr()); + MaybeLogLrsRequest(context, request); + return SerializeLrsRequest(context, request); } -grpc_error* XdsApi::ParseLrsResponse(const grpc_slice& encoded_response, - bool* send_all_clusters, - std::set<std::string>* cluster_names, - grpc_millis* load_reporting_interval) { +grpc_error_handle XdsApi::ParseLrsResponse( + const grpc_slice& encoded_response, bool* send_all_clusters, + std::set<std::string>* cluster_names, + grpc_millis* load_reporting_interval) { upb::Arena arena; // Decode the response. const envoy_service_load_stats_v3_LoadStatsResponse* decoded_response = @@ -2305,4 +3524,276 @@ grpc_error* XdsApi::ParseLrsResponse(const grpc_slice& encoded_response, return GRPC_ERROR_NONE; } +namespace { +google_protobuf_Timestamp* GrpcMillisToTimestamp(const EncodingContext& context, + grpc_millis value) { + google_protobuf_Timestamp* timestamp = + google_protobuf_Timestamp_new(context.arena); + gpr_timespec timespec = grpc_millis_to_timespec(value, GPR_CLOCK_REALTIME); + google_protobuf_Timestamp_set_seconds(timestamp, timespec.tv_sec); + google_protobuf_Timestamp_set_nanos(timestamp, timespec.tv_nsec); + return timestamp; +} + +envoy_admin_v3_UpdateFailureState* CreateUpdateFailureStateUpb( + const EncodingContext& context, + const XdsApi::ResourceMetadata* resource_metadata) { + auto* update_failure_state = + envoy_admin_v3_UpdateFailureState_new(context.arena); + envoy_admin_v3_UpdateFailureState_set_details( + update_failure_state, + StdStringToUpbString(resource_metadata->failed_details)); + envoy_admin_v3_UpdateFailureState_set_version_info( + update_failure_state, + StdStringToUpbString(resource_metadata->failed_version)); + envoy_admin_v3_UpdateFailureState_set_last_update_attempt( + update_failure_state, + GrpcMillisToTimestamp(context, resource_metadata->failed_update_time)); + return update_failure_state; +} + +void DumpLdsConfig(const EncodingContext& context, + const XdsApi::ResourceTypeMetadata& resource_type_metadata, + envoy_service_status_v3_PerXdsConfig* per_xds_config) { + upb_strview kLdsTypeUrlUpb = upb_strview_makez(XdsApi::kLdsTypeUrl); + auto* listener_config_dump = + envoy_service_status_v3_PerXdsConfig_mutable_listener_config( + per_xds_config, context.arena); + envoy_admin_v3_ListenersConfigDump_set_version_info( + listener_config_dump, + StdStringToUpbString(resource_type_metadata.version)); + for (auto& p : resource_type_metadata.resource_metadata_map) { + absl::string_view name = p.first; + const XdsApi::ResourceMetadata* meta = p.second; + const upb_strview name_upb = StdStringToUpbString(name); + auto* dynamic_listener = + envoy_admin_v3_ListenersConfigDump_add_dynamic_listeners( + listener_config_dump, context.arena); + envoy_admin_v3_ListenersConfigDump_DynamicListener_set_name( + dynamic_listener, name_upb); + envoy_admin_v3_ListenersConfigDump_DynamicListener_set_client_status( + dynamic_listener, meta->client_status); + if (!meta->serialized_proto.empty()) { + // Set in-effective listeners + auto* dynamic_listener_state = + envoy_admin_v3_ListenersConfigDump_DynamicListener_mutable_active_state( + dynamic_listener, context.arena); + envoy_admin_v3_ListenersConfigDump_DynamicListenerState_set_version_info( + dynamic_listener_state, StdStringToUpbString(meta->version)); + envoy_admin_v3_ListenersConfigDump_DynamicListenerState_set_last_updated( + dynamic_listener_state, + GrpcMillisToTimestamp(context, meta->update_time)); + auto* listener_any = + envoy_admin_v3_ListenersConfigDump_DynamicListenerState_mutable_listener( + dynamic_listener_state, context.arena); + google_protobuf_Any_set_type_url(listener_any, kLdsTypeUrlUpb); + google_protobuf_Any_set_value( + listener_any, StdStringToUpbString(meta->serialized_proto)); + } + if (meta->client_status == XdsApi::ResourceMetadata::NACKED) { + // Set error_state if NACKED + envoy_admin_v3_ListenersConfigDump_DynamicListener_set_error_state( + dynamic_listener, CreateUpdateFailureStateUpb(context, meta)); + } + } +} + +void DumpRdsConfig(const EncodingContext& context, + const XdsApi::ResourceTypeMetadata& resource_type_metadata, + envoy_service_status_v3_PerXdsConfig* per_xds_config) { + upb_strview kRdsTypeUrlUpb = upb_strview_makez(XdsApi::kRdsTypeUrl); + auto* route_config_dump = + envoy_service_status_v3_PerXdsConfig_mutable_route_config(per_xds_config, + context.arena); + for (auto& p : resource_type_metadata.resource_metadata_map) { + absl::string_view name = p.first; + const XdsApi::ResourceMetadata* meta = p.second; + const upb_strview name_upb = StdStringToUpbString(name); + auto* dynamic_route_config = + envoy_admin_v3_RoutesConfigDump_add_dynamic_route_configs( + route_config_dump, context.arena); + envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_set_client_status( + dynamic_route_config, meta->client_status); + auto* route_config_any = + envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_mutable_route_config( + dynamic_route_config, context.arena); + if (!meta->serialized_proto.empty()) { + // Set in-effective route configs + envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_set_version_info( + dynamic_route_config, StdStringToUpbString(meta->version)); + envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_set_last_updated( + dynamic_route_config, + GrpcMillisToTimestamp(context, meta->update_time)); + google_protobuf_Any_set_type_url(route_config_any, kRdsTypeUrlUpb); + google_protobuf_Any_set_value( + route_config_any, StdStringToUpbString(meta->serialized_proto)); + } else { + // If there isn't a working route config, we still need to print the + // name. + auto* route_config = + envoy_config_route_v3_RouteConfiguration_new(context.arena); + envoy_config_route_v3_RouteConfiguration_set_name(route_config, name_upb); + size_t length; + char* bytes = envoy_config_route_v3_RouteConfiguration_serialize( + route_config, context.arena, &length); + google_protobuf_Any_set_type_url(route_config_any, kRdsTypeUrlUpb); + google_protobuf_Any_set_value(route_config_any, + upb_strview_make(bytes, length)); + } + if (meta->client_status == XdsApi::ResourceMetadata::NACKED) { + // Set error_state if NACKED + envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig_set_error_state( + dynamic_route_config, CreateUpdateFailureStateUpb(context, meta)); + } + } +} + +void DumpCdsConfig(const EncodingContext& context, + const XdsApi::ResourceTypeMetadata& resource_type_metadata, + envoy_service_status_v3_PerXdsConfig* per_xds_config) { + upb_strview kCdsTypeUrlUpb = upb_strview_makez(XdsApi::kCdsTypeUrl); + auto* cluster_config_dump = + envoy_service_status_v3_PerXdsConfig_mutable_cluster_config( + per_xds_config, context.arena); + envoy_admin_v3_ClustersConfigDump_set_version_info( + cluster_config_dump, + StdStringToUpbString(resource_type_metadata.version)); + for (auto& p : resource_type_metadata.resource_metadata_map) { + absl::string_view name = p.first; + const XdsApi::ResourceMetadata* meta = p.second; + const upb_strview name_upb = StdStringToUpbString(name); + auto* dynamic_cluster = + envoy_admin_v3_ClustersConfigDump_add_dynamic_active_clusters( + cluster_config_dump, context.arena); + envoy_admin_v3_ClustersConfigDump_DynamicCluster_set_client_status( + dynamic_cluster, meta->client_status); + auto* cluster_any = + envoy_admin_v3_ClustersConfigDump_DynamicCluster_mutable_cluster( + dynamic_cluster, context.arena); + if (!meta->serialized_proto.empty()) { + // Set in-effective clusters + envoy_admin_v3_ClustersConfigDump_DynamicCluster_set_version_info( + dynamic_cluster, StdStringToUpbString(meta->version)); + envoy_admin_v3_ClustersConfigDump_DynamicCluster_set_last_updated( + dynamic_cluster, GrpcMillisToTimestamp(context, meta->update_time)); + google_protobuf_Any_set_type_url(cluster_any, kCdsTypeUrlUpb); + google_protobuf_Any_set_value( + cluster_any, StdStringToUpbString(meta->serialized_proto)); + } else { + // If there isn't a working cluster, we still need to print the name. + auto* cluster = envoy_config_cluster_v3_Cluster_new(context.arena); + envoy_config_cluster_v3_Cluster_set_name(cluster, name_upb); + size_t length; + char* bytes = envoy_config_cluster_v3_Cluster_serialize( + cluster, context.arena, &length); + google_protobuf_Any_set_type_url(cluster_any, kCdsTypeUrlUpb); + google_protobuf_Any_set_value(cluster_any, + upb_strview_make(bytes, length)); + } + if (meta->client_status == XdsApi::ResourceMetadata::NACKED) { + // Set error_state if NACKED + envoy_admin_v3_ClustersConfigDump_DynamicCluster_set_error_state( + dynamic_cluster, CreateUpdateFailureStateUpb(context, meta)); + } + } +} + +void DumpEdsConfig(const EncodingContext& context, + const XdsApi::ResourceTypeMetadata& resource_type_metadata, + envoy_service_status_v3_PerXdsConfig* per_xds_config) { + upb_strview kEdsTypeUrlUpb = upb_strview_makez(XdsApi::kEdsTypeUrl); + auto* endpoint_config_dump = + envoy_service_status_v3_PerXdsConfig_mutable_endpoint_config( + per_xds_config, context.arena); + for (auto& p : resource_type_metadata.resource_metadata_map) { + absl::string_view name = p.first; + const XdsApi::ResourceMetadata* meta = p.second; + const upb_strview name_upb = StdStringToUpbString(name); + auto* dynamic_endpoint = + envoy_admin_v3_EndpointsConfigDump_add_dynamic_endpoint_configs( + endpoint_config_dump, context.arena); + envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_set_client_status( + dynamic_endpoint, meta->client_status); + auto* endpoint_any = + envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_mutable_endpoint_config( + dynamic_endpoint, context.arena); + if (!meta->serialized_proto.empty()) { + // Set in-effective endpoints + envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_set_version_info( + dynamic_endpoint, StdStringToUpbString(meta->version)); + envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_set_last_updated( + dynamic_endpoint, GrpcMillisToTimestamp(context, meta->update_time)); + google_protobuf_Any_set_type_url(endpoint_any, kEdsTypeUrlUpb); + google_protobuf_Any_set_value( + endpoint_any, StdStringToUpbString(meta->serialized_proto)); + } else { + // If there isn't a working endpoint, we still need to print the name. + auto* cluster_load_assignment = + envoy_config_endpoint_v3_ClusterLoadAssignment_new(context.arena); + envoy_config_endpoint_v3_ClusterLoadAssignment_set_cluster_name( + cluster_load_assignment, name_upb); + size_t length; + char* bytes = envoy_config_endpoint_v3_ClusterLoadAssignment_serialize( + cluster_load_assignment, context.arena, &length); + google_protobuf_Any_set_type_url(endpoint_any, kEdsTypeUrlUpb); + google_protobuf_Any_set_value(endpoint_any, + upb_strview_make(bytes, length)); + } + if (meta->client_status == XdsApi::ResourceMetadata::NACKED) { + // Set error_state if NACKED + envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig_set_error_state( + dynamic_endpoint, CreateUpdateFailureStateUpb(context, meta)); + } + } +} + +} // namespace + +std::string XdsApi::AssembleClientConfig( + const ResourceTypeMetadataMap& resource_type_metadata_map) { + upb::Arena arena; + // Create the ClientConfig for resource metadata from XdsClient + auto* client_config = envoy_service_status_v3_ClientConfig_new(arena.ptr()); + // Fill-in the node information + auto* node = envoy_service_status_v3_ClientConfig_mutable_node(client_config, + arena.ptr()); + const EncodingContext context = {client_, tracer_, symtab_.ptr(), arena.ptr(), + true}; + PopulateNode(context, node_, build_version_, user_agent_name_, node); + // Dump each xDS-type config into PerXdsConfig + for (auto& p : resource_type_metadata_map) { + absl::string_view type_url = p.first; + const ResourceTypeMetadata& resource_type_metadata = p.second; + if (type_url == kLdsTypeUrl) { + auto* per_xds_config = + envoy_service_status_v3_ClientConfig_add_xds_config(client_config, + context.arena); + DumpLdsConfig(context, resource_type_metadata, per_xds_config); + } else if (type_url == kRdsTypeUrl) { + auto* per_xds_config = + envoy_service_status_v3_ClientConfig_add_xds_config(client_config, + context.arena); + DumpRdsConfig(context, resource_type_metadata, per_xds_config); + } else if (type_url == kCdsTypeUrl) { + auto* per_xds_config = + envoy_service_status_v3_ClientConfig_add_xds_config(client_config, + context.arena); + DumpCdsConfig(context, resource_type_metadata, per_xds_config); + } else if (type_url == kEdsTypeUrl) { + auto* per_xds_config = + envoy_service_status_v3_ClientConfig_add_xds_config(client_config, + context.arena); + DumpEdsConfig(context, resource_type_metadata, per_xds_config); + } else { + gpr_log(GPR_ERROR, "invalid type_url %s", std::string(type_url).c_str()); + return ""; + } + } + // Serialize the upb message to bytes + size_t output_length; + char* output = envoy_service_status_v3_ClientConfig_serialize( + client_config, arena.ptr(), &output_length); + return std::string(output, output_length); +} + } // namespace grpc_core diff --git a/grpc/src/core/ext/xds/xds_api.h b/grpc/src/core/ext/xds/xds_api.h index f2a67072..e7bf1cd1 100644 --- a/grpc/src/core/ext/xds/xds_api.h +++ b/grpc/src/core/ext/xds/xds_api.h @@ -33,9 +33,12 @@ #include <grpc/slice_buffer.h> +#include "envoy/admin/v3/config_dump.upb.h" #include "src/core/ext/filters/client_channel/server_address.h" #include "src/core/ext/xds/xds_bootstrap.h" #include "src/core/ext/xds/xds_client_stats.h" +#include "src/core/ext/xds/xds_http_filters.h" +#include "src/core/lib/matchers/matchers.h" namespace grpc_core { @@ -57,76 +60,58 @@ class XdsApi { int64_t seconds = 0; int32_t nanos = 0; bool operator==(const Duration& other) const { - return (seconds == other.seconds && nanos == other.nanos); + return seconds == other.seconds && nanos == other.nanos; } std::string ToString() const { return absl::StrFormat("Duration seconds: %ld, nanos %d", seconds, nanos); } }; + using TypedPerFilterConfig = + std::map<std::string, XdsHttpFilterImpl::FilterConfig>; + // TODO(donnadionne): When we can use absl::variant<>, consider using that // for: PathMatcher, HeaderMatcher, cluster_name and weighted_clusters struct Route { // Matchers for this route. struct Matchers { - struct PathMatcher { - enum class PathMatcherType { - PATH, // path stored in string_matcher field - PREFIX, // prefix stored in string_matcher field - REGEX, // regex stored in regex_matcher field - }; - PathMatcherType type; - std::string string_matcher; - std::unique_ptr<RE2> regex_matcher; - bool case_sensitive = true; - - PathMatcher() = default; - PathMatcher(const PathMatcher& other); - PathMatcher& operator=(const PathMatcher& other); - bool operator==(const PathMatcher& other) const; - std::string ToString() const; - }; - - struct HeaderMatcher { - enum class HeaderMatcherType { - EXACT, // value stored in string_matcher field - REGEX, // uses regex_match field - RANGE, // uses range_start and range_end fields - PRESENT, // uses present_match field - PREFIX, // prefix stored in string_matcher field - SUFFIX, // suffix stored in string_matcher field - }; - std::string name; - HeaderMatcherType type; - int64_t range_start; - int64_t range_end; - std::string string_matcher; - std::unique_ptr<RE2> regex_match; - bool present_match; - // invert_match field may or may not exisit, so initialize it to - // false. - bool invert_match = false; - - HeaderMatcher() = default; - HeaderMatcher(const HeaderMatcher& other); - HeaderMatcher& operator=(const HeaderMatcher& other); - bool operator==(const HeaderMatcher& other) const; - std::string ToString() const; - }; - - PathMatcher path_matcher; + StringMatcher path_matcher; std::vector<HeaderMatcher> header_matchers; absl::optional<uint32_t> fraction_per_million; bool operator==(const Matchers& other) const { - return (path_matcher == other.path_matcher && - header_matchers == other.header_matchers && - fraction_per_million == other.fraction_per_million); + return path_matcher == other.path_matcher && + header_matchers == other.header_matchers && + fraction_per_million == other.fraction_per_million; } std::string ToString() const; }; + struct HashPolicy { + enum Type { HEADER, CHANNEL_ID }; + Type type; + bool terminal = false; + // Fields used for type HEADER. + std::string header_name; + std::unique_ptr<RE2> regex = nullptr; + std::string regex_substitution; + + HashPolicy() {} + + // Copyable. + HashPolicy(const HashPolicy& other); + HashPolicy& operator=(const HashPolicy& other); + + // Moveable. + HashPolicy(HashPolicy&& other) noexcept; + HashPolicy& operator=(HashPolicy&& other) noexcept; + + bool operator==(const HashPolicy& other) const; + std::string ToString() const; + }; + Matchers matchers; + std::vector<HashPolicy> hash_policies; // Action for this route. // TODO(roth): When we can use absl::variant<>, consider using that @@ -135,8 +120,11 @@ class XdsApi { struct ClusterWeight { std::string name; uint32_t weight; + TypedPerFilterConfig typed_per_filter_config; + bool operator==(const ClusterWeight& other) const { - return (name == other.name && weight == other.weight); + return name == other.name && weight == other.weight && + typed_per_filter_config == other.typed_per_filter_config; } std::string ToString() const; }; @@ -147,11 +135,13 @@ class XdsApi { // not set. absl::optional<Duration> max_stream_duration; + TypedPerFilterConfig typed_per_filter_config; + bool operator==(const Route& other) const { - return (matchers == other.matchers && - cluster_name == other.cluster_name && - weighted_clusters == other.weighted_clusters && - max_stream_duration == other.max_stream_duration); + return matchers == other.matchers && cluster_name == other.cluster_name && + weighted_clusters == other.weighted_clusters && + max_stream_duration == other.max_stream_duration && + typed_per_filter_config == other.typed_per_filter_config; } std::string ToString() const; }; @@ -160,9 +150,11 @@ class XdsApi { struct VirtualHost { std::vector<std::string> domains; std::vector<Route> routes; + TypedPerFilterConfig typed_per_filter_config; bool operator==(const VirtualHost& other) const { - return domains == other.domains && routes == other.routes; + return domains == other.domains && routes == other.routes && + typed_per_filter_config == other.typed_per_filter_config; } }; @@ -175,42 +167,6 @@ class XdsApi { VirtualHost* FindVirtualHostForDomain(const std::string& domain); }; - class StringMatcher { - public: - enum class StringMatcherType { - EXACT, // value stored in string_matcher_ field - PREFIX, // value stored in string_matcher_ field - SUFFIX, // value stored in string_matcher_ field - SAFE_REGEX, // pattern stored in regex_matcher_ field - CONTAINS, // value stored in string_matcher_ field - }; - - StringMatcher() = default; - StringMatcher(const StringMatcher& other); - StringMatcher(StringMatcherType type, const std::string& matcher, - bool ignore_case = false); - StringMatcher& operator=(const StringMatcher& other); - bool operator==(const StringMatcher& other) const; - - bool Match(absl::string_view value) const; - - std::string ToString() const; - - StringMatcherType type() const { return type_; } - - // Valid for EXACT, PREFIX, SUFFIX and CONTAINS - const std::string& string_matcher() const { return string_matcher_; } - - // Valid for SAFE_REGEX - RE2* regex_matcher() const { return regex_matcher_.get(); } - - private: - StringMatcherType type_ = StringMatcherType::EXACT; - std::string string_matcher_; - std::unique_ptr<RE2> regex_matcher_; - bool ignore_case_ = false; - }; - struct CommonTlsContext { struct CertificateValidationContext { std::vector<StringMatcher> match_subject_alt_names; @@ -264,30 +220,182 @@ class XdsApi { bool Empty() const; }; + struct DownstreamTlsContext { + CommonTlsContext common_tls_context; + bool require_client_certificate = false; + + bool operator==(const DownstreamTlsContext& other) const { + return common_tls_context == other.common_tls_context && + require_client_certificate == other.require_client_certificate; + } + + std::string ToString() const; + bool Empty() const; + }; + // TODO(roth): When we can use absl::variant<>, consider using that // here, to enforce the fact that only one of the two fields can be set. struct LdsUpdate { - // The name to use in the RDS request. - std::string route_config_name; - // Storing the Http Connection Manager Common Http Protocol Option - // max_stream_duration - Duration http_max_stream_duration; - // The RouteConfiguration to use for this listener. - // Present only if it is inlined in the LDS response. - absl::optional<RdsUpdate> rds_update; + enum class ListenerType { + kTcpListener = 0, + kHttpApiListener, + } type; + + struct HttpConnectionManager { + // The name to use in the RDS request. + std::string route_config_name; + // Storing the Http Connection Manager Common Http Protocol Option + // max_stream_duration + Duration http_max_stream_duration; + // The RouteConfiguration to use for this listener. + // Present only if it is inlined in the LDS response. + absl::optional<RdsUpdate> rds_update; + + struct HttpFilter { + std::string name; + XdsHttpFilterImpl::FilterConfig config; + + bool operator==(const HttpFilter& other) const { + return name == other.name && config == other.config; + } + + std::string ToString() const; + }; + std::vector<HttpFilter> http_filters; + + bool operator==(const HttpConnectionManager& other) const { + return route_config_name == other.route_config_name && + http_max_stream_duration == other.http_max_stream_duration && + rds_update == other.rds_update && + http_filters == other.http_filters; + } + + std::string ToString() const; + }; + + // Populated for type=kHttpApiListener. + HttpConnectionManager http_connection_manager; + + // Populated for type=kTcpListener. + // host:port listening_address set when type is kTcpListener + std::string address; + + struct FilterChainData { + DownstreamTlsContext downstream_tls_context; + // This is in principle the filter list. + // We currently require exactly one filter, which is the HCM. + HttpConnectionManager http_connection_manager; + + bool operator==(const FilterChainData& other) const { + return downstream_tls_context == other.downstream_tls_context && + http_connection_manager == other.http_connection_manager; + } + + std::string ToString() const; + } filter_chain_data; + + // A multi-level map used to determine which filter chain to use for a given + // incoming connection. Determining the right filter chain for a given + // connection checks the following properties, in order: + // - destination port (never matched, so not present in map) + // - destination IP address + // - server name (never matched, so not present in map) + // - transport protocol (allows only "raw_buffer" or unset, prefers the + // former, so only one of those two types is present in map) + // - application protocol (never matched, so not present in map) + // - connection source type (any, local or external) + // - source IP address + // - source port + // https://www.envoyproxy.io/docs/envoy/latest/api-v3/config/listener/v3/listener_components.proto#config-listener-v3-filterchainmatch + // for more details + struct FilterChainMap { + struct FilterChainDataSharedPtr { + std::shared_ptr<FilterChainData> data; + bool operator==(const FilterChainDataSharedPtr& other) const { + return *data == *other.data; + } + }; + struct CidrRange { + grpc_resolved_address address; + uint32_t prefix_len; + + bool operator==(const CidrRange& other) const { + return memcmp(&address, &other.address, sizeof(address)) == 0 && + prefix_len == other.prefix_len; + } + + std::string ToString() const; + }; + using SourcePortsMap = std::map<uint16_t, FilterChainDataSharedPtr>; + struct SourceIp { + absl::optional<CidrRange> prefix_range; + SourcePortsMap ports_map; + + bool operator==(const SourceIp& other) const { + return prefix_range == other.prefix_range && + ports_map == other.ports_map; + } + }; + using SourceIpVector = std::vector<SourceIp>; + enum class ConnectionSourceType { + kAny = 0, + kSameIpOrLoopback, + kExternal + }; + using ConnectionSourceTypesArray = std::array<SourceIpVector, 3>; + struct DestinationIp { + absl::optional<CidrRange> prefix_range; + // We always fail match on server name, so those filter chains are not + // included here. + ConnectionSourceTypesArray source_types_array; + + bool operator==(const DestinationIp& other) const { + return prefix_range == other.prefix_range && + source_types_array == other.source_types_array; + } + }; + // We always fail match on destination ports map + using DestinationIpVector = std::vector<DestinationIp>; + DestinationIpVector destination_ip_vector; + + bool operator==(const FilterChainMap& other) const { + return destination_ip_vector == other.destination_ip_vector; + } + + std::string ToString() const; + } filter_chain_map; + + absl::optional<FilterChainData> default_filter_chain; bool operator==(const LdsUpdate& other) const { - return route_config_name == other.route_config_name && - rds_update == other.rds_update && - http_max_stream_duration == other.http_max_stream_duration; + return http_connection_manager == other.http_connection_manager && + address == other.address && + filter_chain_map == other.filter_chain_map && + default_filter_chain == other.default_filter_chain; } + + std::string ToString() const; }; - using LdsUpdateMap = std::map<std::string /*server_name*/, LdsUpdate>; + struct LdsResourceData { + LdsUpdate resource; + std::string serialized_proto; + }; - using RdsUpdateMap = std::map<std::string /*route_config_name*/, RdsUpdate>; + using LdsUpdateMap = std::map<std::string /*server_name*/, LdsResourceData>; + + struct RdsResourceData { + RdsUpdate resource; + std::string serialized_proto; + }; + + using RdsUpdateMap = + std::map<std::string /*route_config_name*/, RdsResourceData>; struct CdsUpdate { + enum ClusterType { EDS, LOGICAL_DNS, AGGREGATE }; + ClusterType cluster_type; + // For cluster type EDS. // The name to use in the EDS request. // If empty, the cluster name will be used. std::string eds_service_name; @@ -298,22 +406,39 @@ class XdsApi { // If set to the empty string, will use the same server we obtained the CDS // data from. absl::optional<std::string> lrs_load_reporting_server_name; + // The LB policy to use (e.g., "ROUND_ROBIN" or "RING_HASH"). + std::string lb_policy; + // Used for RING_HASH LB policy only. + uint64_t min_ring_size = 1024; + uint64_t max_ring_size = 8388608; + enum HashFunction { XX_HASH, MURMUR_HASH_2 }; + HashFunction hash_function; // Maximum number of outstanding requests can be made to the upstream // cluster. uint32_t max_concurrent_requests = 1024; + // For cluster type AGGREGATE. + // The prioritized list of cluster names. + std::vector<std::string> prioritized_cluster_names; bool operator==(const CdsUpdate& other) const { - return eds_service_name == other.eds_service_name && + return cluster_type == other.cluster_type && + eds_service_name == other.eds_service_name && common_tls_context == other.common_tls_context && lrs_load_reporting_server_name == other.lrs_load_reporting_server_name && + prioritized_cluster_names == other.prioritized_cluster_names && max_concurrent_requests == other.max_concurrent_requests; } std::string ToString() const; }; - using CdsUpdateMap = std::map<std::string /*cluster_name*/, CdsUpdate>; + struct CdsResourceData { + CdsUpdate resource; + std::string serialized_proto; + }; + + using CdsUpdateMap = std::map<std::string /*cluster_name*/, CdsResourceData>; struct EdsUpdate { struct Priority { @@ -397,7 +522,13 @@ class XdsApi { std::string ToString() const; }; - using EdsUpdateMap = std::map<std::string /*eds_service_name*/, EdsUpdate>; + struct EdsResourceData { + EdsUpdate resource; + std::string serialized_proto; + }; + + using EdsUpdateMap = + std::map<std::string /*eds_service_name*/, EdsResourceData>; struct ClusterLoadReport { XdsClusterDropStats::Snapshot dropped_requests; @@ -410,22 +541,75 @@ class XdsApi { std::pair<std::string /*cluster_name*/, std::string /*eds_service_name*/>, ClusterLoadReport>; - XdsApi(XdsClient* client, TraceFlag* tracer, const XdsBootstrap::Node* node); + // The metadata of the xDS resource; used by the xDS config dump. + struct ResourceMetadata { + // Resource status from the view of a xDS client, which tells the + // synchronization status between the xDS client and the xDS server. + enum ClientResourceStatus { + // Client requested this resource but hasn't received any update from + // management server. The client will not fail requests, but will queue + // them + // until update arrives or the client times out waiting for the resource. + REQUESTED = 1, + // This resource has been requested by the client but has either not been + // delivered by the server or was previously delivered by the server and + // then subsequently removed from resources provided by the server. + DOES_NOT_EXIST, + // Client received this resource and replied with ACK. + ACKED, + // Client received this resource and replied with NACK. + NACKED + }; - // Creates an ADS request. - // Takes ownership of \a error. - grpc_slice CreateAdsRequest(const XdsBootstrap::XdsServer& server, - const std::string& type_url, - const std::set<absl::string_view>& resource_names, - const std::string& version, - const std::string& nonce, grpc_error* error, - bool populate_node); + // The client status of this resource. + ClientResourceStatus client_status = REQUESTED; + // The serialized bytes of the last successfully updated raw xDS resource. + std::string serialized_proto; + // The timestamp when the resource was last successfully updated. + grpc_millis update_time = 0; + // The last successfully updated version of the resource. + std::string version; + // The rejected version string of the last failed update attempt. + std::string failed_version; + // Details about the last failed update attempt. + std::string failed_details; + // Timestamp of the last failed update attempt. + grpc_millis failed_update_time = 0; + }; + using ResourceMetadataMap = + std::map<absl::string_view /*resource_name*/, const ResourceMetadata*>; + struct ResourceTypeMetadata { + absl::string_view version; + ResourceMetadataMap resource_metadata_map; + }; + using ResourceTypeMetadataMap = + std::map<absl::string_view /*type_url*/, ResourceTypeMetadata>; + static_assert(static_cast<ResourceMetadata::ClientResourceStatus>( + envoy_admin_v3_REQUESTED) == + ResourceMetadata::ClientResourceStatus::REQUESTED, + ""); + static_assert(static_cast<ResourceMetadata::ClientResourceStatus>( + envoy_admin_v3_DOES_NOT_EXIST) == + ResourceMetadata::ClientResourceStatus::DOES_NOT_EXIST, + ""); + static_assert(static_cast<ResourceMetadata::ClientResourceStatus>( + envoy_admin_v3_ACKED) == + ResourceMetadata::ClientResourceStatus::ACKED, + ""); + static_assert(static_cast<ResourceMetadata::ClientResourceStatus>( + envoy_admin_v3_NACKED) == + ResourceMetadata::ClientResourceStatus::NACKED, + ""); - // Parses an ADS response. // If the response can't be parsed at the top level, the resulting // type_url will be empty. + // If there is any other type of validation error, the parse_error + // field will be set to something other than GRPC_ERROR_NONE and the + // resource_names_failed field will be populated. + // Otherwise, one of the *_update_map fields will be populated, based + // on the type_url field. struct AdsParseResult { - grpc_error* parse_error = GRPC_ERROR_NONE; + grpc_error_handle parse_error = GRPC_ERROR_NONE; std::string version; std::string nonce; std::string type_url; @@ -433,9 +617,23 @@ class XdsApi { RdsUpdateMap rds_update_map; CdsUpdateMap cds_update_map; EdsUpdateMap eds_update_map; + std::set<std::string> resource_names_failed; }; + + XdsApi(XdsClient* client, TraceFlag* tracer, const XdsBootstrap::Node* node); + + // Creates an ADS request. + // Takes ownership of \a error. + grpc_slice CreateAdsRequest(const XdsBootstrap::XdsServer& server, + const std::string& type_url, + const std::set<absl::string_view>& resource_names, + const std::string& version, + const std::string& nonce, grpc_error_handle error, + bool populate_node); + + // Parses an ADS response. AdsParseResult ParseAdsResponse( - const grpc_slice& encoded_response, + const XdsBootstrap::XdsServer& server, const grpc_slice& encoded_response, const std::set<absl::string_view>& expected_listener_names, const std::set<absl::string_view>& expected_route_configuration_names, const std::set<absl::string_view>& expected_cluster_names, @@ -450,10 +648,14 @@ class XdsApi { // Parses the LRS response and returns \a // load_reporting_interval for client-side load reporting. If there is any // error, the output config is invalid. - grpc_error* ParseLrsResponse(const grpc_slice& encoded_response, - bool* send_all_clusters, - std::set<std::string>* cluster_names, - grpc_millis* load_reporting_interval); + grpc_error_handle ParseLrsResponse(const grpc_slice& encoded_response, + bool* send_all_clusters, + std::set<std::string>* cluster_names, + grpc_millis* load_reporting_interval); + + // Assemble the client config proto message and return the serialized result. + std::string AssembleClientConfig( + const ResourceTypeMetadataMap& resource_type_metadata_map); private: XdsClient* client_; diff --git a/grpc/src/core/ext/xds/xds_bootstrap.cc b/grpc/src/core/ext/xds/xds_bootstrap.cc index e48d9827..33cf276d 100644 --- a/grpc/src/core/ext/xds/xds_bootstrap.cc +++ b/grpc/src/core/ext/xds/xds_bootstrap.cc @@ -30,7 +30,6 @@ #include "src/core/ext/xds/certificate_provider_registry.h" #include "src/core/ext/xds/xds_api.h" -#include "src/core/lib/gpr/env.h" #include "src/core/lib/gpr/string.h" #include "src/core/lib/iomgr/load_file.h" #include "src/core/lib/security/credentials/credentials.h" @@ -48,8 +47,8 @@ bool XdsChannelCredsRegistry::IsSupported(const std::string& creds_type) { creds_type == "fake"; } -bool XdsChannelCredsRegistry::IsValidConfig(const std::string& creds_type, - const Json& config) { +bool XdsChannelCredsRegistry::IsValidConfig(const std::string& /*creds_type*/, + const Json& /*config*/) { // Currently, none of the creds types actually take a config, but we // ignore whatever might be specified in the bootstrap file for // forward compatibility reasons. @@ -58,7 +57,7 @@ bool XdsChannelCredsRegistry::IsValidConfig(const std::string& creds_type, RefCountedPtr<grpc_channel_credentials> XdsChannelCredsRegistry::MakeChannelCreds(const std::string& creds_type, - const Json& config) { + const Json& /*config*/) { if (creds_type == "google_default") { return grpc_google_default_credentials_create(nullptr); } else if (creds_type == "insecure") { @@ -81,109 +80,27 @@ bool XdsBootstrap::XdsServer::ShouldUseV3() const { // XdsBootstrap // -namespace { - -std::string BootstrapString(const XdsBootstrap& bootstrap) { - std::vector<std::string> parts; - if (bootstrap.node() != nullptr) { - parts.push_back(absl::StrFormat( - "node={\n" - " id=\"%s\",\n" - " cluster=\"%s\",\n" - " locality={\n" - " region=\"%s\",\n" - " zone=\"%s\",\n" - " subzone=\"%s\"\n" - " },\n" - " metadata=%s,\n" - "},\n", - bootstrap.node()->id, bootstrap.node()->cluster, - bootstrap.node()->locality_region, bootstrap.node()->locality_zone, - bootstrap.node()->locality_subzone, bootstrap.node()->metadata.Dump())); - } - parts.push_back(absl::StrFormat( - "servers=[\n" - " {\n" - " uri=\"%s\",\n" - " creds_type=%s,\n", - bootstrap.server().server_uri, bootstrap.server().channel_creds_type)); - if (bootstrap.server().channel_creds_config.type() != Json::Type::JSON_NULL) { - parts.push_back( - absl::StrFormat(" creds_config=%s,", - bootstrap.server().channel_creds_config.Dump())); - } - if (!bootstrap.server().server_features.empty()) { - parts.push_back(absl::StrCat( - " server_features=[", - absl::StrJoin(bootstrap.server().server_features, ", "), "],\n")); - } - parts.push_back(" }\n],\n"); - parts.push_back("certificate_providers={\n"); - for (const auto& entry : bootstrap.certificate_providers()) { - parts.push_back( - absl::StrFormat(" %s={\n" - " plugin_name=%s\n" - " config=%s\n" - " },\n", - entry.first, entry.second.plugin_name, - entry.second.config->ToString())); - } - parts.push_back("}"); - return absl::StrJoin(parts, ""); -} - -} // namespace - -std::unique_ptr<XdsBootstrap> XdsBootstrap::ReadFromFile(XdsClient* client, - TraceFlag* tracer, - grpc_error** error) { - grpc_core::UniquePtr<char> path(gpr_getenv("GRPC_XDS_BOOTSTRAP")); - if (path == nullptr) { - *error = GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "Environment variable GRPC_XDS_BOOTSTRAP not defined"); - return nullptr; - } - if (GRPC_TRACE_FLAG_ENABLED(*tracer)) { - gpr_log(GPR_INFO, - "[xds_client %p] Got bootstrap file location from " - "GRPC_XDS_BOOTSTRAP environment variable: %s", - client, path.get()); - } - grpc_slice contents; - *error = grpc_load_file(path.get(), /*add_null_terminator=*/true, &contents); - if (*error != GRPC_ERROR_NONE) return nullptr; - absl::string_view contents_str_view = StringViewFromSlice(contents); - if (GRPC_TRACE_FLAG_ENABLED(*tracer)) { - gpr_log(GPR_DEBUG, "[xds_client %p] Bootstrap file contents: %s", client, - std::string(contents_str_view).c_str()); - } - Json json = Json::Parse(contents_str_view, error); - grpc_slice_unref_internal(contents); +std::unique_ptr<XdsBootstrap> XdsBootstrap::Create( + absl::string_view json_string, grpc_error_handle* error) { + Json json = Json::Parse(json_string, error); if (*error != GRPC_ERROR_NONE) { - grpc_error* error_out = GRPC_ERROR_CREATE_REFERENCING_FROM_COPIED_STRING( - absl::StrCat("Failed to parse bootstrap file ", path.get()).c_str(), - error, 1); + grpc_error_handle error_out = + GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( + "Failed to parse bootstrap JSON string", error, 1); GRPC_ERROR_UNREF(*error); *error = error_out; return nullptr; } - std::unique_ptr<XdsBootstrap> result = - absl::make_unique<XdsBootstrap>(std::move(json), error); - if (*error == GRPC_ERROR_NONE && GRPC_TRACE_FLAG_ENABLED(*tracer)) { - gpr_log(GPR_INFO, - "[xds_client %p] Bootstrap config for creating xds client:\n%s", - client, BootstrapString(*result).c_str()); - } - return result; + return absl::make_unique<XdsBootstrap>(std::move(json), error); } -XdsBootstrap::XdsBootstrap(Json json, grpc_error** error) { +XdsBootstrap::XdsBootstrap(Json json, grpc_error_handle* error) { if (json.type() != Json::Type::OBJECT) { *error = GRPC_ERROR_CREATE_FROM_STATIC_STRING( "malformed JSON in bootstrap file"); return; } - std::vector<grpc_error*> error_list; + std::vector<grpc_error_handle> error_list; auto it = json.mutable_object()->find("xds_servers"); if (it == json.mutable_object()->end()) { error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( @@ -192,7 +109,7 @@ XdsBootstrap::XdsBootstrap(Json json, grpc_error** error) { error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( "\"xds_servers\" field is not an array")); } else { - grpc_error* parse_error = ParseXdsServerList(&it->second); + grpc_error_handle parse_error = ParseXdsServerList(&it->second); if (parse_error != GRPC_ERROR_NONE) error_list.push_back(parse_error); } it = json.mutable_object()->find("node"); @@ -201,10 +118,20 @@ XdsBootstrap::XdsBootstrap(Json json, grpc_error** error) { error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( "\"node\" field is not an object")); } else { - grpc_error* parse_error = ParseNode(&it->second); + grpc_error_handle parse_error = ParseNode(&it->second); if (parse_error != GRPC_ERROR_NONE) error_list.push_back(parse_error); } } + it = json.mutable_object()->find("server_listener_resource_name_template"); + if (it != json.mutable_object()->end()) { + if (it->second.type() != Json::Type::STRING) { + error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "\"server_listener_resource_name_template\" field is not a string")); + } else { + server_listener_resource_name_template_ = + std::move(*it->second.mutable_string_value()); + } + } if (XdsSecurityEnabled()) { it = json.mutable_object()->find("certificate_providers"); if (it != json.mutable_object()->end()) { @@ -212,7 +139,7 @@ XdsBootstrap::XdsBootstrap(Json json, grpc_error** error) { error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( "\"certificate_providers\" field is not an object")); } else { - grpc_error* parse_error = ParseCertificateProviders(&it->second); + grpc_error_handle parse_error = ParseCertificateProviders(&it->second); if (parse_error != GRPC_ERROR_NONE) error_list.push_back(parse_error); } } @@ -221,15 +148,15 @@ XdsBootstrap::XdsBootstrap(Json json, grpc_error** error) { &error_list); } -grpc_error* XdsBootstrap::ParseXdsServerList(Json* json) { - std::vector<grpc_error*> error_list; +grpc_error_handle XdsBootstrap::ParseXdsServerList(Json* json) { + std::vector<grpc_error_handle> error_list; for (size_t i = 0; i < json->mutable_array()->size(); ++i) { Json& child = json->mutable_array()->at(i); if (child.type() != Json::Type::OBJECT) { error_list.push_back(GRPC_ERROR_CREATE_FROM_COPIED_STRING( absl::StrCat("array element ", i, " is not an object").c_str())); } else { - grpc_error* parse_error = ParseXdsServer(&child, i); + grpc_error_handle parse_error = ParseXdsServer(&child, i); if (parse_error != GRPC_ERROR_NONE) error_list.push_back(parse_error); } } @@ -237,8 +164,8 @@ grpc_error* XdsBootstrap::ParseXdsServerList(Json* json) { &error_list); } -grpc_error* XdsBootstrap::ParseXdsServer(Json* json, size_t idx) { - std::vector<grpc_error*> error_list; +grpc_error_handle XdsBootstrap::ParseXdsServer(Json* json, size_t idx) { + std::vector<grpc_error_handle> error_list; servers_.emplace_back(); XdsServer& server = servers_[servers_.size() - 1]; auto it = json->mutable_object()->find("server_uri"); @@ -259,7 +186,8 @@ grpc_error* XdsBootstrap::ParseXdsServer(Json* json, size_t idx) { error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( "\"channel_creds\" field is not an array")); } else { - grpc_error* parse_error = ParseChannelCredsArray(&it->second, &server); + grpc_error_handle parse_error = + ParseChannelCredsArray(&it->second, &server); if (parse_error != GRPC_ERROR_NONE) error_list.push_back(parse_error); } it = json->mutable_object()->find("server_features"); @@ -268,14 +196,15 @@ grpc_error* XdsBootstrap::ParseXdsServer(Json* json, size_t idx) { error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( "\"server_features\" field is not an array")); } else { - grpc_error* parse_error = ParseServerFeaturesArray(&it->second, &server); + grpc_error_handle parse_error = + ParseServerFeaturesArray(&it->second, &server); if (parse_error != GRPC_ERROR_NONE) error_list.push_back(parse_error); } } // Can't use GRPC_ERROR_CREATE_FROM_VECTOR() here, because the error // string is not static in this case. if (error_list.empty()) return GRPC_ERROR_NONE; - grpc_error* error = GRPC_ERROR_CREATE_FROM_COPIED_STRING( + grpc_error_handle error = GRPC_ERROR_CREATE_FROM_COPIED_STRING( absl::StrCat("errors parsing index ", idx).c_str()); for (size_t i = 0; i < error_list.size(); ++i) { error = grpc_error_add_child(error, error_list[i]); @@ -283,16 +212,16 @@ grpc_error* XdsBootstrap::ParseXdsServer(Json* json, size_t idx) { return error; } -grpc_error* XdsBootstrap::ParseChannelCredsArray(Json* json, - XdsServer* server) { - std::vector<grpc_error*> error_list; +grpc_error_handle XdsBootstrap::ParseChannelCredsArray(Json* json, + XdsServer* server) { + std::vector<grpc_error_handle> error_list; for (size_t i = 0; i < json->mutable_array()->size(); ++i) { Json& child = json->mutable_array()->at(i); if (child.type() != Json::Type::OBJECT) { error_list.push_back(GRPC_ERROR_CREATE_FROM_COPIED_STRING( absl::StrCat("array element ", i, " is not an object").c_str())); } else { - grpc_error* parse_error = ParseChannelCreds(&child, i, server); + grpc_error_handle parse_error = ParseChannelCreds(&child, i, server); if (parse_error != GRPC_ERROR_NONE) error_list.push_back(parse_error); } } @@ -304,9 +233,9 @@ grpc_error* XdsBootstrap::ParseChannelCredsArray(Json* json, &error_list); } -grpc_error* XdsBootstrap::ParseChannelCreds(Json* json, size_t idx, - XdsServer* server) { - std::vector<grpc_error*> error_list; +grpc_error_handle XdsBootstrap::ParseChannelCreds(Json* json, size_t idx, + XdsServer* server) { + std::vector<grpc_error_handle> error_list; std::string type; auto it = json->mutable_object()->find("type"); if (it == json->mutable_object()->end()) { @@ -342,7 +271,7 @@ grpc_error* XdsBootstrap::ParseChannelCreds(Json* json, size_t idx, // Can't use GRPC_ERROR_CREATE_FROM_VECTOR() here, because the error // string is not static in this case. if (error_list.empty()) return GRPC_ERROR_NONE; - grpc_error* error = GRPC_ERROR_CREATE_FROM_COPIED_STRING( + grpc_error_handle error = GRPC_ERROR_CREATE_FROM_COPIED_STRING( absl::StrCat("errors parsing index ", idx).c_str()); for (size_t i = 0; i < error_list.size(); ++i) { error = grpc_error_add_child(error, error_list[i]); @@ -350,30 +279,22 @@ grpc_error* XdsBootstrap::ParseChannelCreds(Json* json, size_t idx, return error; } -grpc_error* XdsBootstrap::ParseServerFeaturesArray(Json* json, - XdsServer* server) { - std::vector<grpc_error*> error_list; +grpc_error_handle XdsBootstrap::ParseServerFeaturesArray(Json* json, + XdsServer* server) { + std::vector<grpc_error_handle> error_list; for (size_t i = 0; i < json->mutable_array()->size(); ++i) { Json& child = json->mutable_array()->at(i); if (child.type() == Json::Type::STRING && child.string_value() == "xds_v3") { - // TODO(roth): Remove env var check once we do interop testing and - // are sure that the v3 code actually works. - grpc_core::UniquePtr<char> enable_str( - gpr_getenv("GRPC_XDS_EXPERIMENTAL_V3_SUPPORT")); - bool enabled = false; - if (gpr_parse_bool_value(enable_str.get(), &enabled) && enabled) { - server->server_features.insert( - std::move(*child.mutable_string_value())); - } + server->server_features.insert(std::move(*child.mutable_string_value())); } } return GRPC_ERROR_CREATE_FROM_VECTOR( "errors parsing \"server_features\" array", &error_list); } -grpc_error* XdsBootstrap::ParseNode(Json* json) { - std::vector<grpc_error*> error_list; +grpc_error_handle XdsBootstrap::ParseNode(Json* json) { + std::vector<grpc_error_handle> error_list; node_ = absl::make_unique<Node>(); auto it = json->mutable_object()->find("id"); if (it != json->mutable_object()->end()) { @@ -399,7 +320,7 @@ grpc_error* XdsBootstrap::ParseNode(Json* json) { error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( "\"locality\" field is not an object")); } else { - grpc_error* parse_error = ParseLocality(&it->second); + grpc_error_handle parse_error = ParseLocality(&it->second); if (parse_error != GRPC_ERROR_NONE) error_list.push_back(parse_error); } } @@ -416,8 +337,8 @@ grpc_error* XdsBootstrap::ParseNode(Json* json) { &error_list); } -grpc_error* XdsBootstrap::ParseLocality(Json* json) { - std::vector<grpc_error*> error_list; +grpc_error_handle XdsBootstrap::ParseLocality(Json* json) { + std::vector<grpc_error_handle> error_list; auto it = json->mutable_object()->find("region"); if (it != json->mutable_object()->end()) { if (it->second.type() != Json::Type::STRING) { @@ -436,21 +357,21 @@ grpc_error* XdsBootstrap::ParseLocality(Json* json) { node_->locality_zone = std::move(*it->second.mutable_string_value()); } } - it = json->mutable_object()->find("subzone"); + it = json->mutable_object()->find("sub_zone"); if (it != json->mutable_object()->end()) { if (it->second.type() != Json::Type::STRING) { error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "\"subzone\" field is not a string")); + "\"sub_zone\" field is not a string")); } else { - node_->locality_subzone = std::move(*it->second.mutable_string_value()); + node_->locality_sub_zone = std::move(*it->second.mutable_string_value()); } } return GRPC_ERROR_CREATE_FROM_VECTOR("errors parsing \"locality\" object", &error_list); } -grpc_error* XdsBootstrap::ParseCertificateProviders(Json* json) { - std::vector<grpc_error*> error_list; +grpc_error_handle XdsBootstrap::ParseCertificateProviders(Json* json) { + std::vector<grpc_error_handle> error_list; for (auto& certificate_provider : *(json->mutable_object())) { if (certificate_provider.second.type() != Json::Type::OBJECT) { error_list.push_back(GRPC_ERROR_CREATE_FROM_COPIED_STRING( @@ -458,7 +379,7 @@ grpc_error* XdsBootstrap::ParseCertificateProviders(Json* json) { "\" is not an object") .c_str())); } else { - grpc_error* parse_error = ParseCertificateProvider( + grpc_error_handle parse_error = ParseCertificateProvider( certificate_provider.first, &certificate_provider.second); if (parse_error != GRPC_ERROR_NONE) error_list.push_back(parse_error); } @@ -467,9 +388,9 @@ grpc_error* XdsBootstrap::ParseCertificateProviders(Json* json) { "errors parsing \"certificate_providers\" object", &error_list); } -grpc_error* XdsBootstrap::ParseCertificateProvider( +grpc_error_handle XdsBootstrap::ParseCertificateProvider( const std::string& instance_name, Json* certificate_provider_json) { - std::vector<grpc_error*> error_list; + std::vector<grpc_error_handle> error_list; auto it = certificate_provider_json->mutable_object()->find("plugin_name"); if (it == certificate_provider_json->mutable_object()->end()) { error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( @@ -490,14 +411,14 @@ grpc_error* XdsBootstrap::ParseCertificateProvider( error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING( "\"config\" field is not an object")); } else { - grpc_error* parse_error = GRPC_ERROR_NONE; + grpc_error_handle parse_error = GRPC_ERROR_NONE; config = factory->CreateCertificateProviderConfig(it->second, &parse_error); if (parse_error != GRPC_ERROR_NONE) error_list.push_back(parse_error); } } else { // "config" is an optional field, so create an empty JSON object. - grpc_error* parse_error = GRPC_ERROR_NONE; + grpc_error_handle parse_error = GRPC_ERROR_NONE; config = factory->CreateCertificateProviderConfig(Json::Object(), &parse_error); if (parse_error != GRPC_ERROR_NONE) error_list.push_back(parse_error); @@ -509,7 +430,7 @@ grpc_error* XdsBootstrap::ParseCertificateProvider( // Can't use GRPC_ERROR_CREATE_FROM_VECTOR() here, because the error // string is not static in this case. if (error_list.empty()) return GRPC_ERROR_NONE; - grpc_error* error = GRPC_ERROR_CREATE_FROM_COPIED_STRING( + grpc_error_handle error = GRPC_ERROR_CREATE_FROM_COPIED_STRING( absl::StrCat("errors parsing element \"", instance_name, "\"").c_str()); for (size_t i = 0; i < error_list.size(); ++i) { error = grpc_error_add_child(error, error_list[i]); @@ -517,4 +438,56 @@ grpc_error* XdsBootstrap::ParseCertificateProvider( return error; } +std::string XdsBootstrap::ToString() const { + std::vector<std::string> parts; + if (node_ != nullptr) { + parts.push_back(absl::StrFormat( + "node={\n" + " id=\"%s\",\n" + " cluster=\"%s\",\n" + " locality={\n" + " region=\"%s\",\n" + " zone=\"%s\",\n" + " sub_zone=\"%s\"\n" + " },\n" + " metadata=%s,\n" + "},\n", + node_->id, node_->cluster, node_->locality_region, node_->locality_zone, + node_->locality_sub_zone, node_->metadata.Dump())); + } + parts.push_back( + absl::StrFormat("servers=[\n" + " {\n" + " uri=\"%s\",\n" + " creds_type=%s,\n", + server().server_uri, server().channel_creds_type)); + if (server().channel_creds_config.type() != Json::Type::JSON_NULL) { + parts.push_back(absl::StrFormat(" creds_config=%s,", + server().channel_creds_config.Dump())); + } + if (!server().server_features.empty()) { + parts.push_back(absl::StrCat(" server_features=[", + absl::StrJoin(server().server_features, ", "), + "],\n")); + } + parts.push_back(" }\n],\n"); + if (!server_listener_resource_name_template_.empty()) { + parts.push_back( + absl::StrFormat("server_listener_resource_name_template=\"%s\",\n", + server_listener_resource_name_template_)); + } + parts.push_back("certificate_providers={\n"); + for (const auto& entry : certificate_providers_) { + parts.push_back( + absl::StrFormat(" %s={\n" + " plugin_name=%s\n" + " config=%s\n" + " },\n", + entry.first, entry.second.plugin_name, + entry.second.config->ToString())); + } + parts.push_back("}"); + return absl::StrJoin(parts, ""); +} + } // namespace grpc_core diff --git a/grpc/src/core/ext/xds/xds_bootstrap.h b/grpc/src/core/ext/xds/xds_bootstrap.h index 969d5d54..eff5e7ab 100644 --- a/grpc/src/core/ext/xds/xds_bootstrap.h +++ b/grpc/src/core/ext/xds/xds_bootstrap.h @@ -54,7 +54,7 @@ class XdsBootstrap { std::string cluster; std::string locality_region; std::string locality_zone; - std::string locality_subzone; + std::string locality_sub_zone; Json metadata; }; @@ -67,19 +67,24 @@ class XdsBootstrap { bool ShouldUseV3() const; }; + // Creates bootstrap object from json_string. // If *error is not GRPC_ERROR_NONE after returning, then there was an - // error reading the file. - static std::unique_ptr<XdsBootstrap> ReadFromFile(XdsClient* client, - TraceFlag* tracer, - grpc_error** error); + // error parsing the contents. + static std::unique_ptr<XdsBootstrap> Create(absl::string_view json_string, + grpc_error_handle* error); - // Do not instantiate directly -- use ReadFromFile() above instead. - XdsBootstrap(Json json, grpc_error** error); + // Do not instantiate directly -- use Create() above instead. + XdsBootstrap(Json json, grpc_error_handle* error); + + std::string ToString() const; // TODO(roth): We currently support only one server. Fix this when we // add support for fallback for the xds channel. const XdsServer& server() const { return servers_[0]; } const Node* node() const { return node_.get(); } + const std::string& server_listener_resource_name_template() const { + return server_listener_resource_name_template_; + } const CertificateProviderStore::PluginDefinitionMap& certificate_providers() const { @@ -87,19 +92,21 @@ class XdsBootstrap { } private: - grpc_error* ParseXdsServerList(Json* json); - grpc_error* ParseXdsServer(Json* json, size_t idx); - grpc_error* ParseChannelCredsArray(Json* json, XdsServer* server); - grpc_error* ParseChannelCreds(Json* json, size_t idx, XdsServer* server); - grpc_error* ParseServerFeaturesArray(Json* json, XdsServer* server); - grpc_error* ParseNode(Json* json); - grpc_error* ParseLocality(Json* json); - grpc_error* ParseCertificateProviders(Json* json); - grpc_error* ParseCertificateProvider(const std::string& instance_name, - Json* certificate_provider_json); + grpc_error_handle ParseXdsServerList(Json* json); + grpc_error_handle ParseXdsServer(Json* json, size_t idx); + grpc_error_handle ParseChannelCredsArray(Json* json, XdsServer* server); + grpc_error_handle ParseChannelCreds(Json* json, size_t idx, + XdsServer* server); + grpc_error_handle ParseServerFeaturesArray(Json* json, XdsServer* server); + grpc_error_handle ParseNode(Json* json); + grpc_error_handle ParseLocality(Json* json); + grpc_error_handle ParseCertificateProviders(Json* json); + grpc_error_handle ParseCertificateProvider(const std::string& instance_name, + Json* certificate_provider_json); absl::InlinedVector<XdsServer, 1> servers_; std::unique_ptr<Node> node_; + std::string server_listener_resource_name_template_; CertificateProviderStore::PluginDefinitionMap certificate_providers_; }; diff --git a/grpc/src/core/ext/xds/xds_certificate_provider.cc b/grpc/src/core/ext/xds/xds_certificate_provider.cc index f285b6db..ce1ba673 100644 --- a/grpc/src/core/ext/xds/xds_certificate_provider.cc +++ b/grpc/src/core/ext/xds/xds_certificate_provider.cc @@ -37,23 +37,24 @@ class RootCertificatesWatcher // presently, the watcher is immediately deleted when // CancelTlsCertificatesWatch() is called, but that can potentially change in // the future. - explicit RootCertificatesWatcher( - RefCountedPtr<grpc_tls_certificate_distributor> parent) - : parent_(std::move(parent)) {} + RootCertificatesWatcher( + RefCountedPtr<grpc_tls_certificate_distributor> parent, + std::string cert_name) + : parent_(std::move(parent)), cert_name_(std::move(cert_name)) {} void OnCertificatesChanged(absl::optional<absl::string_view> root_certs, absl::optional<PemKeyCertPairList> /* key_cert_pairs */) override { if (root_certs.has_value()) { - parent_->SetKeyMaterials("", std::string(root_certs.value()), + parent_->SetKeyMaterials(cert_name_, std::string(root_certs.value()), absl::nullopt); } } - void OnError(grpc_error* root_cert_error, - grpc_error* identity_cert_error) override { + void OnError(grpc_error_handle root_cert_error, + grpc_error_handle identity_cert_error) override { if (root_cert_error != GRPC_ERROR_NONE) { - parent_->SetErrorForCert("", root_cert_error /* pass the ref */, + parent_->SetErrorForCert(cert_name_, root_cert_error /* pass the ref */, absl::nullopt); } GRPC_ERROR_UNREF(identity_cert_error); @@ -61,6 +62,7 @@ class RootCertificatesWatcher private: RefCountedPtr<grpc_tls_certificate_distributor> parent_; + std::string cert_name_; }; class IdentityCertificatesWatcher @@ -71,22 +73,23 @@ class IdentityCertificatesWatcher // presently, the watcher is immediately deleted when // CancelTlsCertificatesWatch() is called, but that can potentially change in // the future. - explicit IdentityCertificatesWatcher( - RefCountedPtr<grpc_tls_certificate_distributor> parent) - : parent_(std::move(parent)) {} + IdentityCertificatesWatcher( + RefCountedPtr<grpc_tls_certificate_distributor> parent, + std::string cert_name) + : parent_(std::move(parent)), cert_name_(std::move(cert_name)) {} void OnCertificatesChanged( absl::optional<absl::string_view> /* root_certs */, absl::optional<PemKeyCertPairList> key_cert_pairs) override { if (key_cert_pairs.has_value()) { - parent_->SetKeyMaterials("", absl::nullopt, key_cert_pairs); + parent_->SetKeyMaterials(cert_name_, absl::nullopt, key_cert_pairs); } } - void OnError(grpc_error* root_cert_error, - grpc_error* identity_cert_error) override { + void OnError(grpc_error_handle root_cert_error, + grpc_error_handle identity_cert_error) override { if (identity_cert_error != GRPC_ERROR_NONE) { - parent_->SetErrorForCert("", absl::nullopt, + parent_->SetErrorForCert(cert_name_, absl::nullopt, identity_cert_error /* pass the ref */); } GRPC_ERROR_UNREF(root_cert_error); @@ -94,34 +97,35 @@ class IdentityCertificatesWatcher private: RefCountedPtr<grpc_tls_certificate_distributor> parent_; + std::string cert_name_; }; } // namespace -XdsCertificateProvider::XdsCertificateProvider( - absl::string_view root_cert_name, - RefCountedPtr<grpc_tls_certificate_distributor> root_cert_distributor, - absl::string_view identity_cert_name, - RefCountedPtr<grpc_tls_certificate_distributor> identity_cert_distributor, - std::vector<XdsApi::StringMatcher> san_matchers) - : root_cert_name_(root_cert_name), - identity_cert_name_(identity_cert_name), - root_cert_distributor_(std::move(root_cert_distributor)), - identity_cert_distributor_(std::move(identity_cert_distributor)), - san_matchers_(std::move(san_matchers)), - distributor_(MakeRefCounted<grpc_tls_certificate_distributor>()) { - distributor_->SetWatchStatusCallback( - absl::bind_front(&XdsCertificateProvider::WatchStatusCallback, this)); +// +// XdsCertificateProvider::ClusterCertificateState +// + +XdsCertificateProvider::ClusterCertificateState::~ClusterCertificateState() { + if (root_cert_watcher_ != nullptr) { + root_cert_distributor_->CancelTlsCertificatesWatch(root_cert_watcher_); + } + if (identity_cert_watcher_ != nullptr) { + identity_cert_distributor_->CancelTlsCertificatesWatch( + identity_cert_watcher_); + } } -XdsCertificateProvider::~XdsCertificateProvider() { - distributor_->SetWatchStatusCallback(nullptr); +bool XdsCertificateProvider::ClusterCertificateState::IsSafeToRemove() const { + return !watching_root_certs_ && !watching_identity_certs_ && + root_cert_distributor_ == nullptr && + identity_cert_distributor_ == nullptr; } -void XdsCertificateProvider::UpdateRootCertNameAndDistributor( - absl::string_view root_cert_name, - RefCountedPtr<grpc_tls_certificate_distributor> root_cert_distributor) { - MutexLock lock(&mu_); +void XdsCertificateProvider::ClusterCertificateState:: + UpdateRootCertNameAndDistributor( + const std::string& cert_name, absl::string_view root_cert_name, + RefCountedPtr<grpc_tls_certificate_distributor> root_cert_distributor) { if (root_cert_name_ == root_cert_name && root_cert_distributor_ == root_cert_distributor) { return; @@ -133,10 +137,10 @@ void XdsCertificateProvider::UpdateRootCertNameAndDistributor( root_cert_distributor_->CancelTlsCertificatesWatch(root_cert_watcher_); } if (root_cert_distributor != nullptr) { - UpdateRootCertWatcher(root_cert_distributor.get()); + UpdateRootCertWatcher(cert_name, root_cert_distributor.get()); } else { root_cert_watcher_ = nullptr; - distributor_->SetErrorForCert( + xds_certificate_provider_->distributor_->SetErrorForCert( "", GRPC_ERROR_CREATE_FROM_STATIC_STRING( "No certificate provider available for root certificates"), @@ -147,10 +151,11 @@ void XdsCertificateProvider::UpdateRootCertNameAndDistributor( root_cert_distributor_ = std::move(root_cert_distributor); } -void XdsCertificateProvider::UpdateIdentityCertNameAndDistributor( - absl::string_view identity_cert_name, - RefCountedPtr<grpc_tls_certificate_distributor> identity_cert_distributor) { - MutexLock lock(&mu_); +void XdsCertificateProvider::ClusterCertificateState:: + UpdateIdentityCertNameAndDistributor( + const std::string& cert_name, absl::string_view identity_cert_name, + RefCountedPtr<grpc_tls_certificate_distributor> + identity_cert_distributor) { if (identity_cert_name_ == identity_cert_name && identity_cert_distributor_ == identity_cert_distributor) { return; @@ -163,10 +168,10 @@ void XdsCertificateProvider::UpdateIdentityCertNameAndDistributor( identity_cert_watcher_); } if (identity_cert_distributor != nullptr) { - UpdateIdentityCertWatcher(identity_cert_distributor.get()); + UpdateIdentityCertWatcher(cert_name, identity_cert_distributor.get()); } else { identity_cert_watcher_ = nullptr; - distributor_->SetErrorForCert( + xds_certificate_provider_->distributor_->SetErrorForCert( "", absl::nullopt, GRPC_ERROR_CREATE_FROM_STATIC_STRING( "No certificate provider available for identity certificates")); @@ -176,42 +181,45 @@ void XdsCertificateProvider::UpdateIdentityCertNameAndDistributor( identity_cert_distributor_ = std::move(identity_cert_distributor); } -void XdsCertificateProvider::UpdateSubjectAlternativeNameMatchers( - std::vector<XdsApi::StringMatcher> matchers) { - MutexLock lock(&san_matchers_mu_); - san_matchers_ = std::move(matchers); +void XdsCertificateProvider::ClusterCertificateState::UpdateRootCertWatcher( + const std::string& cert_name, + grpc_tls_certificate_distributor* root_cert_distributor) { + auto watcher = absl::make_unique<RootCertificatesWatcher>( + xds_certificate_provider_->distributor_, cert_name); + root_cert_watcher_ = watcher.get(); + root_cert_distributor->WatchTlsCertificates(std::move(watcher), + root_cert_name_, absl::nullopt); } -void XdsCertificateProvider::WatchStatusCallback(std::string cert_name, - bool root_being_watched, - bool identity_being_watched) { +void XdsCertificateProvider::ClusterCertificateState::UpdateIdentityCertWatcher( + const std::string& cert_name, + grpc_tls_certificate_distributor* identity_cert_distributor) { + auto watcher = absl::make_unique<IdentityCertificatesWatcher>( + xds_certificate_provider_->distributor_, cert_name); + identity_cert_watcher_ = watcher.get(); + identity_cert_distributor->WatchTlsCertificates( + std::move(watcher), absl::nullopt, identity_cert_name_); +} + +void XdsCertificateProvider::ClusterCertificateState::WatchStatusCallback( + const std::string& cert_name, bool root_being_watched, + bool identity_being_watched) { // We aren't specially handling the case where root_cert_distributor is same // as identity_cert_distributor. Always using two separate watchers // irrespective of the fact results in a straightforward design, and using a // single watcher does not seem to provide any benefit other than cutting down // on the number of callbacks. - MutexLock lock(&mu_); - if (!cert_name.empty()) { - grpc_error* error = GRPC_ERROR_CREATE_FROM_COPIED_STRING( - absl::StrCat("Illegal certificate name: \'", cert_name, - "\'. Should be empty.") - .c_str()); - distributor_->SetErrorForCert(cert_name, GRPC_ERROR_REF(error), - GRPC_ERROR_REF(error)); - GRPC_ERROR_UNREF(error); - return; - } if (root_being_watched && !watching_root_certs_) { // We need to start watching root certs. watching_root_certs_ = true; if (root_cert_distributor_ == nullptr) { - distributor_->SetErrorForCert( - "", + xds_certificate_provider_->distributor_->SetErrorForCert( + cert_name, GRPC_ERROR_CREATE_FROM_STATIC_STRING( "No certificate provider available for root certificates"), absl::nullopt); } else { - UpdateRootCertWatcher(root_cert_distributor_.get()); + UpdateRootCertWatcher(cert_name, root_cert_distributor_.get()); } } else if (!root_being_watched && watching_root_certs_) { // We need to cancel root certs watch. @@ -225,12 +233,12 @@ void XdsCertificateProvider::WatchStatusCallback(std::string cert_name, if (identity_being_watched && !watching_identity_certs_) { watching_identity_certs_ = true; if (identity_cert_distributor_ == nullptr) { - distributor_->SetErrorForCert( - "", absl::nullopt, + xds_certificate_provider_->distributor_->SetErrorForCert( + cert_name, absl::nullopt, GRPC_ERROR_CREATE_FROM_STATIC_STRING( "No certificate provider available for identity certificates")); } else { - UpdateIdentityCertWatcher(identity_cert_distributor_.get()); + UpdateIdentityCertWatcher(cert_name, identity_cert_distributor_.get()); } } else if (!identity_being_watched && watching_identity_certs_) { watching_identity_certs_ = false; @@ -243,20 +251,118 @@ void XdsCertificateProvider::WatchStatusCallback(std::string cert_name, } } -void XdsCertificateProvider::UpdateRootCertWatcher( - grpc_tls_certificate_distributor* root_cert_distributor) { - auto watcher = absl::make_unique<RootCertificatesWatcher>(distributor()); - root_cert_watcher_ = watcher.get(); - root_cert_distributor->WatchTlsCertificates(std::move(watcher), - root_cert_name_, absl::nullopt); +// +// XdsCertificateProvider +// + +XdsCertificateProvider::XdsCertificateProvider() + : distributor_(MakeRefCounted<grpc_tls_certificate_distributor>()) { + distributor_->SetWatchStatusCallback( + absl::bind_front(&XdsCertificateProvider::WatchStatusCallback, this)); } -void XdsCertificateProvider::UpdateIdentityCertWatcher( - grpc_tls_certificate_distributor* identity_cert_distributor) { - auto watcher = absl::make_unique<IdentityCertificatesWatcher>(distributor()); - identity_cert_watcher_ = watcher.get(); - identity_cert_distributor->WatchTlsCertificates( - std::move(watcher), absl::nullopt, identity_cert_name_); +XdsCertificateProvider::~XdsCertificateProvider() { + distributor_->SetWatchStatusCallback(nullptr); +} + +bool XdsCertificateProvider::ProvidesRootCerts(const std::string& cert_name) { + MutexLock lock(&mu_); + auto it = certificate_state_map_.find(cert_name); + if (it == certificate_state_map_.end()) return false; + return it->second->ProvidesRootCerts(); +} + +void XdsCertificateProvider::UpdateRootCertNameAndDistributor( + const std::string& cert_name, absl::string_view root_cert_name, + RefCountedPtr<grpc_tls_certificate_distributor> root_cert_distributor) { + MutexLock lock(&mu_); + auto it = certificate_state_map_.find(cert_name); + if (it == certificate_state_map_.end()) { + it = certificate_state_map_ + .emplace(cert_name, + absl::make_unique<ClusterCertificateState>(this)) + .first; + } + it->second->UpdateRootCertNameAndDistributor(cert_name, root_cert_name, + root_cert_distributor); + // Delete unused entries. + if (it->second->IsSafeToRemove()) certificate_state_map_.erase(it); +} + +bool XdsCertificateProvider::ProvidesIdentityCerts( + const std::string& cert_name) { + MutexLock lock(&mu_); + auto it = certificate_state_map_.find(cert_name); + if (it == certificate_state_map_.end()) return false; + return it->second->ProvidesIdentityCerts(); +} + +void XdsCertificateProvider::UpdateIdentityCertNameAndDistributor( + const std::string& cert_name, absl::string_view identity_cert_name, + RefCountedPtr<grpc_tls_certificate_distributor> identity_cert_distributor) { + MutexLock lock(&mu_); + auto it = certificate_state_map_.find(cert_name); + if (it == certificate_state_map_.end()) { + it = certificate_state_map_ + .emplace(cert_name, + absl::make_unique<ClusterCertificateState>(this)) + .first; + } + it->second->UpdateIdentityCertNameAndDistributor( + cert_name, identity_cert_name, identity_cert_distributor); + // Delete unused entries. + if (it->second->IsSafeToRemove()) certificate_state_map_.erase(it); +} + +bool XdsCertificateProvider::GetRequireClientCertificate( + const std::string& cert_name) { + MutexLock lock(&mu_); + auto it = certificate_state_map_.find(cert_name); + if (it == certificate_state_map_.end()) return false; + return it->second->require_client_certificate(); +} + +void XdsCertificateProvider::UpdateRequireClientCertificate( + const std::string& cert_name, bool require_client_certificate) { + MutexLock lock(&mu_); + auto it = certificate_state_map_.find(cert_name); + if (it == certificate_state_map_.end()) return; + it->second->set_require_client_certificate(require_client_certificate); +} + +std::vector<StringMatcher> XdsCertificateProvider::GetSanMatchers( + const std::string& cluster) { + MutexLock lock(&san_matchers_mu_); + auto it = san_matcher_map_.find(cluster); + if (it == san_matcher_map_.end()) return {}; + return it->second; +} + +void XdsCertificateProvider::UpdateSubjectAlternativeNameMatchers( + const std::string& cluster, std::vector<StringMatcher> matchers) { + MutexLock lock(&san_matchers_mu_); + if (matchers.empty()) { + san_matcher_map_.erase(cluster); + } else { + san_matcher_map_[cluster] = std::move(matchers); + } +} + +void XdsCertificateProvider::WatchStatusCallback(std::string cert_name, + bool root_being_watched, + bool identity_being_watched) { + MutexLock lock(&mu_); + auto it = certificate_state_map_.find(cert_name); + if (it == certificate_state_map_.end()) { + it = certificate_state_map_ + .emplace(cert_name, + absl::make_unique<ClusterCertificateState>(this)) + .first; + } + it->second->WatchStatusCallback(cert_name, root_being_watched, + identity_being_watched); + // Delete unused entries. + if (it->second->IsSafeToRemove()) certificate_state_map_.erase(it); } namespace { diff --git a/grpc/src/core/ext/xds/xds_certificate_provider.h b/grpc/src/core/ext/xds/xds_certificate_provider.h index 4d13423a..2f508830 100644 --- a/grpc/src/core/ext/xds/xds_certificate_provider.h +++ b/grpc/src/core/ext/xds/xds_certificate_provider.h @@ -31,44 +31,34 @@ namespace grpc_core { class XdsCertificateProvider : public grpc_tls_certificate_provider { public: - XdsCertificateProvider( - absl::string_view root_cert_name, - RefCountedPtr<grpc_tls_certificate_distributor> root_cert_distributor, - absl::string_view identity_cert_name, - RefCountedPtr<grpc_tls_certificate_distributor> identity_cert_distributor, - std::vector<XdsApi::StringMatcher> san_matchers); - + XdsCertificateProvider(); ~XdsCertificateProvider() override; - void UpdateRootCertNameAndDistributor( - absl::string_view root_cert_name, - RefCountedPtr<grpc_tls_certificate_distributor> root_cert_distributor); - void UpdateIdentityCertNameAndDistributor( - absl::string_view identity_cert_name, - RefCountedPtr<grpc_tls_certificate_distributor> - identity_cert_distributor); - void UpdateSubjectAlternativeNameMatchers( - std::vector<XdsApi::StringMatcher> matchers); - grpc_core::RefCountedPtr<grpc_tls_certificate_distributor> distributor() const override { return distributor_; } - bool ProvidesRootCerts() { - MutexLock lock(&mu_); - return root_cert_distributor_ != nullptr; - } + bool ProvidesRootCerts(const std::string& cert_name); + void UpdateRootCertNameAndDistributor( + const std::string& cert_name, absl::string_view root_cert_name, + RefCountedPtr<grpc_tls_certificate_distributor> root_cert_distributor); - bool ProvidesIdentityCerts() { - MutexLock lock(&mu_); - return identity_cert_distributor_ != nullptr; - } + bool ProvidesIdentityCerts(const std::string& cert_name); + void UpdateIdentityCertNameAndDistributor( + const std::string& cert_name, absl::string_view identity_cert_name, + RefCountedPtr<grpc_tls_certificate_distributor> + identity_cert_distributor); - std::vector<XdsApi::StringMatcher> subject_alternative_name_matchers() { - MutexLock lock(&san_matchers_mu_); - return san_matchers_; - } + bool GetRequireClientCertificate(const std::string& cert_name); + // Updating \a require_client_certificate for a non-existing \a cert_name has + // no effect. + void UpdateRequireClientCertificate(const std::string& cert_name, + bool require_client_certificate); + + std::vector<StringMatcher> GetSanMatchers(const std::string& cluster); + void UpdateSubjectAlternativeNameMatchers( + const std::string& cluster, std::vector<StringMatcher> matchers); grpc_arg MakeChannelArg() const; @@ -76,14 +66,73 @@ class XdsCertificateProvider : public grpc_tls_certificate_provider { const grpc_channel_args* args); private: + class ClusterCertificateState { + public: + explicit ClusterCertificateState( + XdsCertificateProvider* xds_certificate_provider) + : xds_certificate_provider_(xds_certificate_provider) {} + + ~ClusterCertificateState(); + + // Returns true if the certs aren't being watched and there are no + // distributors configured. + bool IsSafeToRemove() const; + + bool ProvidesRootCerts() const { return root_cert_distributor_ != nullptr; } + bool ProvidesIdentityCerts() const { + return identity_cert_distributor_ != nullptr; + } + + void UpdateRootCertNameAndDistributor( + const std::string& cert_name, absl::string_view root_cert_name, + RefCountedPtr<grpc_tls_certificate_distributor> root_cert_distributor); + void UpdateIdentityCertNameAndDistributor( + const std::string& cert_name, absl::string_view identity_cert_name, + RefCountedPtr<grpc_tls_certificate_distributor> + identity_cert_distributor); + + void UpdateRootCertWatcher( + const std::string& cert_name, + grpc_tls_certificate_distributor* root_cert_distributor); + void UpdateIdentityCertWatcher( + const std::string& cert_name, + grpc_tls_certificate_distributor* identity_cert_distributor); + + bool require_client_certificate() const { + return require_client_certificate_; + } + void set_require_client_certificate(bool require_client_certificate) { + require_client_certificate_ = require_client_certificate; + } + + void WatchStatusCallback(const std::string& cert_name, + bool root_being_watched, + bool identity_being_watched); + + private: + XdsCertificateProvider* xds_certificate_provider_; + bool watching_root_certs_ = false; + bool watching_identity_certs_ = false; + std::string root_cert_name_; + std::string identity_cert_name_; + RefCountedPtr<grpc_tls_certificate_distributor> root_cert_distributor_; + RefCountedPtr<grpc_tls_certificate_distributor> identity_cert_distributor_; + grpc_tls_certificate_distributor::TlsCertificatesWatcherInterface* + root_cert_watcher_ = nullptr; + grpc_tls_certificate_distributor::TlsCertificatesWatcherInterface* + identity_cert_watcher_ = nullptr; + bool require_client_certificate_ = false; + }; + void WatchStatusCallback(std::string cert_name, bool root_being_watched, bool identity_being_watched); - void UpdateRootCertWatcher( - grpc_tls_certificate_distributor* root_cert_distributor); - void UpdateIdentityCertWatcher( - grpc_tls_certificate_distributor* identity_cert_distributor); + + RefCountedPtr<grpc_tls_certificate_distributor> distributor_; Mutex mu_; + std::map<std::string /*cert_name*/, std::unique_ptr<ClusterCertificateState>> + certificate_state_map_ ABSL_GUARDED_BY(mu_); + // Use a separate mutex for san_matchers_ to avoid deadlocks since // san_matchers_ needs to be accessed when a handshake is being done and we // run into a possible deadlock scenario if using the same mutex. The mutex @@ -93,18 +142,8 @@ class XdsCertificateProvider : public grpc_tls_certificate_provider { // -> HandshakeManager::Add() -> SecurityHandshaker::DoHandshake() -> // subject_alternative_names_matchers() Mutex san_matchers_mu_; - bool watching_root_certs_ = false; - bool watching_identity_certs_ = false; - std::string root_cert_name_; - std::string identity_cert_name_; - RefCountedPtr<grpc_tls_certificate_distributor> root_cert_distributor_; - RefCountedPtr<grpc_tls_certificate_distributor> identity_cert_distributor_; - std::vector<XdsApi::StringMatcher> san_matchers_; - RefCountedPtr<grpc_tls_certificate_distributor> distributor_; - grpc_tls_certificate_distributor::TlsCertificatesWatcherInterface* - root_cert_watcher_ = nullptr; - grpc_tls_certificate_distributor::TlsCertificatesWatcherInterface* - identity_cert_watcher_ = nullptr; + std::map<std::string /*cluster_name*/, std::vector<StringMatcher>> + san_matcher_map_ ABSL_GUARDED_BY(san_matchers_mu_); }; } // namespace grpc_core diff --git a/grpc/src/core/ext/xds/xds_channel_args.h b/grpc/src/core/ext/xds/xds_channel_args.h index a2589403..ea6c862b 100644 --- a/grpc/src/core/ext/xds/xds_channel_args.h +++ b/grpc/src/core/ext/xds/xds_channel_args.h @@ -17,8 +17,11 @@ #ifndef GRPC_CORE_EXT_XDS_XDS_CHANNEL_ARGS_H #define GRPC_CORE_EXT_XDS_XDS_CHANNEL_ARGS_H -// Pointer channel arg containing a ref to the XdsClient object. -#define GRPC_ARG_XDS_CLIENT "grpc.xds_client" +// Specifies channel args for the xDS client. +// Used only when GRPC_ARG_TEST_ONLY_DO_NOT_USE_IN_PROD_XDS_BOOTSTRAP_CONFIG +// is set. +#define GRPC_ARG_TEST_ONLY_DO_NOT_USE_IN_PROD_XDS_CLIENT_CHANNEL_ARGS \ + "grpc.xds_client_channel_args" // Timeout in milliseconds to wait for a resource to be returned from // the xds server before assuming that it does not exist. diff --git a/grpc/src/core/ext/xds/xds_client.cc b/grpc/src/core/ext/xds/xds_client.cc index b31bbbdc..d3549997 100644 --- a/grpc/src/core/ext/xds/xds_client.cc +++ b/grpc/src/core/ext/xds/xds_client.cc @@ -1,20 +1,18 @@ -/* - * - * 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,19 +33,22 @@ #include "src/core/ext/filters/client_channel/client_channel.h" #include "src/core/ext/filters/client_channel/service_config.h" #include "src/core/ext/xds/xds_api.h" +#include "src/core/ext/xds/xds_bootstrap.h" #include "src/core/ext/xds/xds_channel_args.h" #include "src/core/ext/xds/xds_client.h" #include "src/core/ext/xds/xds_client_stats.h" +#include "src/core/ext/xds/xds_http_filters.h" +#include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/backoff/backoff.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_stack.h" +#include "src/core/lib/gpr/env.h" #include "src/core/lib/gpr/string.h" #include "src/core/lib/gprpp/memory.h" #include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/sockaddr.h" -#include "src/core/lib/iomgr/sockaddr_utils.h" #include "src/core/lib/iomgr/timer.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/slice/slice_string_helpers.h" @@ -70,8 +71,9 @@ TraceFlag grpc_xds_client_refcount_trace(false, "xds_client_refcount"); namespace { Mutex* g_mu = nullptr; -const grpc_channel_args* g_channel_args = nullptr; -XdsClient* g_xds_client = nullptr; +const grpc_channel_args* g_channel_args ABSL_GUARDED_BY(*g_mu) = nullptr; +XdsClient* g_xds_client ABSL_GUARDED_BY(*g_mu) = nullptr; +char* g_fallback_bootstrap_config ABSL_GUARDED_BY(*g_mu) = nullptr; } // namespace @@ -99,8 +101,8 @@ class XdsClient::ChannelState::RetryableCall private: void StartNewCallLocked(); void StartRetryTimerLocked(); - static void OnRetryTimer(void* arg, grpc_error* error); - void OnRetryTimerLocked(grpc_error* error); + static void OnRetryTimer(void* arg, grpc_error_handle error); + void OnRetryTimerLocked(grpc_error_handle error); // The wrapped xds call that talks to the xds server. It's instantiated // every time we start a new call. It's null during call retry backoff. @@ -132,9 +134,11 @@ class XdsClient::ChannelState::AdsCallState XdsClient* xds_client() const { return chand()->xds_client(); } bool seen_response() const { return seen_response_; } - void Subscribe(const std::string& type_url, const std::string& name); - void Unsubscribe(const std::string& type_url, const std::string& name, - bool delay_unsubscription); + void SubscribeLocked(const std::string& type_url, const std::string& name) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(&XdsClient::mu_); + void UnsubscribeLocked(const std::string& type_url, const std::string& name, + bool delay_unsubscription) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(&XdsClient::mu_); bool HasSubscribedResources() const; @@ -175,7 +179,7 @@ class XdsClient::ChannelState::AdsCallState } private: - static void OnTimer(void* arg, grpc_error* error) { + static void OnTimer(void* arg, grpc_error_handle error) { ResourceState* self = static_cast<ResourceState*>(arg); { MutexLock lock(&self->ads_calld_->xds_client()->mu_); @@ -185,36 +189,43 @@ class XdsClient::ChannelState::AdsCallState self->Unref(DEBUG_LOCATION, "timer"); } - void OnTimerLocked(grpc_error* error) { + void OnTimerLocked(grpc_error_handle error) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(&XdsClient::mu_) { if (error == GRPC_ERROR_NONE && timer_pending_) { timer_pending_ = false; - grpc_error* watcher_error = GRPC_ERROR_CREATE_FROM_COPIED_STRING( + grpc_error_handle watcher_error = GRPC_ERROR_CREATE_FROM_COPIED_STRING( absl::StrFormat( "timeout obtaining resource {type=%s name=%s} from xds server", type_url_, name_) .c_str()); + watcher_error = grpc_error_set_int( + watcher_error, GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_UNAVAILABLE); if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_trace)) { gpr_log(GPR_INFO, "[xds_client %p] %s", ads_calld_->xds_client(), - grpc_error_string(watcher_error)); + grpc_error_std_string(watcher_error).c_str()); } if (type_url_ == XdsApi::kLdsTypeUrl) { ListenerState& state = ads_calld_->xds_client()->listener_map_[name_]; + state.meta.client_status = XdsApi::ResourceMetadata::DOES_NOT_EXIST; for (const auto& p : state.watchers) { p.first->OnError(GRPC_ERROR_REF(watcher_error)); } } else if (type_url_ == XdsApi::kRdsTypeUrl) { RouteConfigState& state = ads_calld_->xds_client()->route_config_map_[name_]; + state.meta.client_status = XdsApi::ResourceMetadata::DOES_NOT_EXIST; for (const auto& p : state.watchers) { p.first->OnError(GRPC_ERROR_REF(watcher_error)); } } else if (type_url_ == XdsApi::kCdsTypeUrl) { ClusterState& state = ads_calld_->xds_client()->cluster_map_[name_]; + state.meta.client_status = XdsApi::ResourceMetadata::DOES_NOT_EXIST; for (const auto& p : state.watchers) { p.first->OnError(GRPC_ERROR_REF(watcher_error)); } } else if (type_url_ == XdsApi::kEdsTypeUrl) { EndpointState& state = ads_calld_->xds_client()->endpoint_map_[name_]; + state.meta.client_status = XdsApi::ResourceMetadata::DOES_NOT_EXIST; for (const auto& p : state.watchers) { p.first->OnError(GRPC_ERROR_REF(watcher_error)); } @@ -241,26 +252,38 @@ class XdsClient::ChannelState::AdsCallState // Nonce and error for this resource type. std::string nonce; - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; // Subscribed resources of this type. std::map<std::string /* name */, OrphanablePtr<ResourceState>> subscribed_resources; }; - void SendMessageLocked(const std::string& type_url); - - void AcceptLdsUpdate(XdsApi::LdsUpdateMap lds_update_map); - void AcceptRdsUpdate(XdsApi::RdsUpdateMap rds_update_map); - void AcceptCdsUpdate(XdsApi::CdsUpdateMap cds_update_map); - void AcceptEdsUpdate(XdsApi::EdsUpdateMap eds_update_map); - - static void OnRequestSent(void* arg, grpc_error* error); - void OnRequestSentLocked(grpc_error* error); - static void OnResponseReceived(void* arg, grpc_error* error); - bool OnResponseReceivedLocked(); - static void OnStatusReceived(void* arg, grpc_error* error); - void OnStatusReceivedLocked(grpc_error* error); + void SendMessageLocked(const std::string& type_url) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(&XdsClient::mu_); + + void AcceptLdsUpdateLocked(std::string version, grpc_millis update_time, + XdsApi::LdsUpdateMap lds_update_map) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(&XdsClient::mu_); + void AcceptRdsUpdateLocked(std::string version, grpc_millis update_time, + XdsApi::RdsUpdateMap rds_update_map) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(&XdsClient::mu_); + void AcceptCdsUpdateLocked(std::string version, grpc_millis update_time, + XdsApi::CdsUpdateMap cds_update_map) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(&XdsClient::mu_); + void AcceptEdsUpdateLocked(std::string version, grpc_millis update_time, + XdsApi::EdsUpdateMap eds_update_map) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(&XdsClient::mu_); + + static void OnRequestSent(void* arg, grpc_error_handle error); + void OnRequestSentLocked(grpc_error_handle error) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(&XdsClient::mu_); + static void OnResponseReceived(void* arg, grpc_error_handle error); + bool OnResponseReceivedLocked() + ABSL_EXCLUSIVE_LOCKS_REQUIRED(&XdsClient::mu_); + static void OnStatusReceived(void* arg, grpc_error_handle error); + void OnStatusReceivedLocked(grpc_error_handle error) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(&XdsClient::mu_); bool IsCurrentCallOnChannel() const; @@ -333,12 +356,15 @@ class XdsClient::ChannelState::LrsCallState void Orphan() override; private: - void ScheduleNextReportLocked(); - static void OnNextReportTimer(void* arg, grpc_error* error); - bool OnNextReportTimerLocked(grpc_error* error); - bool SendReportLocked(); - static void OnReportDone(void* arg, grpc_error* error); - bool OnReportDoneLocked(grpc_error* error); + void ScheduleNextReportLocked() + ABSL_EXCLUSIVE_LOCKS_REQUIRED(&XdsClient::mu_); + static void OnNextReportTimer(void* arg, grpc_error_handle error); + bool OnNextReportTimerLocked(grpc_error_handle error) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(&XdsClient::mu_); + bool SendReportLocked() ABSL_EXCLUSIVE_LOCKS_REQUIRED(&XdsClient::mu_); + static void OnReportDone(void* arg, grpc_error_handle error); + bool OnReportDoneLocked(grpc_error_handle error) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(&XdsClient::mu_); bool IsCurrentReporterOnCall() const { return this == parent_->reporter_.get(); @@ -357,12 +383,15 @@ class XdsClient::ChannelState::LrsCallState grpc_closure on_report_done_; }; - static void OnInitialRequestSent(void* arg, grpc_error* error); - void OnInitialRequestSentLocked(); - static void OnResponseReceived(void* arg, grpc_error* error); - bool OnResponseReceivedLocked(); - static void OnStatusReceived(void* arg, grpc_error* error); - void OnStatusReceivedLocked(grpc_error* error); + static void OnInitialRequestSent(void* arg, grpc_error_handle error); + void OnInitialRequestSentLocked() + ABSL_EXCLUSIVE_LOCKS_REQUIRED(&XdsClient::mu_); + static void OnResponseReceived(void* arg, grpc_error_handle error); + bool OnResponseReceivedLocked() + ABSL_EXCLUSIVE_LOCKS_REQUIRED(&XdsClient::mu_); + static void OnStatusReceived(void* arg, grpc_error_handle error); + void OnStatusReceivedLocked(grpc_error_handle error) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(&XdsClient::mu_); bool IsCurrentCallOnChannel() const; @@ -418,7 +447,7 @@ class XdsClient::ChannelState::StateWatcher "[xds_client %p] xds channel in state:TRANSIENT_FAILURE " "status_message:(%s)", parent_->xds_client(), status.ToString().c_str()); - parent_->xds_client()->NotifyOnErrorLocked( + parent_->xds_client_->NotifyOnErrorLocked( GRPC_ERROR_CREATE_FROM_STATIC_STRING( "xds channel in TRANSIENT_FAILURE")); } @@ -433,26 +462,13 @@ class XdsClient::ChannelState::StateWatcher namespace { -grpc_channel* CreateXdsChannel(const XdsBootstrap::XdsServer& server) { - // Build channel args. - absl::InlinedVector<grpc_arg, 2> args_to_add = { - grpc_channel_arg_integer_create( - const_cast<char*>(GRPC_ARG_KEEPALIVE_TIME_MS), - 5 * 60 * GPR_MS_PER_SEC), - grpc_channel_arg_integer_create( - const_cast<char*>(GRPC_ARG_CHANNELZ_IS_INTERNAL_CHANNEL), 1), - }; - grpc_channel_args* new_args = grpc_channel_args_copy_and_add( - g_channel_args, args_to_add.data(), args_to_add.size()); - // Create channel creds. +grpc_channel* CreateXdsChannel(grpc_channel_args* args, + const XdsBootstrap::XdsServer& server) { RefCountedPtr<grpc_channel_credentials> channel_creds = XdsChannelCredsRegistry::MakeChannelCreds(server.channel_creds_type, server.channel_creds_config); - // Create channel. - grpc_channel* channel = grpc_secure_channel_create( - channel_creds.get(), server.server_uri.c_str(), new_args, nullptr); - grpc_channel_args_destroy(new_args); - return channel; + return grpc_secure_channel_create(channel_creds.get(), + server.server_uri.c_str(), args, nullptr); } } // namespace @@ -469,7 +485,7 @@ XdsClient::ChannelState::ChannelState(WeakRefCountedPtr<XdsClient> xds_client, gpr_log(GPR_INFO, "[xds_client %p] creating channel to %s", xds_client_.get(), server.server_uri.c_str()); } - channel_ = CreateXdsChannel(server); + channel_ = CreateXdsChannel(xds_client_->args_, server); GPR_ASSERT(channel_ != nullptr); StartConnectivityWatchLocked(); } @@ -502,7 +518,7 @@ XdsClient::ChannelState::LrsCallState* XdsClient::ChannelState::lrs_calld() } bool XdsClient::ChannelState::HasActiveAdsCall() const { - return ads_calld_->calld() != nullptr; + return ads_calld_ != nullptr && ads_calld_->calld() != nullptr; } void XdsClient::ChannelState::MaybeStartLrsCall() { @@ -514,24 +530,22 @@ void XdsClient::ChannelState::MaybeStartLrsCall() { void XdsClient::ChannelState::StopLrsCall() { lrs_calld_.reset(); } void XdsClient::ChannelState::StartConnectivityWatchLocked() { - grpc_channel_element* client_channel_elem = - grpc_channel_stack_last_element(grpc_channel_get_channel_stack(channel_)); - GPR_ASSERT(client_channel_elem->filter == &grpc_client_channel_filter); + ClientChannel* client_channel = ClientChannel::GetFromChannel(channel_); + GPR_ASSERT(client_channel != nullptr); watcher_ = new StateWatcher(Ref(DEBUG_LOCATION, "ChannelState+watch")); - grpc_client_channel_start_connectivity_watch( - client_channel_elem, GRPC_CHANNEL_IDLE, + client_channel->AddConnectivityWatcher( + GRPC_CHANNEL_IDLE, OrphanablePtr<AsyncConnectivityStateWatcherInterface>(watcher_)); } void XdsClient::ChannelState::CancelConnectivityWatchLocked() { - grpc_channel_element* client_channel_elem = - grpc_channel_stack_last_element(grpc_channel_get_channel_stack(channel_)); - GPR_ASSERT(client_channel_elem->filter == &grpc_client_channel_filter); - grpc_client_channel_stop_connectivity_watch(client_channel_elem, watcher_); + ClientChannel* client_channel = ClientChannel::GetFromChannel(channel_); + GPR_ASSERT(client_channel != nullptr); + client_channel->RemoveConnectivityWatcher(watcher_); } -void XdsClient::ChannelState::Subscribe(const std::string& type_url, - const std::string& name) { +void XdsClient::ChannelState::SubscribeLocked(const std::string& type_url, + const std::string& name) { if (ads_calld_ == nullptr) { // Start the ADS call if this is the first request. ads_calld_.reset(new RetryableCall<AdsCallState>( @@ -545,16 +559,16 @@ void XdsClient::ChannelState::Subscribe(const std::string& type_url, // because when the call is restarted it will resend all necessary requests. if (ads_calld() == nullptr) return; // Subscribe to this resource if the ADS call is active. - ads_calld()->Subscribe(type_url, name); + ads_calld()->SubscribeLocked(type_url, name); } -void XdsClient::ChannelState::Unsubscribe(const std::string& type_url, - const std::string& name, - bool delay_unsubscription) { +void XdsClient::ChannelState::UnsubscribeLocked(const std::string& type_url, + const std::string& name, + bool delay_unsubscription) { if (ads_calld_ != nullptr) { auto* calld = ads_calld_->calld(); if (calld != nullptr) { - calld->Unsubscribe(type_url, name, delay_unsubscription); + calld->UnsubscribeLocked(type_url, name, delay_unsubscription); if (!calld->HasSubscribedResources()) ads_calld_.reset(); } } @@ -637,7 +651,7 @@ void XdsClient::ChannelState::RetryableCall<T>::StartRetryTimerLocked() { template <typename T> void XdsClient::ChannelState::RetryableCall<T>::OnRetryTimer( - void* arg, grpc_error* error) { + void* arg, grpc_error_handle error) { RetryableCall* calld = static_cast<RetryableCall*>(arg); { MutexLock lock(&calld->chand_->xds_client()->mu_); @@ -648,7 +662,7 @@ void XdsClient::ChannelState::RetryableCall<T>::OnRetryTimer( template <typename T> void XdsClient::ChannelState::RetryableCall<T>::OnRetryTimerLocked( - grpc_error* error) { + grpc_error_handle error) { retry_timer_callback_pending_ = false; if (!shutting_down_ && error == GRPC_ERROR_NONE) { if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_trace)) { @@ -716,16 +730,16 @@ XdsClient::ChannelState::AdsCallState::AdsCallState( GRPC_CLOSURE_INIT(&on_request_sent_, OnRequestSent, this, grpc_schedule_on_exec_ctx); for (const auto& p : xds_client()->listener_map_) { - Subscribe(XdsApi::kLdsTypeUrl, std::string(p.first)); + SubscribeLocked(XdsApi::kLdsTypeUrl, std::string(p.first)); } for (const auto& p : xds_client()->route_config_map_) { - Subscribe(XdsApi::kRdsTypeUrl, std::string(p.first)); + SubscribeLocked(XdsApi::kRdsTypeUrl, std::string(p.first)); } for (const auto& p : xds_client()->cluster_map_) { - Subscribe(XdsApi::kCdsTypeUrl, std::string(p.first)); + SubscribeLocked(XdsApi::kCdsTypeUrl, std::string(p.first)); } for (const auto& p : xds_client()->endpoint_map_) { - Subscribe(XdsApi::kEdsTypeUrl, std::string(p.first)); + SubscribeLocked(XdsApi::kEdsTypeUrl, std::string(p.first)); } // Op: recv initial metadata. op = ops; @@ -789,7 +803,8 @@ void XdsClient::ChannelState::AdsCallState::Orphan() { } void XdsClient::ChannelState::AdsCallState::SendMessageLocked( - const std::string& type_url) { + const std::string& type_url) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(&XdsClient::mu_) { // Buffer message sending if an existing message is in flight. if (send_message_payload_ != nullptr) { buffered_requests_.insert(type_url); @@ -814,7 +829,7 @@ void XdsClient::ChannelState::AdsCallState::SendMessageLocked( "error=%s resources=%s", xds_client(), type_url.c_str(), xds_client()->resource_version_map_[type_url].c_str(), - state.nonce.c_str(), grpc_error_string(state.error), + state.nonce.c_str(), grpc_error_std_string(state.error).c_str(), absl::StrJoin(resource_names, " ").c_str()); } GRPC_ERROR_UNREF(state.error); @@ -841,7 +856,7 @@ void XdsClient::ChannelState::AdsCallState::SendMessageLocked( } } -void XdsClient::ChannelState::AdsCallState::Subscribe( +void XdsClient::ChannelState::AdsCallState::SubscribeLocked( const std::string& type_url, const std::string& name) { auto& state = state_map_[type_url].subscribed_resources[name]; if (state == nullptr) { @@ -851,7 +866,7 @@ void XdsClient::ChannelState::AdsCallState::Subscribe( } } -void XdsClient::ChannelState::AdsCallState::Unsubscribe( +void XdsClient::ChannelState::AdsCallState::UnsubscribeLocked( const std::string& type_url, const std::string& name, bool delay_unsubscription) { state_map_[type_url].subscribed_resources.erase(name); @@ -865,7 +880,24 @@ bool XdsClient::ChannelState::AdsCallState::HasSubscribedResources() const { return false; } -void XdsClient::ChannelState::AdsCallState::AcceptLdsUpdate( +namespace { + +// Build a resource metadata struct for ADS result accepting methods and CSDS. +XdsApi::ResourceMetadata CreateResourceMetadataAcked( + std::string serialized_proto, std::string version, + grpc_millis update_time) { + XdsApi::ResourceMetadata resource_metadata; + resource_metadata.serialized_proto = std::move(serialized_proto); + resource_metadata.update_time = update_time; + resource_metadata.version = std::move(version); + resource_metadata.client_status = XdsApi::ResourceMetadata::ACKED; + return resource_metadata; +} + +} // namespace + +void XdsClient::ChannelState::AdsCallState::AcceptLdsUpdateLocked( + std::string version, grpc_millis update_time, XdsApi::LdsUpdateMap lds_update_map) { if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_trace)) { gpr_log(GPR_INFO, @@ -877,23 +909,17 @@ void XdsClient::ChannelState::AdsCallState::AcceptLdsUpdate( std::set<std::string> rds_resource_names_seen; for (auto& p : lds_update_map) { const std::string& listener_name = p.first; - XdsApi::LdsUpdate& lds_update = p.second; + XdsApi::LdsUpdate& lds_update = p.second.resource; auto& state = lds_state.subscribed_resources[listener_name]; if (state != nullptr) state->Finish(); if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_trace)) { - gpr_log(GPR_INFO, "[xds_client %p] LDS resource %s: route_config_name=%s", - xds_client(), listener_name.c_str(), - (!lds_update.route_config_name.empty() - ? lds_update.route_config_name.c_str() - : "<inlined>")); - if (lds_update.rds_update.has_value()) { - gpr_log(GPR_INFO, "RouteConfiguration: %s", - lds_update.rds_update->ToString().c_str()); - } + gpr_log(GPR_INFO, "[xds_client %p] LDS resource %s: %s", xds_client(), + listener_name.c_str(), lds_update.ToString().c_str()); } // Record the RDS resource names seen. - if (!lds_update.route_config_name.empty()) { - rds_resource_names_seen.insert(lds_update.route_config_name); + if (!lds_update.http_connection_manager.route_config_name.empty()) { + rds_resource_names_seen.insert( + lds_update.http_connection_manager.route_config_name); } // Ignore identical update. ListenerState& listener_state = xds_client()->listener_map_[listener_name]; @@ -909,6 +935,8 @@ void XdsClient::ChannelState::AdsCallState::AcceptLdsUpdate( } // Update the listener state. listener_state.update = std::move(lds_update); + listener_state.meta = CreateResourceMetadataAcked( + std::move(p.second.serialized_proto), version, update_time); // Notify watchers. for (const auto& p : listener_state.watchers) { p.first->OnListenerChanged(*listener_state.update); @@ -952,7 +980,8 @@ void XdsClient::ChannelState::AdsCallState::AcceptLdsUpdate( } } -void XdsClient::ChannelState::AdsCallState::AcceptRdsUpdate( +void XdsClient::ChannelState::AdsCallState::AcceptRdsUpdateLocked( + std::string version, grpc_millis update_time, XdsApi::RdsUpdateMap rds_update_map) { if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_trace)) { gpr_log(GPR_INFO, @@ -963,7 +992,7 @@ void XdsClient::ChannelState::AdsCallState::AcceptRdsUpdate( auto& rds_state = state_map_[XdsApi::kRdsTypeUrl]; for (auto& p : rds_update_map) { const std::string& route_config_name = p.first; - XdsApi::RdsUpdate& rds_update = p.second; + XdsApi::RdsUpdate& rds_update = p.second.resource; auto& state = rds_state.subscribed_resources[route_config_name]; if (state != nullptr) state->Finish(); if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_trace)) { @@ -984,6 +1013,8 @@ void XdsClient::ChannelState::AdsCallState::AcceptRdsUpdate( } // Update the cache. route_config_state.update = std::move(rds_update); + route_config_state.meta = CreateResourceMetadataAcked( + std::move(p.second.serialized_proto), version, update_time); // Notify all watchers. for (const auto& p : route_config_state.watchers) { p.first->OnRouteConfigChanged(*route_config_state.update); @@ -991,7 +1022,8 @@ void XdsClient::ChannelState::AdsCallState::AcceptRdsUpdate( } } -void XdsClient::ChannelState::AdsCallState::AcceptCdsUpdate( +void XdsClient::ChannelState::AdsCallState::AcceptCdsUpdateLocked( + std::string version, grpc_millis update_time, XdsApi::CdsUpdateMap cds_update_map) { if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_trace)) { gpr_log(GPR_INFO, @@ -1003,7 +1035,7 @@ void XdsClient::ChannelState::AdsCallState::AcceptCdsUpdate( std::set<std::string> eds_resource_names_seen; for (auto& p : cds_update_map) { const char* cluster_name = p.first.c_str(); - XdsApi::CdsUpdate& cds_update = p.second; + XdsApi::CdsUpdate& cds_update = p.second.resource; auto& state = cds_state.subscribed_resources[cluster_name]; if (state != nullptr) state->Finish(); if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_trace)) { @@ -1027,6 +1059,8 @@ void XdsClient::ChannelState::AdsCallState::AcceptCdsUpdate( } // Update the cluster state. cluster_state.update = std::move(cds_update); + cluster_state.meta = CreateResourceMetadataAcked( + std::move(p.second.serialized_proto), version, update_time); // Notify all watchers. for (const auto& p : cluster_state.watchers) { p.first->OnClusterChanged(cluster_state.update.value()); @@ -1069,7 +1103,8 @@ void XdsClient::ChannelState::AdsCallState::AcceptCdsUpdate( } } -void XdsClient::ChannelState::AdsCallState::AcceptEdsUpdate( +void XdsClient::ChannelState::AdsCallState::AcceptEdsUpdateLocked( + std::string version, grpc_millis update_time, XdsApi::EdsUpdateMap eds_update_map) { if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_trace)) { gpr_log(GPR_INFO, @@ -1080,7 +1115,7 @@ void XdsClient::ChannelState::AdsCallState::AcceptEdsUpdate( auto& eds_state = state_map_[XdsApi::kEdsTypeUrl]; for (auto& p : eds_update_map) { const char* eds_service_name = p.first.c_str(); - XdsApi::EdsUpdate& eds_update = p.second; + XdsApi::EdsUpdate& eds_update = p.second.resource; auto& state = eds_state.subscribed_resources[eds_service_name]; if (state != nullptr) state->Finish(); if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_trace)) { @@ -1101,6 +1136,8 @@ void XdsClient::ChannelState::AdsCallState::AcceptEdsUpdate( } // Update the cluster state. endpoint_state.update = std::move(eds_update); + endpoint_state.meta = CreateResourceMetadataAcked( + std::move(p.second.serialized_proto), version, update_time); // Notify all watchers. for (const auto& p : endpoint_state.watchers) { p.first->OnEndpointChanged(endpoint_state.update.value()); @@ -1108,8 +1145,8 @@ void XdsClient::ChannelState::AdsCallState::AcceptEdsUpdate( } } -void XdsClient::ChannelState::AdsCallState::OnRequestSent(void* arg, - grpc_error* error) { +void XdsClient::ChannelState::AdsCallState::OnRequestSent( + void* arg, grpc_error_handle error) { AdsCallState* ads_calld = static_cast<AdsCallState*>(arg); { MutexLock lock(&ads_calld->xds_client()->mu_); @@ -1119,7 +1156,7 @@ void XdsClient::ChannelState::AdsCallState::OnRequestSent(void* arg, } void XdsClient::ChannelState::AdsCallState::OnRequestSentLocked( - grpc_error* error) { + grpc_error_handle error) { if (IsCurrentCallOnChannel() && error == GRPC_ERROR_NONE) { // Clean up the sent message. grpc_byte_buffer_destroy(send_message_payload_); @@ -1143,7 +1180,7 @@ void XdsClient::ChannelState::AdsCallState::OnRequestSentLocked( } void XdsClient::ChannelState::AdsCallState::OnResponseReceived( - void* arg, grpc_error* /* error */) { + void* arg, grpc_error_handle /* error */) { AdsCallState* ads_calld = static_cast<AdsCallState*>(arg); bool done; { @@ -1167,7 +1204,8 @@ bool XdsClient::ChannelState::AdsCallState::OnResponseReceivedLocked() { recv_message_payload_ = nullptr; // Parse and validate the response. XdsApi::AdsParseResult result = xds_client()->api_.ParseAdsResponse( - response_slice, ResourceNamesForRequest(XdsApi::kLdsTypeUrl), + chand()->server_, response_slice, + ResourceNamesForRequest(XdsApi::kLdsTypeUrl), ResourceNamesForRequest(XdsApi::kRdsTypeUrl), ResourceNamesForRequest(XdsApi::kCdsTypeUrl), ResourceNamesForRequest(XdsApi::kEdsTypeUrl)); @@ -1176,14 +1214,17 @@ bool XdsClient::ChannelState::AdsCallState::OnResponseReceivedLocked() { // Ignore unparsable response. gpr_log(GPR_ERROR, "[xds_client %p] Error parsing ADS response (%s) -- ignoring", - xds_client(), grpc_error_string(result.parse_error)); + xds_client(), grpc_error_std_string(result.parse_error).c_str()); GRPC_ERROR_UNREF(result.parse_error); } else { + grpc_millis update_time = grpc_core::ExecCtx::Get()->Now(); // Update nonce. auto& state = state_map_[result.type_url]; state.nonce = std::move(result.nonce); // NACK or ACK the response. if (result.parse_error != GRPC_ERROR_NONE) { + xds_client()->UpdateResourceMetadataWithFailedParseResultLocked( + update_time, result); GRPC_ERROR_UNREF(state.error); state.error = result.parse_error; // NACK unacceptable update. @@ -1191,19 +1232,24 @@ bool XdsClient::ChannelState::AdsCallState::OnResponseReceivedLocked() { "[xds_client %p] ADS response invalid for resource type %s " "version %s, will NACK: nonce=%s error=%s", xds_client(), result.type_url.c_str(), result.version.c_str(), - state.nonce.c_str(), grpc_error_string(result.parse_error)); + state.nonce.c_str(), + grpc_error_std_string(result.parse_error).c_str()); SendMessageLocked(result.type_url); } else { seen_response_ = true; // Accept the ADS response according to the type_url. if (result.type_url == XdsApi::kLdsTypeUrl) { - AcceptLdsUpdate(std::move(result.lds_update_map)); + AcceptLdsUpdateLocked(result.version, update_time, + std::move(result.lds_update_map)); } else if (result.type_url == XdsApi::kRdsTypeUrl) { - AcceptRdsUpdate(std::move(result.rds_update_map)); + AcceptRdsUpdateLocked(result.version, update_time, + std::move(result.rds_update_map)); } else if (result.type_url == XdsApi::kCdsTypeUrl) { - AcceptCdsUpdate(std::move(result.cds_update_map)); + AcceptCdsUpdateLocked(result.version, update_time, + std::move(result.cds_update_map)); } else if (result.type_url == XdsApi::kEdsTypeUrl) { - AcceptEdsUpdate(std::move(result.eds_update_map)); + AcceptEdsUpdateLocked(result.version, update_time, + std::move(result.eds_update_map)); } xds_client()->resource_version_map_[result.type_url] = std::move(result.version); @@ -1234,7 +1280,7 @@ bool XdsClient::ChannelState::AdsCallState::OnResponseReceivedLocked() { } void XdsClient::ChannelState::AdsCallState::OnStatusReceived( - void* arg, grpc_error* error) { + void* arg, grpc_error_handle error) { AdsCallState* ads_calld = static_cast<AdsCallState*>(arg); { MutexLock lock(&ads_calld->xds_client()->mu_); @@ -1244,14 +1290,14 @@ void XdsClient::ChannelState::AdsCallState::OnStatusReceived( } void XdsClient::ChannelState::AdsCallState::OnStatusReceivedLocked( - grpc_error* error) { + grpc_error_handle error) { if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_trace)) { char* status_details = grpc_slice_to_c_string(status_details_); gpr_log(GPR_INFO, "[xds_client %p] ADS call status received. Status = %d, details " "= '%s', (chand: %p, ads_calld: %p, call: %p), error '%s'", xds_client(), status_code_, status_details, chand(), this, call_, - grpc_error_string(error)); + grpc_error_std_string(error).c_str()); gpr_free(status_details); } // Ignore status from a stale call. @@ -1306,7 +1352,7 @@ void XdsClient::ChannelState::LrsCallState::Reporter:: } void XdsClient::ChannelState::LrsCallState::Reporter::OnNextReportTimer( - void* arg, grpc_error* error) { + void* arg, grpc_error_handle error) { Reporter* self = static_cast<Reporter*>(arg); bool done; { @@ -1317,7 +1363,7 @@ void XdsClient::ChannelState::LrsCallState::Reporter::OnNextReportTimer( } bool XdsClient::ChannelState::LrsCallState::Reporter::OnNextReportTimerLocked( - grpc_error* error) { + grpc_error_handle error) { next_report_timer_callback_pending_ = false; if (error != GRPC_ERROR_NONE || !IsCurrentReporterOnCall()) { GRPC_ERROR_UNREF(error); @@ -1382,7 +1428,7 @@ bool XdsClient::ChannelState::LrsCallState::Reporter::SendReportLocked() { } void XdsClient::ChannelState::LrsCallState::Reporter::OnReportDone( - void* arg, grpc_error* error) { + void* arg, grpc_error_handle error) { Reporter* self = static_cast<Reporter*>(arg); bool done; { @@ -1393,7 +1439,7 @@ void XdsClient::ChannelState::LrsCallState::Reporter::OnReportDone( } bool XdsClient::ChannelState::LrsCallState::Reporter::OnReportDoneLocked( - grpc_error* error) { + grpc_error_handle error) { grpc_byte_buffer_destroy(parent_->send_message_payload_); parent_->send_message_payload_ = nullptr; // If there are no more registered stats to report, cancel the call. @@ -1563,7 +1609,7 @@ void XdsClient::ChannelState::LrsCallState::MaybeStartReportingLocked() { } void XdsClient::ChannelState::LrsCallState::OnInitialRequestSent( - void* arg, grpc_error* /*error*/) { + void* arg, grpc_error_handle /*error*/) { LrsCallState* lrs_calld = static_cast<LrsCallState*>(arg); { MutexLock lock(&lrs_calld->xds_client()->mu_); @@ -1580,7 +1626,7 @@ void XdsClient::ChannelState::LrsCallState::OnInitialRequestSentLocked() { } void XdsClient::ChannelState::LrsCallState::OnResponseReceived( - void* arg, grpc_error* /*error*/) { + void* arg, grpc_error_handle /*error*/) { LrsCallState* lrs_calld = static_cast<LrsCallState*>(arg); bool done; { @@ -1608,13 +1654,13 @@ bool XdsClient::ChannelState::LrsCallState::OnResponseReceivedLocked() { bool send_all_clusters = false; std::set<std::string> new_cluster_names; grpc_millis new_load_reporting_interval; - grpc_error* parse_error = xds_client()->api_.ParseLrsResponse( + grpc_error_handle parse_error = xds_client()->api_.ParseLrsResponse( response_slice, &send_all_clusters, &new_cluster_names, &new_load_reporting_interval); if (parse_error != GRPC_ERROR_NONE) { gpr_log(GPR_ERROR, "[xds_client %p] LRS response parsing failed. error=%s", - xds_client(), grpc_error_string(parse_error)); + xds_client(), grpc_error_std_string(parse_error).c_str()); GRPC_ERROR_UNREF(parse_error); return; } @@ -1683,7 +1729,7 @@ bool XdsClient::ChannelState::LrsCallState::OnResponseReceivedLocked() { } void XdsClient::ChannelState::LrsCallState::OnStatusReceived( - void* arg, grpc_error* error) { + void* arg, grpc_error_handle error) { LrsCallState* lrs_calld = static_cast<LrsCallState*>(arg); { MutexLock lock(&lrs_calld->xds_client()->mu_); @@ -1693,7 +1739,7 @@ void XdsClient::ChannelState::LrsCallState::OnStatusReceived( } void XdsClient::ChannelState::LrsCallState::OnStatusReceivedLocked( - grpc_error* error) { + grpc_error_handle error) { GPR_ASSERT(call_ != nullptr); if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_trace)) { char* status_details = grpc_slice_to_c_string(status_details_); @@ -1701,7 +1747,7 @@ void XdsClient::ChannelState::LrsCallState::OnStatusReceivedLocked( "[xds_client %p] LRS call status received. Status = %d, details " "= '%s', (chand: %p, calld: %p, call: %p), error '%s'", xds_client(), status_code_, status_details, chand(), this, call_, - grpc_error_string(error)); + grpc_error_std_string(error).c_str()); gpr_free(status_details); } // Ignore status from a stale call. @@ -1726,36 +1772,41 @@ bool XdsClient::ChannelState::LrsCallState::IsCurrentCallOnChannel() const { namespace { -grpc_millis GetRequestTimeout() { +grpc_millis GetRequestTimeout(const grpc_channel_args* args) { return grpc_channel_args_find_integer( - g_channel_args, GRPC_ARG_XDS_RESOURCE_DOES_NOT_EXIST_TIMEOUT_MS, + args, GRPC_ARG_XDS_RESOURCE_DOES_NOT_EXIST_TIMEOUT_MS, {15000, 0, INT_MAX}); } +grpc_channel_args* ModifyChannelArgs(const grpc_channel_args* args) { + absl::InlinedVector<grpc_arg, 2> args_to_add = { + grpc_channel_arg_integer_create( + const_cast<char*>(GRPC_ARG_KEEPALIVE_TIME_MS), + 5 * 60 * GPR_MS_PER_SEC), + grpc_channel_arg_integer_create( + const_cast<char*>(GRPC_ARG_CHANNELZ_IS_INTERNAL_CHANNEL), 1), + }; + return grpc_channel_args_copy_and_add(args, args_to_add.data(), + args_to_add.size()); +} + } // namespace -XdsClient::XdsClient(grpc_error** error) +XdsClient::XdsClient(std::unique_ptr<XdsBootstrap> bootstrap, + const grpc_channel_args* args) : DualRefCounted<XdsClient>( GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_refcount_trace) ? "XdsClient" : nullptr), - request_timeout_(GetRequestTimeout()), + bootstrap_(std::move(bootstrap)), + args_(ModifyChannelArgs(args)), + request_timeout_(GetRequestTimeout(args)), interested_parties_(grpc_pollset_set_create()), - bootstrap_( - XdsBootstrap::ReadFromFile(this, &grpc_xds_client_trace, error)), certificate_provider_store_(MakeOrphanable<CertificateProviderStore>( - bootstrap_ == nullptr - ? CertificateProviderStore::PluginDefinitionMap() - : bootstrap_->certificate_providers())), - api_(this, &grpc_xds_client_trace, - bootstrap_ == nullptr ? nullptr : bootstrap_->node()) { + bootstrap_->certificate_providers())), + api_(this, &grpc_xds_client_trace, bootstrap_->node()) { if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_trace)) { gpr_log(GPR_INFO, "[xds_client %p] creating xds client", this); } - if (*error != GRPC_ERROR_NONE) { - gpr_log(GPR_ERROR, "[xds_client %p] failed to read bootstrap file: %s", - this, grpc_error_string(*error)); - return; - } // Create ChannelState object. chand_ = MakeOrphanable<ChannelState>( WeakRef(DEBUG_LOCATION, "XdsClient+ChannelState"), bootstrap_->server()); @@ -1765,11 +1816,13 @@ XdsClient::~XdsClient() { if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_trace)) { gpr_log(GPR_INFO, "[xds_client %p] destroying xds client", this); } + grpc_channel_args_destroy(args_); grpc_pollset_set_destroy(interested_parties_); } void XdsClient::AddChannelzLinkage( channelz::ChannelNode* parent_channelz_node) { + MutexLock lock(&mu_); channelz::ChannelNode* xds_channelz_node = grpc_channel_get_channelz_node(chand_->channel()); if (xds_channelz_node != nullptr) { @@ -1779,6 +1832,7 @@ void XdsClient::AddChannelzLinkage( void XdsClient::RemoveChannelzLinkage( channelz::ChannelNode* parent_channelz_node) { + MutexLock lock(&mu_); channelz::ChannelNode* xds_channelz_node = grpc_channel_get_channelz_node(chand_->channel()); if (xds_channelz_node != nullptr) { @@ -1829,7 +1883,7 @@ void XdsClient::WatchListenerData( } w->OnListenerChanged(*listener_state.update); } - chand_->Subscribe(XdsApi::kLdsTypeUrl, listener_name_str); + chand_->SubscribeLocked(XdsApi::kLdsTypeUrl, listener_name_str); } void XdsClient::CancelListenerDataWatch(absl::string_view listener_name, @@ -1844,8 +1898,8 @@ void XdsClient::CancelListenerDataWatch(absl::string_view listener_name, listener_state.watchers.erase(it); if (listener_state.watchers.empty()) { listener_map_.erase(listener_name_str); - chand_->Unsubscribe(XdsApi::kLdsTypeUrl, listener_name_str, - delay_unsubscription); + chand_->UnsubscribeLocked(XdsApi::kLdsTypeUrl, listener_name_str, + delay_unsubscription); } } } @@ -1869,7 +1923,7 @@ void XdsClient::WatchRouteConfigData( } w->OnRouteConfigChanged(*route_config_state.update); } - chand_->Subscribe(XdsApi::kRdsTypeUrl, route_config_name_str); + chand_->SubscribeLocked(XdsApi::kRdsTypeUrl, route_config_name_str); } void XdsClient::CancelRouteConfigDataWatch(absl::string_view route_config_name, @@ -1885,8 +1939,8 @@ void XdsClient::CancelRouteConfigDataWatch(absl::string_view route_config_name, route_config_state.watchers.erase(it); if (route_config_state.watchers.empty()) { route_config_map_.erase(route_config_name_str); - chand_->Unsubscribe(XdsApi::kRdsTypeUrl, route_config_name_str, - delay_unsubscription); + chand_->UnsubscribeLocked(XdsApi::kRdsTypeUrl, route_config_name_str, + delay_unsubscription); } } } @@ -1908,7 +1962,7 @@ void XdsClient::WatchClusterData( } w->OnClusterChanged(cluster_state.update.value()); } - chand_->Subscribe(XdsApi::kCdsTypeUrl, cluster_name_str); + chand_->SubscribeLocked(XdsApi::kCdsTypeUrl, cluster_name_str); } void XdsClient::CancelClusterDataWatch(absl::string_view cluster_name, @@ -1923,8 +1977,8 @@ void XdsClient::CancelClusterDataWatch(absl::string_view cluster_name, cluster_state.watchers.erase(it); if (cluster_state.watchers.empty()) { cluster_map_.erase(cluster_name_str); - chand_->Unsubscribe(XdsApi::kCdsTypeUrl, cluster_name_str, - delay_unsubscription); + chand_->UnsubscribeLocked(XdsApi::kCdsTypeUrl, cluster_name_str, + delay_unsubscription); } } } @@ -1946,7 +2000,7 @@ void XdsClient::WatchEndpointData( } w->OnEndpointChanged(endpoint_state.update.value()); } - chand_->Subscribe(XdsApi::kEdsTypeUrl, eds_service_name_str); + chand_->SubscribeLocked(XdsApi::kEdsTypeUrl, eds_service_name_str); } void XdsClient::CancelEndpointDataWatch(absl::string_view eds_service_name, @@ -1961,8 +2015,8 @@ void XdsClient::CancelEndpointDataWatch(absl::string_view eds_service_name, endpoint_state.watchers.erase(it); if (endpoint_state.watchers.empty()) { endpoint_map_.erase(eds_service_name_str); - chand_->Unsubscribe(XdsApi::kEdsTypeUrl, eds_service_name_str, - delay_unsubscription); + chand_->UnsubscribeLocked(XdsApi::kEdsTypeUrl, eds_service_name_str, + delay_unsubscription); } } } @@ -2089,7 +2143,7 @@ void XdsClient::ResetBackoff() { } } -void XdsClient::NotifyOnErrorLocked(grpc_error* error) { +void XdsClient::NotifyOnErrorLocked(grpc_error_handle error) { for (const auto& p : listener_map_) { const ListenerState& listener_state = p.second; for (const auto& p : listener_state.watchers) { @@ -2198,25 +2252,190 @@ XdsApi::ClusterLoadReportMap XdsClient::BuildLoadReportSnapshotLocked( return snapshot_map; } +void XdsClient::UpdateResourceMetadataWithFailedParseResultLocked( + grpc_millis update_time, const XdsApi::AdsParseResult& result) { + // ADS update is rejected and the resource names in the failed update is + // available. + std::string details = grpc_error_std_string(result.parse_error); + for (auto& name : result.resource_names_failed) { + XdsApi::ResourceMetadata* resource_metadata = nullptr; + if (result.type_url == XdsApi::kLdsTypeUrl) { + auto it = listener_map_.find(name); + if (it != listener_map_.end()) { + resource_metadata = &it->second.meta; + } + } else if (result.type_url == XdsApi::kRdsTypeUrl) { + auto it = route_config_map_.find(name); + if (route_config_map_.find(name) != route_config_map_.end()) { + resource_metadata = &it->second.meta; + } + } else if (result.type_url == XdsApi::kCdsTypeUrl) { + auto it = cluster_map_.find(name); + if (cluster_map_.find(name) != cluster_map_.end()) { + resource_metadata = &it->second.meta; + } + } else if (result.type_url == XdsApi::kEdsTypeUrl) { + auto it = endpoint_map_.find(name); + if (endpoint_map_.find(name) != endpoint_map_.end()) { + resource_metadata = &it->second.meta; + } + } + if (resource_metadata == nullptr) { + return; + } + resource_metadata->client_status = XdsApi::ResourceMetadata::NACKED; + resource_metadata->failed_version = result.version; + resource_metadata->failed_details = details; + resource_metadata->failed_update_time = update_time; + } +} + +std::string XdsClient::DumpClientConfigBinary() { + MutexLock lock(&mu_); + XdsApi::ResourceTypeMetadataMap resource_type_metadata_map; + // Update per-xds-type version if available, this version corresponding to the + // last successful ADS update version. + for (auto& p : resource_version_map_) { + resource_type_metadata_map[p.first].version = p.second; + } + // Collect resource metadata from listeners + auto& lds_map = + resource_type_metadata_map[XdsApi::kLdsTypeUrl].resource_metadata_map; + for (auto& p : listener_map_) { + lds_map[p.first] = &p.second.meta; + } + // Collect resource metadata from route configs + auto& rds_map = + resource_type_metadata_map[XdsApi::kRdsTypeUrl].resource_metadata_map; + for (auto& p : route_config_map_) { + rds_map[p.first] = &p.second.meta; + } + // Collect resource metadata from clusters + auto& cds_map = + resource_type_metadata_map[XdsApi::kCdsTypeUrl].resource_metadata_map; + for (auto& p : cluster_map_) { + cds_map[p.first] = &p.second.meta; + } + // Collect resource metadata from endpoints + auto& eds_map = + resource_type_metadata_map[XdsApi::kEdsTypeUrl].resource_metadata_map; + for (auto& p : endpoint_map_) { + eds_map[p.first] = &p.second.meta; + } + // Assemble config dump messages + return api_.AssembleClientConfig(resource_type_metadata_map); +} + // // accessors for global state // -void XdsClientGlobalInit() { g_mu = new Mutex; } +void XdsClientGlobalInit() { + g_mu = new Mutex; + XdsHttpFilterRegistry::Init(); +} -void XdsClientGlobalShutdown() { +// TODO(roth): Find a better way to clear the fallback config that does +// not require using ABSL_NO_THREAD_SAFETY_ANALYSIS. +void XdsClientGlobalShutdown() ABSL_NO_THREAD_SAFETY_ANALYSIS { + gpr_free(g_fallback_bootstrap_config); + g_fallback_bootstrap_config = nullptr; delete g_mu; g_mu = nullptr; + XdsHttpFilterRegistry::Shutdown(); } -RefCountedPtr<XdsClient> XdsClient::GetOrCreate(grpc_error** error) { - MutexLock lock(g_mu); - if (g_xds_client != nullptr) { - auto xds_client = g_xds_client->RefIfNonZero(); - if (xds_client != nullptr) return xds_client; +namespace { + +std::string GetBootstrapContents(const char* fallback_config, + grpc_error_handle* error) { + // First, try GRPC_XDS_BOOTSTRAP env var. + grpc_core::UniquePtr<char> path(gpr_getenv("GRPC_XDS_BOOTSTRAP")); + if (path != nullptr) { + if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_trace)) { + gpr_log(GPR_INFO, + "Got bootstrap file location from GRPC_XDS_BOOTSTRAP " + "environment variable: %s", + path.get()); + } + grpc_slice contents; + *error = + grpc_load_file(path.get(), /*add_null_terminator=*/true, &contents); + if (*error != GRPC_ERROR_NONE) return ""; + std::string contents_str(StringViewFromSlice(contents)); + grpc_slice_unref_internal(contents); + return contents_str; + } + // Next, try GRPC_XDS_BOOTSTRAP_CONFIG env var. + grpc_core::UniquePtr<char> env_config( + gpr_getenv("GRPC_XDS_BOOTSTRAP_CONFIG")); + if (env_config != nullptr) { + if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_trace)) { + gpr_log(GPR_INFO, + "Got bootstrap contents from GRPC_XDS_BOOTSTRAP_CONFIG " + "environment variable"); + } + return env_config.get(); + } + // Finally, try fallback config. + if (fallback_config != nullptr) { + if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_trace)) { + gpr_log(GPR_INFO, "Got bootstrap contents from fallback config"); + } + return fallback_config; + } + // No bootstrap config found. + *error = GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "Environment variables GRPC_XDS_BOOTSTRAP or GRPC_XDS_BOOTSTRAP_CONFIG " + "not defined"); + return ""; +} + +} // namespace + +RefCountedPtr<XdsClient> XdsClient::GetOrCreate(const grpc_channel_args* args, + grpc_error_handle* error) { + RefCountedPtr<XdsClient> xds_client; + // If getting bootstrap from channel args, create a local XdsClient + // instance for the channel or server instead of using the global instance. + const char* bootstrap_config = grpc_channel_args_find_string( + args, GRPC_ARG_TEST_ONLY_DO_NOT_USE_IN_PROD_XDS_BOOTSTRAP_CONFIG); + if (bootstrap_config != nullptr) { + std::unique_ptr<XdsBootstrap> bootstrap = + XdsBootstrap::Create(bootstrap_config, error); + if (*error == GRPC_ERROR_NONE) { + grpc_channel_args* xds_channel_args = + grpc_channel_args_find_pointer<grpc_channel_args>( + args, + GRPC_ARG_TEST_ONLY_DO_NOT_USE_IN_PROD_XDS_CLIENT_CHANNEL_ARGS); + return MakeRefCounted<XdsClient>(std::move(bootstrap), xds_channel_args); + } + return nullptr; + } + // Otherwise, use the global instance. + { + MutexLock lock(g_mu); + if (g_xds_client != nullptr) { + auto xds_client = g_xds_client->RefIfNonZero(); + if (xds_client != nullptr) return xds_client; + } + // Find bootstrap contents. + std::string bootstrap_contents = + GetBootstrapContents(g_fallback_bootstrap_config, error); + if (*error != GRPC_ERROR_NONE) return nullptr; + if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_trace)) { + gpr_log(GPR_INFO, "xDS bootstrap contents: %s", + bootstrap_contents.c_str()); + } + // Parse bootstrap. + std::unique_ptr<XdsBootstrap> bootstrap = + XdsBootstrap::Create(bootstrap_contents, error); + if (*error != GRPC_ERROR_NONE) return nullptr; + // Instantiate XdsClient. + xds_client = + MakeRefCounted<XdsClient>(std::move(bootstrap), g_channel_args); + g_xds_client = xds_client.get(); } - auto xds_client = MakeRefCounted<XdsClient>(error); - g_xds_client = xds_client.get(); return xds_client; } @@ -2232,6 +2451,66 @@ void UnsetGlobalXdsClientForTest() { g_xds_client = nullptr; } +void SetXdsFallbackBootstrapConfig(const char* config) { + MutexLock lock(g_mu); + gpr_free(g_fallback_bootstrap_config); + g_fallback_bootstrap_config = gpr_strdup(config); +} + } // namespace internal +// +// embedding XdsClient in channel args +// + +#define GRPC_ARG_XDS_CLIENT "grpc.internal.xds_client" + +namespace { + +void* XdsClientArgCopy(void* p) { + XdsClient* xds_client = static_cast<XdsClient*>(p); + xds_client->Ref(DEBUG_LOCATION, "channel arg").release(); + return p; +} + +void XdsClientArgDestroy(void* p) { + XdsClient* xds_client = static_cast<XdsClient*>(p); + xds_client->Unref(DEBUG_LOCATION, "channel arg"); +} + +int XdsClientArgCmp(void* p, void* q) { return GPR_ICMP(p, q); } + +const grpc_arg_pointer_vtable kXdsClientArgVtable = { + XdsClientArgCopy, XdsClientArgDestroy, XdsClientArgCmp}; + +} // namespace + +grpc_arg XdsClient::MakeChannelArg() const { + return grpc_channel_arg_pointer_create(const_cast<char*>(GRPC_ARG_XDS_CLIENT), + const_cast<XdsClient*>(this), + &kXdsClientArgVtable); +} + +RefCountedPtr<XdsClient> XdsClient::GetFromChannelArgs( + const grpc_channel_args& args) { + XdsClient* xds_client = + grpc_channel_args_find_pointer<XdsClient>(&args, GRPC_ARG_XDS_CLIENT); + if (xds_client == nullptr) return nullptr; + return xds_client->Ref(DEBUG_LOCATION, "GetFromChannelArgs"); +} + } // namespace grpc_core + +// The returned bytes may contain NULL(0), so we can't use c-string. +grpc_slice grpc_dump_xds_configs() { + grpc_core::ApplicationCallbackExecCtx callback_exec_ctx; + grpc_core::ExecCtx exec_ctx; + grpc_error_handle error = GRPC_ERROR_NONE; + auto xds_client = grpc_core::XdsClient::GetOrCreate(nullptr, &error); + if (error != GRPC_ERROR_NONE) { + // If we isn't using xDS, just return an empty string. + GRPC_ERROR_UNREF(error); + return grpc_empty_slice(); + } + return grpc_slice_from_cpp_string(xds_client->DumpClientConfigBinary()); +} diff --git a/grpc/src/core/ext/xds/xds_client.h b/grpc/src/core/ext/xds/xds_client.h index f1c64675..0ee84e78 100644 --- a/grpc/src/core/ext/xds/xds_client.h +++ b/grpc/src/core/ext/xds/xds_client.h @@ -48,7 +48,7 @@ class XdsClient : public DualRefCounted<XdsClient> { public: virtual ~ListenerWatcherInterface() = default; virtual void OnListenerChanged(XdsApi::LdsUpdate listener) = 0; - virtual void OnError(grpc_error* error) = 0; + virtual void OnError(grpc_error_handle error) = 0; virtual void OnResourceDoesNotExist() = 0; }; @@ -57,7 +57,7 @@ class XdsClient : public DualRefCounted<XdsClient> { public: virtual ~RouteConfigWatcherInterface() = default; virtual void OnRouteConfigChanged(XdsApi::RdsUpdate route_config) = 0; - virtual void OnError(grpc_error* error) = 0; + virtual void OnError(grpc_error_handle error) = 0; virtual void OnResourceDoesNotExist() = 0; }; @@ -66,7 +66,7 @@ class XdsClient : public DualRefCounted<XdsClient> { public: virtual ~ClusterWatcherInterface() = default; virtual void OnClusterChanged(XdsApi::CdsUpdate cluster_data) = 0; - virtual void OnError(grpc_error* error) = 0; + virtual void OnError(grpc_error_handle error) = 0; virtual void OnResourceDoesNotExist() = 0; }; @@ -75,19 +75,27 @@ class XdsClient : public DualRefCounted<XdsClient> { public: virtual ~EndpointWatcherInterface() = default; virtual void OnEndpointChanged(XdsApi::EdsUpdate update) = 0; - virtual void OnError(grpc_error* error) = 0; + virtual void OnError(grpc_error_handle error) = 0; virtual void OnResourceDoesNotExist() = 0; }; // Factory function to get or create the global XdsClient instance. // If *error is not GRPC_ERROR_NONE upon return, then there was // an error initializing the client. - static RefCountedPtr<XdsClient> GetOrCreate(grpc_error** error); + static RefCountedPtr<XdsClient> GetOrCreate(const grpc_channel_args* args, + grpc_error_handle* error); - // Callers should not instantiate directly. Use GetOrCreate() instead. - explicit XdsClient(grpc_error** error); + // Most callers should not instantiate directly. Use GetOrCreate() instead. + XdsClient(std::unique_ptr<XdsBootstrap> bootstrap, + const grpc_channel_args* args); ~XdsClient() override; + const XdsBootstrap& bootstrap() const { + // bootstrap_ is guaranteed to be non-null since XdsClient::GetOrCreate() + // would return a null object if bootstrap_ was null. + return *bootstrap_; + } + CertificateProviderStore& certificate_provider_store() { return *certificate_provider_store_; } @@ -185,6 +193,20 @@ class XdsClient : public DualRefCounted<XdsClient> { // Resets connection backoff state. void ResetBackoff(); + // Dumps the active xDS config in JSON format. + // Individual xDS resource is encoded as envoy.admin.v3.*ConfigDump. Returns + // envoy.service.status.v3.ClientConfig which also includes the config + // status (e.g., CLIENT_REQUESTED, CLIENT_ACKED, CLIENT_NACKED). + // + // Expected to be invoked by wrapper languages in their CSDS service + // implementation. + std::string DumpClientConfigBinary(); + + // Helpers for encoding the XdsClient object in channel args. + grpc_arg MakeChannelArg() const; + static RefCountedPtr<XdsClient> GetFromChannelArgs( + const grpc_channel_args& args); + private: // Contains a channel to the xds server and all the data related to the // channel. Holds a ref to the xds client object. @@ -215,14 +237,17 @@ class XdsClient : public DualRefCounted<XdsClient> { void MaybeStartLrsCall(); void StopLrsCall(); + bool HasAdsCall() const; bool HasActiveAdsCall() const; void StartConnectivityWatchLocked(); void CancelConnectivityWatchLocked(); - void Subscribe(const std::string& type_url, const std::string& name); - void Unsubscribe(const std::string& type_url, const std::string& name, - bool delay_unsubscription); + void SubscribeLocked(const std::string& type_url, const std::string& name) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(&XdsClient::mu_); + void UnsubscribeLocked(const std::string& type_url, const std::string& name, + bool delay_unsubscription) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(&XdsClient::mu_); private: class StateWatcher; @@ -248,6 +273,7 @@ class XdsClient : public DualRefCounted<XdsClient> { watchers; // The latest data seen from LDS. absl::optional<XdsApi::LdsUpdate> update; + XdsApi::ResourceMetadata meta; }; struct RouteConfigState { @@ -256,6 +282,7 @@ class XdsClient : public DualRefCounted<XdsClient> { watchers; // The latest data seen from RDS. absl::optional<XdsApi::RdsUpdate> update; + XdsApi::ResourceMetadata meta; }; struct ClusterState { @@ -263,6 +290,7 @@ class XdsClient : public DualRefCounted<XdsClient> { watchers; // The latest data seen from CDS. absl::optional<XdsApi::CdsUpdate> update; + XdsApi::ResourceMetadata meta; }; struct EndpointState { @@ -271,6 +299,7 @@ class XdsClient : public DualRefCounted<XdsClient> { watchers; // The latest data seen from EDS. absl::optional<XdsApi::EdsUpdate> update; + XdsApi::ResourceMetadata meta; }; struct LoadReportState { @@ -288,49 +317,63 @@ class XdsClient : public DualRefCounted<XdsClient> { }; // Sends an error notification to all watchers. - void NotifyOnErrorLocked(grpc_error* error); + void NotifyOnErrorLocked(grpc_error_handle error) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_); XdsApi::ClusterLoadReportMap BuildLoadReportSnapshotLocked( - bool send_all_clusters, const std::set<std::string>& clusters); + bool send_all_clusters, const std::set<std::string>& clusters) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_); + + void UpdateResourceMetadataWithFailedParseResultLocked( + grpc_millis update_time, const XdsApi::AdsParseResult& result) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_); + std::unique_ptr<XdsBootstrap> bootstrap_; + grpc_channel_args* args_; const grpc_millis request_timeout_; grpc_pollset_set* interested_parties_; - std::unique_ptr<XdsBootstrap> bootstrap_; OrphanablePtr<CertificateProviderStore> certificate_provider_store_; XdsApi api_; Mutex mu_; // The channel for communicating with the xds server. - OrphanablePtr<ChannelState> chand_; + OrphanablePtr<ChannelState> chand_ ABSL_GUARDED_BY(mu_); // One entry for each watched LDS resource. - std::map<std::string /*listener_name*/, ListenerState> listener_map_; + std::map<std::string /*listener_name*/, ListenerState> listener_map_ + ABSL_GUARDED_BY(mu_); // One entry for each watched RDS resource. std::map<std::string /*route_config_name*/, RouteConfigState> - route_config_map_; + route_config_map_ ABSL_GUARDED_BY(mu_); // One entry for each watched CDS resource. - std::map<std::string /*cluster_name*/, ClusterState> cluster_map_; + std::map<std::string /*cluster_name*/, ClusterState> cluster_map_ + ABSL_GUARDED_BY(mu_); // One entry for each watched EDS resource. - std::map<std::string /*eds_service_name*/, EndpointState> endpoint_map_; + std::map<std::string /*eds_service_name*/, EndpointState> endpoint_map_ + ABSL_GUARDED_BY(mu_); // Load report data. std::map< std::pair<std::string /*cluster_name*/, std::string /*eds_service_name*/>, LoadReportState> - load_report_map_; + load_report_map_ ABSL_GUARDED_BY(mu_); // Stores the most recent accepted resource version for each resource type. - std::map<std::string /*type*/, std::string /*version*/> resource_version_map_; + std::map<std::string /*type*/, std::string /*version*/> resource_version_map_ + ABSL_GUARDED_BY(mu_); - bool shutting_down_ = false; + bool shutting_down_ ABSL_GUARDED_BY(mu_) = false; }; namespace internal { void SetXdsChannelArgsForTest(grpc_channel_args* args); void UnsetGlobalXdsClientForTest(); +// Sets bootstrap config to be used when no env var is set. +// Does not take ownership of config. +void SetXdsFallbackBootstrapConfig(const char* config); } // namespace internal } // namespace grpc_core -#endif /* GRPC_CORE_EXT_XDS_XDS_CLIENT_H */ +#endif // GRPC_CORE_EXT_XDS_XDS_CLIENT_H diff --git a/grpc/src/core/ext/xds/xds_client_stats.cc b/grpc/src/core/ext/xds/xds_client_stats.cc index de401a7b..c38ded23 100644 --- a/grpc/src/core/ext/xds/xds_client_stats.cc +++ b/grpc/src/core/ext/xds/xds_client_stats.cc @@ -137,7 +137,8 @@ XdsClusterLocalityStats::GetSnapshotAndReset() { // not related to a single reporting interval. total_requests_in_progress_.Load(MemoryOrder::RELAXED), GetAndResetCounter(&total_error_requests_), - GetAndResetCounter(&total_issued_requests_)}; + GetAndResetCounter(&total_issued_requests_), + {}}; MutexLock lock(&backend_metrics_mu_); snapshot.backend_metrics = std::move(backend_metrics_); return snapshot; diff --git a/grpc/src/core/ext/xds/xds_client_stats.h b/grpc/src/core/ext/xds/xds_client_stats.h index 523ef111..b300fc59 100644 --- a/grpc/src/core/ext/xds/xds_client_stats.h +++ b/grpc/src/core/ext/xds/xds_client_stats.h @@ -56,10 +56,10 @@ class XdsLocalityName : public RefCounted<XdsLocalityName> { } }; - XdsLocalityName(std::string region, std::string zone, std::string subzone) + XdsLocalityName(std::string region, std::string zone, std::string sub_zone) : region_(std::move(region)), zone_(std::move(zone)), - sub_zone_(std::move(subzone)) {} + sub_zone_(std::move(sub_zone)) {} bool operator==(const XdsLocalityName& other) const { return region_ == other.region_ && zone_ == other.zone_ && @@ -149,7 +149,7 @@ class XdsClusterDropStats : public RefCounted<XdsClusterDropStats> { // dropped_requests can be accessed by both the picker (from data plane // mutex) and the load reporting thread (from the control plane combiner). Mutex mu_; - CategorizedDropsMap categorized_drops_; + CategorizedDropsMap categorized_drops_ ABSL_GUARDED_BY(mu_); }; // Locality stats for an xds cluster. @@ -231,7 +231,8 @@ class XdsClusterLocalityStats : public RefCounted<XdsClusterLocalityStats> { // call's recv_trailing_metadata (not from the control plane work serializer) // and the load reporting thread (from the control plane work serializer). Mutex backend_metrics_mu_; - std::map<std::string, BackendMetric> backend_metrics_; + std::map<std::string, BackendMetric> backend_metrics_ + ABSL_GUARDED_BY(backend_metrics_mu_); }; } // namespace grpc_core diff --git a/grpc/src/core/ext/xds/xds_http_fault_filter.cc b/grpc/src/core/ext/xds/xds_http_fault_filter.cc new file mode 100644 index 00000000..64b7a2b4 --- /dev/null +++ b/grpc/src/core/ext/xds/xds_http_fault_filter.cc @@ -0,0 +1,226 @@ +// +// Copyright 2021 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/xds/xds_http_fault_filter.h" + +#include <grpc/grpc.h> + +#include <string> + +#include "absl/status/statusor.h" +#include "absl/strings/str_cat.h" +#include "absl/strings/str_format.h" +#include "absl/strings/string_view.h" +#include "envoy/extensions/filters/common/fault/v3/fault.upb.h" +#include "envoy/extensions/filters/http/fault/v3/fault.upb.h" +#include "envoy/extensions/filters/http/fault/v3/fault.upbdefs.h" +#include "envoy/type/v3/percent.upb.h" +#include "google/protobuf/any.upb.h" +#include "google/protobuf/duration.upb.h" +#include "google/protobuf/wrappers.upb.h" +#include "src/core/ext/filters/fault_injection/fault_injection_filter.h" +#include "src/core/ext/xds/xds_http_filters.h" +#include "src/core/lib/channel/channel_args.h" +#include "src/core/lib/channel/channel_stack.h" +#include "src/core/lib/channel/status_util.h" +#include "src/core/lib/json/json.h" +#include "src/core/lib/transport/status_conversion.h" +#include "upb/def.h" + +namespace grpc_core { + +const char* kXdsHttpFaultFilterConfigName = + "envoy.extensions.filters.http.fault.v3.HTTPFault"; + +namespace { + +uint32_t GetDenominator(const envoy_type_v3_FractionalPercent* fraction) { + if (fraction != nullptr) { + const auto denominator = + static_cast<envoy_type_v3_FractionalPercent_DenominatorType>( + envoy_type_v3_FractionalPercent_denominator(fraction)); + switch (denominator) { + case envoy_type_v3_FractionalPercent_MILLION: + return 1000000; + case envoy_type_v3_FractionalPercent_TEN_THOUSAND: + return 10000; + case envoy_type_v3_FractionalPercent_HUNDRED: + default: + return 100; + } + } + // Use 100 as the default denominator + return 100; +} + +absl::StatusOr<Json> ParseHttpFaultIntoJson(upb_strview serialized_http_fault, + upb_arena* arena) { + auto* http_fault = envoy_extensions_filters_http_fault_v3_HTTPFault_parse( + serialized_http_fault.data, serialized_http_fault.size, arena); + if (http_fault == nullptr) { + return absl::InvalidArgumentError( + "could not parse fault injection filter config"); + } + // NOTE(lidiz): Here, we are manually translating the upb messages into the + // JSON form of the filter config as part of method config, which will be + // directly used later by service config. In this way, we can validate the + // filter configs, and NACK if needed. It also allows the service config to + // function independently without xDS, but not the other way around. + // NOTE(lidiz): please refer to FaultInjectionPolicy for ground truth + // definitions, located at: + // src/core/ext/filters/fault_injection/service_config_parser.h + Json::Object fault_injection_policy_json; + // Section 1: Parse the abort injection config + const auto* fault_abort = + envoy_extensions_filters_http_fault_v3_HTTPFault_abort(http_fault); + if (fault_abort != nullptr) { + grpc_status_code abort_grpc_status_code = GRPC_STATUS_OK; + // Try if gRPC status code is set first + int abort_grpc_status_code_raw = + envoy_extensions_filters_http_fault_v3_FaultAbort_grpc_status( + fault_abort); + if (abort_grpc_status_code_raw != 0) { + if (!grpc_status_code_from_int(abort_grpc_status_code_raw, + &abort_grpc_status_code)) { + return absl::InvalidArgumentError(absl::StrCat( + "invalid gRPC status code: ", abort_grpc_status_code_raw)); + } + } else { + // if gRPC status code is empty, check http status + int abort_http_status_code = + envoy_extensions_filters_http_fault_v3_FaultAbort_http_status( + fault_abort); + if (abort_http_status_code != 0 and abort_http_status_code != 200) { + abort_grpc_status_code = + grpc_http2_status_to_grpc_status(abort_http_status_code); + } + } + // Set the abort_code, even if it's OK + fault_injection_policy_json["abortCode"] = + grpc_status_code_to_string(abort_grpc_status_code); + // Set the headers if we enabled header abort injection control + if (envoy_extensions_filters_http_fault_v3_FaultAbort_has_header_abort( + fault_abort)) { + fault_injection_policy_json["abortCodeHeader"] = + "x-envoy-fault-abort-grpc-request"; + fault_injection_policy_json["abortPercentageHeader"] = + "x-envoy-fault-abort-percentage"; + } + // Set the fraction percent + auto* percent = + envoy_extensions_filters_http_fault_v3_FaultAbort_percentage( + fault_abort); + fault_injection_policy_json["abortPercentageNumerator"] = + Json(envoy_type_v3_FractionalPercent_numerator(percent)); + fault_injection_policy_json["abortPercentageDenominator"] = + Json(GetDenominator(percent)); + } + // Section 2: Parse the delay injection config + const auto* fault_delay = + envoy_extensions_filters_http_fault_v3_HTTPFault_delay(http_fault); + if (fault_delay != nullptr) { + // Parse the delay duration + const auto* delay_duration = + envoy_extensions_filters_common_fault_v3_FaultDelay_fixed_delay( + fault_delay); + if (delay_duration != nullptr) { + fault_injection_policy_json["delay"] = absl::StrFormat( + "%d.%09ds", google_protobuf_Duration_seconds(delay_duration), + google_protobuf_Duration_nanos(delay_duration)); + } + // Set the headers if we enabled header delay injection control + if (envoy_extensions_filters_common_fault_v3_FaultDelay_has_header_delay( + fault_delay)) { + fault_injection_policy_json["delayHeader"] = + "x-envoy-fault-delay-request"; + fault_injection_policy_json["delayPercentageHeader"] = + "x-envoy-fault-delay-request-percentage"; + } + // Set the fraction percent + auto* percent = + envoy_extensions_filters_common_fault_v3_FaultDelay_percentage( + fault_delay); + fault_injection_policy_json["delayPercentageNumerator"] = + Json(envoy_type_v3_FractionalPercent_numerator(percent)); + fault_injection_policy_json["delayPercentageDenominator"] = + Json(GetDenominator(percent)); + } + // Section 3: Parse the maximum active faults + const auto* max_fault_wrapper = + envoy_extensions_filters_http_fault_v3_HTTPFault_max_active_faults( + http_fault); + if (max_fault_wrapper != nullptr) { + fault_injection_policy_json["maxFaults"] = + google_protobuf_UInt32Value_value(max_fault_wrapper); + } + return fault_injection_policy_json; +} + +} // namespace + +void XdsHttpFaultFilter::PopulateSymtab(upb_symtab* symtab) const { + envoy_extensions_filters_http_fault_v3_HTTPFault_getmsgdef(symtab); +} + +absl::StatusOr<XdsHttpFilterImpl::FilterConfig> +XdsHttpFaultFilter::GenerateFilterConfig(upb_strview serialized_filter_config, + upb_arena* arena) const { + absl::StatusOr<Json> parse_result = + ParseHttpFaultIntoJson(serialized_filter_config, arena); + if (!parse_result.ok()) { + return parse_result.status(); + } + return FilterConfig{kXdsHttpFaultFilterConfigName, std::move(*parse_result)}; +} + +absl::StatusOr<XdsHttpFilterImpl::FilterConfig> +XdsHttpFaultFilter::GenerateFilterConfigOverride( + upb_strview serialized_filter_config, upb_arena* arena) const { + // HTTPFault filter has the same message type in HTTP connection manager's + // filter config and in overriding filter config field. + return GenerateFilterConfig(serialized_filter_config, arena); +} + +const grpc_channel_filter* XdsHttpFaultFilter::channel_filter() const { + return &FaultInjectionFilterVtable; +} + +grpc_channel_args* XdsHttpFaultFilter::ModifyChannelArgs( + grpc_channel_args* args) const { + grpc_arg args_to_add = grpc_channel_arg_integer_create( + const_cast<char*>(GRPC_ARG_PARSE_FAULT_INJECTION_METHOD_CONFIG), 1); + grpc_channel_args* new_args = + grpc_channel_args_copy_and_add(args, &args_to_add, 1); + // Since this function takes the ownership of the channel args, it needs to + // deallocate the old ones to prevent leak. + grpc_channel_args_destroy(args); + return new_args; +} + +absl::StatusOr<XdsHttpFilterImpl::ServiceConfigJsonEntry> +XdsHttpFaultFilter::GenerateServiceConfig( + const FilterConfig& hcm_filter_config, + const FilterConfig* filter_config_override) const { + Json policy_json = filter_config_override != nullptr + ? filter_config_override->config + : hcm_filter_config.config; + // The policy JSON may be empty, that's allowed. + return ServiceConfigJsonEntry{"faultInjectionPolicy", policy_json.Dump()}; +} + +} // namespace grpc_core diff --git a/grpc/src/core/ext/xds/xds_http_fault_filter.h b/grpc/src/core/ext/xds/xds_http_fault_filter.h new file mode 100644 index 00000000..60c49524 --- /dev/null +++ b/grpc/src/core/ext/xds/xds_http_fault_filter.h @@ -0,0 +1,63 @@ +// +// Copyright 2021 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_XDS_XDS_HTTP_FAULT_FILTER_H +#define GRPC_CORE_EXT_XDS_XDS_HTTP_FAULT_FILTER_H + +#include <grpc/support/port_platform.h> + +#include <grpc/grpc.h> + +#include "absl/status/statusor.h" +#include "src/core/ext/xds/xds_http_filters.h" +#include "upb/def.h" + +namespace grpc_core { + +extern const char* kXdsHttpFaultFilterConfigName; + +class XdsHttpFaultFilter : public XdsHttpFilterImpl { + public: + // Overrides the PopulateSymtab method + void PopulateSymtab(upb_symtab* symtab) const override; + + // Overrides the GenerateFilterConfig method + absl::StatusOr<FilterConfig> GenerateFilterConfig( + upb_strview serialized_filter_config, upb_arena* arena) const override; + + // Overrides the GenerateFilterConfigOverride method + absl::StatusOr<FilterConfig> GenerateFilterConfigOverride( + upb_strview serialized_filter_config, upb_arena* arena) const override; + + // Overrides the channel_filter method + const grpc_channel_filter* channel_filter() const override; + + // Overrides the ModifyChannelArgs method + grpc_channel_args* ModifyChannelArgs(grpc_channel_args* args) const override; + + // Overrides the GenerateServiceConfig method + absl::StatusOr<ServiceConfigJsonEntry> GenerateServiceConfig( + const FilterConfig& hcm_filter_config, + const FilterConfig* filter_config_override) const override; + + bool IsSupportedOnClients() const override { return true; } + + bool IsSupportedOnServers() const override { return false; } +}; + +} // namespace grpc_core + +#endif /* GRPC_CORE_EXT_XDS_XDS_HTTP_FAULT_FILTER_H */ diff --git a/grpc/src/core/ext/xds/xds_http_filters.cc b/grpc/src/core/ext/xds/xds_http_filters.cc new file mode 100644 index 00000000..9bd4858b --- /dev/null +++ b/grpc/src/core/ext/xds/xds_http_filters.cc @@ -0,0 +1,114 @@ +// +// Copyright 2021 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/xds/xds_http_filters.h" + +#include "envoy/extensions/filters/http/router/v3/router.upb.h" +#include "envoy/extensions/filters/http/router/v3/router.upbdefs.h" +#include "src/core/ext/xds/xds_http_fault_filter.h" + +namespace grpc_core { + +const char* kXdsHttpRouterFilterConfigName = + "envoy.extensions.filters.http.router.v3.Router"; + +namespace { + +class XdsHttpRouterFilter : public XdsHttpFilterImpl { + public: + void PopulateSymtab(upb_symtab* symtab) const override { + envoy_extensions_filters_http_router_v3_Router_getmsgdef(symtab); + } + + absl::StatusOr<FilterConfig> GenerateFilterConfig( + upb_strview serialized_filter_config, upb_arena* arena) const override { + if (envoy_extensions_filters_http_router_v3_Router_parse( + serialized_filter_config.data, serialized_filter_config.size, + arena) == nullptr) { + return absl::InvalidArgumentError("could not parse router filter config"); + } + return FilterConfig{kXdsHttpRouterFilterConfigName, Json()}; + } + + absl::StatusOr<FilterConfig> GenerateFilterConfigOverride( + upb_strview /*serialized_filter_config*/, + upb_arena* /*arena*/) const override { + return absl::InvalidArgumentError( + "router filter does not support config override"); + } + + // No-op -- this filter is special-cased by the xds resolver. + const grpc_channel_filter* channel_filter() const override { return nullptr; } + + // No-op -- this filter is special-cased by the xds resolver. + absl::StatusOr<ServiceConfigJsonEntry> GenerateServiceConfig( + const FilterConfig& /*hcm_filter_config*/, + const FilterConfig* /*filter_config_override*/) const override { + return absl::UnimplementedError("router filter should never be called"); + } + + bool IsSupportedOnClients() const override { return true; } + + bool IsSupportedOnServers() const override { return true; } +}; + +using FilterOwnerList = std::vector<std::unique_ptr<XdsHttpFilterImpl>>; +using FilterRegistryMap = std::map<absl::string_view, XdsHttpFilterImpl*>; + +FilterOwnerList* g_filters = nullptr; +FilterRegistryMap* g_filter_registry = nullptr; + +} // namespace + +void XdsHttpFilterRegistry::RegisterFilter( + std::unique_ptr<XdsHttpFilterImpl> filter, + const std::set<absl::string_view>& config_proto_type_names) { + for (auto config_proto_type_name : config_proto_type_names) { + (*g_filter_registry)[config_proto_type_name] = filter.get(); + } + g_filters->push_back(std::move(filter)); +} + +const XdsHttpFilterImpl* XdsHttpFilterRegistry::GetFilterForType( + absl::string_view proto_type_name) { + auto it = g_filter_registry->find(proto_type_name); + if (it == g_filter_registry->end()) return nullptr; + return it->second; +} + +void XdsHttpFilterRegistry::PopulateSymtab(upb_symtab* symtab) { + for (const auto& filter : *g_filters) { + filter->PopulateSymtab(symtab); + } +} + +void XdsHttpFilterRegistry::Init() { + g_filters = new FilterOwnerList; + g_filter_registry = new FilterRegistryMap; + RegisterFilter(absl::make_unique<XdsHttpRouterFilter>(), + {kXdsHttpRouterFilterConfigName}); + RegisterFilter(absl::make_unique<XdsHttpFaultFilter>(), + {kXdsHttpFaultFilterConfigName}); +} + +void XdsHttpFilterRegistry::Shutdown() { + delete g_filter_registry; + delete g_filters; +} + +} // namespace grpc_core diff --git a/grpc/src/core/ext/xds/xds_http_filters.h b/grpc/src/core/ext/xds/xds_http_filters.h new file mode 100644 index 00000000..33241968 --- /dev/null +++ b/grpc/src/core/ext/xds/xds_http_filters.h @@ -0,0 +1,130 @@ +// +// Copyright 2021 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_XDS_XDS_HTTP_FILTERS_H +#define GRPC_CORE_EXT_XDS_XDS_HTTP_FILTERS_H + +#include <grpc/support/port_platform.h> + +#include <memory> +#include <set> +#include <string> + +#include "absl/status/statusor.h" +#include "absl/strings/str_cat.h" +#include "absl/strings/string_view.h" +#include "google/protobuf/any.upb.h" +#include "upb/def.h" + +#include <grpc/grpc.h> + +#include "src/core/lib/channel/channel_stack.h" +#include "src/core/lib/json/json.h" + +namespace grpc_core { + +extern const char* kXdsHttpRouterFilterConfigName; + +class XdsHttpFilterImpl { + public: + struct FilterConfig { + absl::string_view config_proto_type_name; + Json config; + + bool operator==(const FilterConfig& other) const { + return config_proto_type_name == other.config_proto_type_name && + config == other.config; + } + std::string ToString() const { + return absl::StrCat("{config_proto_type_name=", config_proto_type_name, + " config=", config.Dump(), "}"); + } + }; + + // Service config data for the filter, returned by GenerateServiceConfig(). + struct ServiceConfigJsonEntry { + // The top-level field name in the method config. + // Filter implementations should use their primary config proto type + // name for this. + // The value of this field in the method config will be a JSON array, + // which will be populated with the elements returned by each filter + // instance. + std::string service_config_field_name; + // The element to add to the JSON array. + std::string element; + }; + + virtual ~XdsHttpFilterImpl() = default; + + // Loads the proto message into the upb symtab. + virtual void PopulateSymtab(upb_symtab* symtab) const = 0; + + // Generates a Config from the xDS filter config proto. + // Used for the top-level config in the HCM HTTP filter list. + virtual absl::StatusOr<FilterConfig> GenerateFilterConfig( + upb_strview serialized_filter_config, upb_arena* arena) const = 0; + + // Generates a Config from the xDS filter config proto. + // Used for the typed_per_filter_config override in VirtualHost and Route. + virtual absl::StatusOr<FilterConfig> GenerateFilterConfigOverride( + upb_strview serialized_filter_config, upb_arena* arena) const = 0; + + // C-core channel filter implementation. + virtual const grpc_channel_filter* channel_filter() const = 0; + + // Modifies channel args that may affect service config parsing (not + // visible to the channel as a whole). + // Takes ownership of args. Caller takes ownership of return value. + virtual grpc_channel_args* ModifyChannelArgs(grpc_channel_args* args) const { + return args; + } + + // Function to convert the Configs into a JSON string to be added to the + // per-method part of the service config. + // The hcm_filter_config comes from the HttpConnectionManager config. + // The filter_config_override comes from the first of the ClusterWeight, + // Route, or VirtualHost entries that it is found in, or null if + // there is no override in any of those locations. + virtual absl::StatusOr<ServiceConfigJsonEntry> GenerateServiceConfig( + const FilterConfig& hcm_filter_config, + const FilterConfig* filter_config_override) const = 0; + + // Returns true if the filter is supported on clients; false otherwise + virtual bool IsSupportedOnClients() const = 0; + + // Returns true if the filter is supported on servers; false otherwise + virtual bool IsSupportedOnServers() const = 0; +}; + +class XdsHttpFilterRegistry { + public: + static void RegisterFilter( + std::unique_ptr<XdsHttpFilterImpl> filter, + const std::set<absl::string_view>& config_proto_type_names); + + static const XdsHttpFilterImpl* GetFilterForType( + absl::string_view proto_type_name); + + static void PopulateSymtab(upb_symtab* symtab); + + // Global init and shutdown. + static void Init(); + static void Shutdown(); +}; + +} // namespace grpc_core + +#endif /* GRPC_CORE_EXT_XDS_XDS_HTTP_FILTERS_H */ diff --git a/grpc/src/core/ext/xds/xds_server_config_fetcher.cc b/grpc/src/core/ext/xds/xds_server_config_fetcher.cc index 5c5e8ee2..962731f9 100644 --- a/grpc/src/core/ext/xds/xds_server_config_fetcher.cc +++ b/grpc/src/core/ext/xds/xds_server_config_fetcher.cc @@ -18,32 +18,354 @@ #include <grpc/support/port_platform.h> +#include "absl/strings/str_replace.h" + +#include "src/core/ext/xds/xds_certificate_provider.h" #include "src/core/ext/xds/xds_client.h" +#include "src/core/lib/address_utils/sockaddr_utils.h" +#include "src/core/lib/channel/channel_args.h" +#include "src/core/lib/gprpp/host_port.h" +#include "src/core/lib/iomgr/sockaddr.h" +#include "src/core/lib/iomgr/socket_utils.h" +#include "src/core/lib/security/credentials/xds/xds_credentials.h" #include "src/core/lib/surface/api_trace.h" #include "src/core/lib/surface/server.h" +#include "src/core/lib/uri/uri_parser.h" namespace grpc_core { + +TraceFlag grpc_xds_server_config_fetcher_trace(false, + "xds_server_config_fetcher"); + namespace { +class FilterChainMatchManager + : public grpc_server_config_fetcher::ConnectionManager { + public: + FilterChainMatchManager( + RefCountedPtr<XdsClient> xds_client, + XdsApi::LdsUpdate::FilterChainMap filter_chain_map, + absl::optional<XdsApi::LdsUpdate::FilterChainData> default_filter_chain) + : xds_client_(xds_client), + filter_chain_map_(std::move(filter_chain_map)), + default_filter_chain_(std::move(default_filter_chain)) {} + + absl::StatusOr<grpc_channel_args*> UpdateChannelArgsForConnection( + grpc_channel_args* args, grpc_endpoint* tcp) override; + + const XdsApi::LdsUpdate::FilterChainMap& filter_chain_map() const { + return filter_chain_map_; + } + + const absl::optional<XdsApi::LdsUpdate::FilterChainData>& + default_filter_chain() const { + return default_filter_chain_; + } + + private: + struct CertificateProviders { + // We need to save our own refs to the root and instance certificate + // providers since the xds certificate provider just stores a ref to their + // distributors. + RefCountedPtr<grpc_tls_certificate_provider> root; + RefCountedPtr<grpc_tls_certificate_provider> instance; + RefCountedPtr<XdsCertificateProvider> xds; + }; + + absl::StatusOr<RefCountedPtr<XdsCertificateProvider>> + CreateOrGetXdsCertificateProviderFromFilterChainData( + const XdsApi::LdsUpdate::FilterChainData* filter_chain); + + const RefCountedPtr<XdsClient> xds_client_; + const XdsApi::LdsUpdate::FilterChainMap filter_chain_map_; + const absl::optional<XdsApi::LdsUpdate::FilterChainData> + default_filter_chain_; + Mutex mu_; + std::map<const XdsApi::LdsUpdate::FilterChainData*, CertificateProviders> + certificate_providers_map_ ABSL_GUARDED_BY(mu_); +}; + +bool IsLoopbackIp(const grpc_resolved_address* address) { + const grpc_sockaddr* sock_addr = + reinterpret_cast<const grpc_sockaddr*>(&address->addr); + if (sock_addr->sa_family == GRPC_AF_INET) { + const grpc_sockaddr_in* addr4 = + reinterpret_cast<const grpc_sockaddr_in*>(sock_addr); + if (addr4->sin_addr.s_addr == grpc_htonl(INADDR_LOOPBACK)) { + return true; + } + } else if (sock_addr->sa_family == GRPC_AF_INET6) { + const grpc_sockaddr_in6* addr6 = + reinterpret_cast<const grpc_sockaddr_in6*>(sock_addr); + if (memcmp(&addr6->sin6_addr, &in6addr_loopback, + sizeof(in6addr_loopback)) == 0) { + return true; + } + } + return false; +} + +const XdsApi::LdsUpdate::FilterChainData* FindFilterChainDataForSourcePort( + const XdsApi::LdsUpdate::FilterChainMap::SourcePortsMap& source_ports_map, + absl::string_view port_str) { + int port = 0; + if (!absl::SimpleAtoi(port_str, &port)) return nullptr; + auto it = source_ports_map.find(port); + if (it != source_ports_map.end()) { + return it->second.data.get(); + } + // Search for the catch-all port 0 since we didn't get a direct match + it = source_ports_map.find(0); + if (it != source_ports_map.end()) { + return it->second.data.get(); + } + return nullptr; +} + +const XdsApi::LdsUpdate::FilterChainData* FindFilterChainDataForSourceIp( + const XdsApi::LdsUpdate::FilterChainMap::SourceIpVector& source_ip_vector, + const grpc_resolved_address* source_ip, absl::string_view port) { + const XdsApi::LdsUpdate::FilterChainMap::SourceIp* best_match = nullptr; + for (const auto& entry : source_ip_vector) { + // Special case for catch-all + if (!entry.prefix_range.has_value()) { + if (best_match == nullptr) { + best_match = &entry; + } + continue; + } + if (best_match != nullptr && best_match->prefix_range.has_value() && + best_match->prefix_range->prefix_len >= + entry.prefix_range->prefix_len) { + continue; + } + if (grpc_sockaddr_match_subnet(source_ip, &entry.prefix_range->address, + entry.prefix_range->prefix_len)) { + best_match = &entry; + } + } + if (best_match == nullptr) return nullptr; + return FindFilterChainDataForSourcePort(best_match->ports_map, port); +} + +const XdsApi::LdsUpdate::FilterChainData* FindFilterChainDataForSourceType( + const XdsApi::LdsUpdate::FilterChainMap::ConnectionSourceTypesArray& + source_types_array, + grpc_endpoint* tcp, absl::string_view destination_ip) { + auto source_uri = URI::Parse(grpc_endpoint_get_peer(tcp)); + if (!source_uri.ok() || + (source_uri->scheme() != "ipv4" && source_uri->scheme() != "ipv6")) { + return nullptr; + } + std::string host; + std::string port; + if (!SplitHostPort(source_uri->path(), &host, &port)) { + return nullptr; + } + grpc_resolved_address source_addr; + grpc_error_handle error = grpc_string_to_sockaddr( + &source_addr, host.c_str(), 0 /* port doesn't matter here */); + if (error != GRPC_ERROR_NONE) { + gpr_log(GPR_DEBUG, "Could not parse string to socket address: %s", + host.c_str()); + GRPC_ERROR_UNREF(error); + return nullptr; + } + // Use kAny only if kSameIporLoopback and kExternal are empty + if (source_types_array[static_cast<int>( + XdsApi::LdsUpdate::FilterChainMap:: + ConnectionSourceType::kSameIpOrLoopback)] + .empty() && + source_types_array[static_cast<int>(XdsApi::LdsUpdate::FilterChainMap:: + ConnectionSourceType::kExternal)] + .empty()) { + return FindFilterChainDataForSourceIp( + source_types_array[static_cast<int>( + XdsApi::LdsUpdate::FilterChainMap::ConnectionSourceType::kAny)], + &source_addr, port); + } + if (IsLoopbackIp(&source_addr) || host == destination_ip) { + return FindFilterChainDataForSourceIp( + source_types_array[static_cast<int>( + XdsApi::LdsUpdate::FilterChainMap::ConnectionSourceType:: + kSameIpOrLoopback)], + &source_addr, port); + } else { + return FindFilterChainDataForSourceIp( + source_types_array[static_cast<int>( + XdsApi::LdsUpdate::FilterChainMap::ConnectionSourceType:: + kExternal)], + &source_addr, port); + } +} + +const XdsApi::LdsUpdate::FilterChainData* FindFilterChainDataForDestinationIp( + const XdsApi::LdsUpdate::FilterChainMap::DestinationIpVector + destination_ip_vector, + grpc_endpoint* tcp) { + auto destination_uri = URI::Parse(grpc_endpoint_get_local_address(tcp)); + if (!destination_uri.ok() || (destination_uri->scheme() != "ipv4" && + destination_uri->scheme() != "ipv6")) { + return nullptr; + } + std::string host; + std::string port; + if (!SplitHostPort(destination_uri->path(), &host, &port)) { + return nullptr; + } + grpc_resolved_address destination_addr; + grpc_error_handle error = grpc_string_to_sockaddr( + &destination_addr, host.c_str(), 0 /* port doesn't matter here */); + if (error != GRPC_ERROR_NONE) { + gpr_log(GPR_DEBUG, "Could not parse string to socket address: %s", + host.c_str()); + GRPC_ERROR_UNREF(error); + return nullptr; + } + const XdsApi::LdsUpdate::FilterChainMap::DestinationIp* best_match = nullptr; + for (const auto& entry : destination_ip_vector) { + // Special case for catch-all + if (!entry.prefix_range.has_value()) { + if (best_match == nullptr) { + best_match = &entry; + } + continue; + } + if (best_match != nullptr && best_match->prefix_range.has_value() && + best_match->prefix_range->prefix_len >= + entry.prefix_range->prefix_len) { + continue; + } + if (grpc_sockaddr_match_subnet(&destination_addr, + &entry.prefix_range->address, + entry.prefix_range->prefix_len)) { + best_match = &entry; + } + } + if (best_match == nullptr) return nullptr; + return FindFilterChainDataForSourceType(best_match->source_types_array, tcp, + host); +} + +absl::StatusOr<RefCountedPtr<XdsCertificateProvider>> +FilterChainMatchManager::CreateOrGetXdsCertificateProviderFromFilterChainData( + const XdsApi::LdsUpdate::FilterChainData* filter_chain) { + MutexLock lock(&mu_); + auto it = certificate_providers_map_.find(filter_chain); + if (it != certificate_providers_map_.end()) { + return it->second.xds; + } + CertificateProviders certificate_providers; + // Configure root cert. + absl::string_view root_provider_instance_name = + filter_chain->downstream_tls_context.common_tls_context + .combined_validation_context + .validation_context_certificate_provider_instance.instance_name; + absl::string_view root_provider_cert_name = + filter_chain->downstream_tls_context.common_tls_context + .combined_validation_context + .validation_context_certificate_provider_instance.certificate_name; + if (!root_provider_instance_name.empty()) { + certificate_providers.root = + xds_client_->certificate_provider_store() + .CreateOrGetCertificateProvider(root_provider_instance_name); + if (certificate_providers.root == nullptr) { + return absl::NotFoundError( + absl::StrCat("Certificate provider instance name: \"", + root_provider_instance_name, "\" not recognized.")); + } + } + // Configure identity cert. + absl::string_view identity_provider_instance_name = + filter_chain->downstream_tls_context.common_tls_context + .tls_certificate_certificate_provider_instance.instance_name; + absl::string_view identity_provider_cert_name = + filter_chain->downstream_tls_context.common_tls_context + .tls_certificate_certificate_provider_instance.certificate_name; + if (!identity_provider_instance_name.empty()) { + certificate_providers.instance = + xds_client_->certificate_provider_store() + .CreateOrGetCertificateProvider(identity_provider_instance_name); + if (certificate_providers.instance == nullptr) { + return absl::NotFoundError( + absl::StrCat("Certificate provider instance name: \"", + identity_provider_instance_name, "\" not recognized.")); + } + } + certificate_providers.xds = MakeRefCounted<XdsCertificateProvider>(); + certificate_providers.xds->UpdateRootCertNameAndDistributor( + "", root_provider_cert_name, + certificate_providers.root == nullptr + ? nullptr + : certificate_providers.root->distributor()); + certificate_providers.xds->UpdateIdentityCertNameAndDistributor( + "", identity_provider_cert_name, + certificate_providers.instance == nullptr + ? nullptr + : certificate_providers.instance->distributor()); + certificate_providers.xds->UpdateRequireClientCertificate( + "", filter_chain->downstream_tls_context.require_client_certificate); + auto xds_certificate_provider = certificate_providers.xds; + certificate_providers_map_.emplace(filter_chain, + std::move(certificate_providers)); + return xds_certificate_provider; +} + +absl::StatusOr<grpc_channel_args*> +FilterChainMatchManager::UpdateChannelArgsForConnection(grpc_channel_args* args, + grpc_endpoint* tcp) { + const auto* filter_chain = FindFilterChainDataForDestinationIp( + filter_chain_map_.destination_ip_vector, tcp); + if (filter_chain == nullptr && default_filter_chain_.has_value()) { + filter_chain = &default_filter_chain_.value(); + } + if (filter_chain == nullptr) { + grpc_channel_args_destroy(args); + return absl::UnavailableError("No matching filter chain found"); + } + // Nothing to update if credentials are not xDS. + grpc_server_credentials* server_creds = + grpc_find_server_credentials_in_args(args); + if (server_creds == nullptr || server_creds->type() != kCredentialsTypeXds) { + return args; + } + absl::StatusOr<RefCountedPtr<XdsCertificateProvider>> result = + CreateOrGetXdsCertificateProviderFromFilterChainData(filter_chain); + if (!result.ok()) { + grpc_channel_args_destroy(args); + return result.status(); + } + RefCountedPtr<XdsCertificateProvider> xds_certificate_provider = + std::move(*result); + GPR_ASSERT(xds_certificate_provider != nullptr); + grpc_arg arg_to_add = xds_certificate_provider->MakeChannelArg(); + grpc_channel_args* updated_args = + grpc_channel_args_copy_and_add(args, &arg_to_add, 1); + grpc_channel_args_destroy(args); + return updated_args; +} + class XdsServerConfigFetcher : public grpc_server_config_fetcher { public: - explicit XdsServerConfigFetcher(RefCountedPtr<XdsClient> xds_client) - : xds_client_(std::move(xds_client)) { + explicit XdsServerConfigFetcher(RefCountedPtr<XdsClient> xds_client, + grpc_server_xds_status_notifier notifier) + : xds_client_(std::move(xds_client)), serving_status_notifier_(notifier) { GPR_ASSERT(xds_client_ != nullptr); } - void StartWatch(std::string listening_address, + void StartWatch(std::string listening_address, grpc_channel_args* args, std::unique_ptr<grpc_server_config_fetcher::WatcherInterface> watcher) override { grpc_server_config_fetcher::WatcherInterface* watcher_ptr = watcher.get(); - auto listener_watcher = - absl::make_unique<ListenerWatcher>(std::move(watcher)); + auto listener_watcher = absl::make_unique<ListenerWatcher>( + std::move(watcher), args, xds_client_, serving_status_notifier_, + listening_address); auto* listener_watcher_ptr = listener_watcher.get(); - // TODO(yashykt): Get the resource name id from bootstrap - xds_client_->WatchListenerData( - absl::StrCat("grpc/server?xds.resource.listening_address=", - listening_address), - std::move(listener_watcher)); + listening_address = absl::StrReplaceAll( + xds_client_->bootstrap().server_listener_resource_name_template(), + {{"%s", listening_address}}); + xds_client_->WatchListenerData(listening_address, + std::move(listener_watcher)); MutexLock lock(&mu_); auto& watcher_state = watchers_[watcher_ptr]; watcher_state.listening_address = listening_address; @@ -73,32 +395,114 @@ class XdsServerConfigFetcher : public grpc_server_config_fetcher { public: explicit ListenerWatcher( std::unique_ptr<grpc_server_config_fetcher::WatcherInterface> - server_config_watcher) - : server_config_watcher_(std::move(server_config_watcher)) {} + server_config_watcher, + grpc_channel_args* args, RefCountedPtr<XdsClient> xds_client, + grpc_server_xds_status_notifier serving_status_notifier, + std::string listening_address) + : server_config_watcher_(std::move(server_config_watcher)), + args_(args), + xds_client_(std::move(xds_client)), + serving_status_notifier_(serving_status_notifier), + listening_address_(std::move(listening_address)) {} + + ~ListenerWatcher() override { grpc_channel_args_destroy(args_); } + + // Deleted due to special handling required for args_. Copy the channel args + // if we ever need these. + ListenerWatcher(const ListenerWatcher&) = delete; + ListenerWatcher& operator=(const ListenerWatcher&) = delete; void OnListenerChanged(XdsApi::LdsUpdate listener) override { - // TODO(yashykt): Construct channel args according to received update - server_config_watcher_->UpdateConfig(nullptr); + if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_server_config_fetcher_trace)) { + gpr_log( + GPR_INFO, + "[ListenerWatcher %p] Received LDS update from xds client %p: %s", + this, xds_client_.get(), listener.ToString().c_str()); + } + if (listener.address != listening_address_) { + OnFatalError(absl::FailedPreconditionError( + "Address in LDS update does not match listening address")); + return; + } + if (filter_chain_match_manager_ == nullptr) { + if (serving_status_notifier_.on_serving_status_update != nullptr) { + serving_status_notifier_.on_serving_status_update( + serving_status_notifier_.user_data, listening_address_.c_str(), + GRPC_STATUS_OK, ""); + } else { + gpr_log(GPR_INFO, + "xDS Listener resource obtained; will start serving on %s", + listening_address_.c_str()); + } + } + if (filter_chain_match_manager_ == nullptr || + !(listener.filter_chain_map == + filter_chain_match_manager_->filter_chain_map() && + listener.default_filter_chain == + filter_chain_match_manager_->default_filter_chain())) { + filter_chain_match_manager_ = MakeRefCounted<FilterChainMatchManager>( + xds_client_, std::move(listener.filter_chain_map), + std::move(listener.default_filter_chain)); + server_config_watcher_->UpdateConnectionManager( + filter_chain_match_manager_); + } } - void OnError(grpc_error* error) override { - gpr_log(GPR_ERROR, "ListenerWatcher:%p XdsClient reports error: %s", this, - grpc_error_string(error)); + void OnError(grpc_error_handle error) override { + if (filter_chain_match_manager_ != nullptr) { + gpr_log(GPR_ERROR, + "ListenerWatcher:%p XdsClient reports error: %s for %s; " + "ignoring in favor of existing resource", + this, grpc_error_std_string(error).c_str(), + listening_address_.c_str()); + } else { + if (serving_status_notifier_.on_serving_status_update != nullptr) { + serving_status_notifier_.on_serving_status_update( + serving_status_notifier_.user_data, listening_address_.c_str(), + GRPC_STATUS_UNAVAILABLE, grpc_error_std_string(error).c_str()); + } else { + gpr_log( + GPR_ERROR, + "ListenerWatcher:%p error obtaining xDS Listener resource: %s; " + "not serving on %s", + this, grpc_error_std_string(error).c_str(), + listening_address_.c_str()); + } + } GRPC_ERROR_UNREF(error); - // TODO(yashykt): We might want to bubble this error to the application. + } + + void OnFatalError(absl::Status status) { + gpr_log( + GPR_ERROR, + "ListenerWatcher:%p Encountered fatal error %s; not serving on %s", + this, status.ToString().c_str(), listening_address_.c_str()); + if (filter_chain_match_manager_ != nullptr) { + // The server has started listening already, so we need to gracefully + // stop serving. + server_config_watcher_->StopServing(); + filter_chain_match_manager_.reset(); + } + if (serving_status_notifier_.on_serving_status_update != nullptr) { + serving_status_notifier_.on_serving_status_update( + serving_status_notifier_.user_data, listening_address_.c_str(), + static_cast<grpc_status_code>(status.raw_code()), + std::string(status.message()).c_str()); + } } void OnResourceDoesNotExist() override { - gpr_log(GPR_ERROR, - "ListenerWatcher:%p XdsClient reports requested listener does " - "not exist", - this); - // TODO(yashykt): We might want to bubble this error to the application. + OnFatalError(absl::NotFoundError("Requested listener does not exist")); } private: std::unique_ptr<grpc_server_config_fetcher::WatcherInterface> server_config_watcher_; + grpc_channel_args* args_; + RefCountedPtr<XdsClient> xds_client_; + grpc_server_xds_status_notifier serving_status_notifier_; + std::string listening_address_; + RefCountedPtr<FilterChainMatchManager> filter_chain_match_manager_; }; struct WatcherState { @@ -107,25 +511,36 @@ class XdsServerConfigFetcher : public grpc_server_config_fetcher { }; RefCountedPtr<XdsClient> xds_client_; + grpc_server_xds_status_notifier serving_status_notifier_; Mutex mu_; std::map<grpc_server_config_fetcher::WatcherInterface*, WatcherState> - watchers_; + watchers_ ABSL_GUARDED_BY(mu_); }; } // namespace } // namespace grpc_core -grpc_server_config_fetcher* grpc_server_config_fetcher_xds_create() { +grpc_server_config_fetcher* grpc_server_config_fetcher_xds_create( + grpc_server_xds_status_notifier notifier, const grpc_channel_args* args) { grpc_core::ApplicationCallbackExecCtx callback_exec_ctx; grpc_core::ExecCtx exec_ctx; GRPC_API_TRACE("grpc_server_config_fetcher_xds_create()", 0, ()); - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; grpc_core::RefCountedPtr<grpc_core::XdsClient> xds_client = - grpc_core::XdsClient::GetOrCreate(&error); + grpc_core::XdsClient::GetOrCreate(args, &error); if (error != GRPC_ERROR_NONE) { gpr_log(GPR_ERROR, "Failed to create xds client: %s", - grpc_error_string(error)); + grpc_error_std_string(error).c_str()); + GRPC_ERROR_UNREF(error); + return nullptr; + } + if (xds_client->bootstrap() + .server_listener_resource_name_template() + .empty()) { + gpr_log(GPR_ERROR, + "server_listener_resource_name_template not provided in bootstrap " + "file."); return nullptr; } - return new grpc_core::XdsServerConfigFetcher(std::move(xds_client)); + return new grpc_core::XdsServerConfigFetcher(std::move(xds_client), notifier); } diff --git a/grpc/src/core/lib/iomgr/parse_address.cc b/grpc/src/core/lib/address_utils/parse_address.cc index 9afac74f..98dd1bcb 100644 --- a/grpc/src/core/lib/iomgr/parse_address.cc +++ b/grpc/src/core/lib/address_utils/parse_address.cc @@ -18,7 +18,7 @@ #include <grpc/support/port_platform.h> -#include "src/core/lib/iomgr/parse_address.h" +#include "src/core/lib/address_utils/parse_address.h" #include <stdio.h> #include <string.h> @@ -52,10 +52,10 @@ bool grpc_parse_unix(const grpc_core::URI& uri, uri.scheme().c_str()); return false; } - grpc_error* error = + grpc_error_handle error = grpc_core::UnixSockaddrPopulate(uri.path(), resolved_addr); if (error != GRPC_ERROR_NONE) { - gpr_log(GPR_ERROR, "%s", grpc_error_string(error)); + gpr_log(GPR_ERROR, "%s", grpc_error_std_string(error).c_str()); GRPC_ERROR_UNREF(error); return false; } @@ -69,10 +69,10 @@ bool grpc_parse_unix_abstract(const grpc_core::URI& uri, uri.scheme().c_str()); return false; } - grpc_error* error = + grpc_error_handle error = grpc_core::UnixAbstractSockaddrPopulate(uri.path(), resolved_addr); if (error != GRPC_ERROR_NONE) { - gpr_log(GPR_ERROR, "%s", grpc_error_string(error)); + gpr_log(GPR_ERROR, "%s", grpc_error_std_string(error).c_str()); GRPC_ERROR_UNREF(error); return false; } @@ -81,8 +81,8 @@ bool grpc_parse_unix_abstract(const grpc_core::URI& uri, namespace grpc_core { -grpc_error* UnixSockaddrPopulate(absl::string_view path, - grpc_resolved_address* resolved_addr) { +grpc_error_handle UnixSockaddrPopulate(absl::string_view path, + grpc_resolved_address* resolved_addr) { struct sockaddr_un* un = reinterpret_cast<struct sockaddr_un*>(resolved_addr->addr); const size_t maxlen = sizeof(un->sun_path) - 1; @@ -99,8 +99,8 @@ grpc_error* UnixSockaddrPopulate(absl::string_view path, return GRPC_ERROR_NONE; } -grpc_error* UnixAbstractSockaddrPopulate(absl::string_view path, - grpc_resolved_address* resolved_addr) { +grpc_error_handle UnixAbstractSockaddrPopulate( + absl::string_view path, grpc_resolved_address* resolved_addr) { struct sockaddr_un* un = reinterpret_cast<struct sockaddr_un*>(resolved_addr->addr); const size_t maxlen = sizeof(un->sun_path) - 1; @@ -122,25 +122,25 @@ grpc_error* UnixAbstractSockaddrPopulate(absl::string_view path, #else /* GRPC_HAVE_UNIX_SOCKET */ -bool grpc_parse_unix(const grpc_core::URI& uri, - grpc_resolved_address* resolved_addr) { +bool grpc_parse_unix(const grpc_core::URI& /* uri */, + grpc_resolved_address* /* resolved_addr */) { abort(); } -bool grpc_parse_unix_abstract(const grpc_core::URI& uri, - grpc_resolved_address* resolved_addr) { +bool grpc_parse_unix_abstract(const grpc_core::URI& /* uri */, + grpc_resolved_address* /* resolved_addr */) { abort(); } namespace grpc_core { -grpc_error* UnixSockaddrPopulate(absl::string_view path, - grpc_resolved_address* resolved_addr) { +grpc_error_handle UnixSockaddrPopulate( + absl::string_view /* path */, grpc_resolved_address* /* resolved_addr */) { abort(); } -grpc_error* UnixAbstractSockaddrPopulate(absl::string_view path, - grpc_resolved_address* resolved_addr) { +grpc_error_handle UnixAbstractSockaddrPopulate( + absl::string_view /* path */, grpc_resolved_address* /* resolved_addr */) { abort(); } diff --git a/grpc/src/core/lib/iomgr/parse_address.h b/grpc/src/core/lib/address_utils/parse_address.h index 870afefa..92409b7e 100644 --- a/grpc/src/core/lib/iomgr/parse_address.h +++ b/grpc/src/core/lib/address_utils/parse_address.h @@ -16,8 +16,8 @@ * */ -#ifndef GRPC_CORE_LIB_IOMGR_PARSE_ADDRESS_H -#define GRPC_CORE_LIB_IOMGR_PARSE_ADDRESS_H +#ifndef GRPC_CORE_LIB_ADDRESS_UTILS_PARSE_ADDRESS_H +#define GRPC_CORE_LIB_ADDRESS_UTILS_PARSE_ADDRESS_H #include <grpc/support/port_platform.h> @@ -64,14 +64,14 @@ uint16_t grpc_strhtons(const char* port); namespace grpc_core { /** Populate \a resolved_addr to be a unix socket at |path| */ -grpc_error* UnixSockaddrPopulate(absl::string_view path, - grpc_resolved_address* resolved_addr); +grpc_error_handle UnixSockaddrPopulate(absl::string_view path, + grpc_resolved_address* resolved_addr); /** Populate \a resolved_addr to be a unix socket in the abstract namespace * at |path| */ -grpc_error* UnixAbstractSockaddrPopulate(absl::string_view path, - grpc_resolved_address* resolved_addr); +grpc_error_handle UnixAbstractSockaddrPopulate( + absl::string_view path, grpc_resolved_address* resolved_addr); } // namespace grpc_core -#endif /* GRPC_CORE_LIB_IOMGR_PARSE_ADDRESS_H */ +#endif /* GRPC_CORE_LIB_ADDRESS_UTILS_PARSE_ADDRESS_H */ diff --git a/grpc/src/core/lib/iomgr/sockaddr_utils.cc b/grpc/src/core/lib/address_utils/sockaddr_utils.cc index 6d90c13a..888cd1aa 100644 --- a/grpc/src/core/lib/iomgr/sockaddr_utils.cc +++ b/grpc/src/core/lib/address_utils/sockaddr_utils.cc @@ -18,7 +18,7 @@ #include <grpc/support/port_platform.h> -#include "src/core/lib/iomgr/sockaddr_utils.h" +#include "src/core/lib/address_utils/sockaddr_utils.h" #include <errno.h> #include <inttypes.h> @@ -183,7 +183,7 @@ std::string grpc_sockaddr_to_string(const grpc_resolved_address* resolved_addr, if (ip != nullptr && grpc_inet_ntop(addr->sa_family, ip, ntop_buf, sizeof(ntop_buf)) != nullptr) { if (sin6_scope_id != 0) { - // Enclose sin6_scope_id with the format defined in RFC 6784 section 2. + // Enclose sin6_scope_id with the format defined in RFC 6874 section 2. std::string host_with_scope = absl::StrFormat("%s%%25%" PRIu32, ntop_buf, sin6_scope_id); out = grpc_core::JoinHostPort(host_with_scope, port); @@ -198,8 +198,8 @@ std::string grpc_sockaddr_to_string(const grpc_resolved_address* resolved_addr, return out; } -void grpc_string_to_sockaddr(grpc_resolved_address* out, const char* addr, - int port) { +grpc_error_handle grpc_string_to_sockaddr(grpc_resolved_address* out, + const char* addr, int port) { memset(out, 0, sizeof(grpc_resolved_address)); grpc_sockaddr_in6* addr6 = reinterpret_cast<grpc_sockaddr_in6*>(out->addr); grpc_sockaddr_in* addr4 = reinterpret_cast<grpc_sockaddr_in*>(out->addr); @@ -210,9 +210,11 @@ void grpc_string_to_sockaddr(grpc_resolved_address* out, const char* addr, addr4->sin_family = GRPC_AF_INET; out->len = sizeof(grpc_sockaddr_in); } else { - GPR_ASSERT(0); + return GRPC_ERROR_CREATE_FROM_COPIED_STRING( + absl::StrCat("Failed to parse address:", addr).c_str()); } grpc_sockaddr_set_port(out, port); + return GRPC_ERROR_NONE; } std::string grpc_sockaddr_to_uri(const grpc_resolved_address* resolved_addr) { @@ -294,3 +296,104 @@ int grpc_sockaddr_set_port(grpc_resolved_address* resolved_addr, int port) { return 0; } } + +std::string grpc_sockaddr_get_packed_host( + const grpc_resolved_address* resolved_addr) { + const grpc_sockaddr* addr = + reinterpret_cast<const grpc_sockaddr*>(resolved_addr->addr); + if (addr->sa_family == GRPC_AF_INET) { + const grpc_sockaddr_in* addr4 = + reinterpret_cast<const grpc_sockaddr_in*>(addr); + const char* addr_bytes = reinterpret_cast<const char*>(&addr4->sin_addr); + return std::string(addr_bytes, 4); + } else if (addr->sa_family == GRPC_AF_INET6) { + const grpc_sockaddr_in6* addr6 = + reinterpret_cast<const grpc_sockaddr_in6*>(addr); + const char* addr_bytes = reinterpret_cast<const char*>(&addr6->sin6_addr); + return std::string(addr_bytes, 16); + } else { + GPR_ASSERT(false); + } +} + +void grpc_sockaddr_mask_bits(grpc_resolved_address* address, + uint32_t mask_bits) { + grpc_sockaddr* addr = reinterpret_cast<grpc_sockaddr*>(address->addr); + if (addr->sa_family == GRPC_AF_INET) { + grpc_sockaddr_in* addr4 = reinterpret_cast<grpc_sockaddr_in*>(addr); + if (mask_bits == 0) { + memset(&addr4->sin_addr, 0, sizeof(addr4->sin_addr)); + return; + } else if (mask_bits >= 32) { + return; + } + uint32_t mask_ip_addr = (~(uint32_t(0))) << (32 - mask_bits); + addr4->sin_addr.s_addr &= grpc_htonl(mask_ip_addr); + } else if (addr->sa_family == GRPC_AF_INET6) { + grpc_sockaddr_in6* addr6 = reinterpret_cast<grpc_sockaddr_in6*>(addr); + if (mask_bits == 0) { + memset(&addr6->sin6_addr, 0, sizeof(addr6->sin6_addr)); + return; + } else if (mask_bits >= 128) { + return; + } + // We cannot use s6_addr32 since it is not defined on all platforms that we + // need it on. + uint32_t address_parts[4]; + GPR_ASSERT(sizeof(addr6->sin6_addr) == sizeof(address_parts)); + memcpy(address_parts, &addr6->sin6_addr, sizeof(grpc_in6_addr)); + if (mask_bits <= 32) { + uint32_t mask_ip_addr = (~(uint32_t(0))) << (32 - mask_bits); + address_parts[0] &= grpc_htonl(mask_ip_addr); + memset(&address_parts[1], 0, sizeof(uint32_t)); + memset(&address_parts[2], 0, sizeof(uint32_t)); + memset(&address_parts[3], 0, sizeof(uint32_t)); + } else if (mask_bits <= 64) { + mask_bits -= 32; + uint32_t mask_ip_addr = (~(uint32_t(0))) << (32 - mask_bits); + address_parts[1] &= grpc_htonl(mask_ip_addr); + memset(&address_parts[2], 0, sizeof(uint32_t)); + memset(&address_parts[3], 0, sizeof(uint32_t)); + } else if (mask_bits <= 96) { + mask_bits -= 64; + uint32_t mask_ip_addr = (~(uint32_t(0))) << (32 - mask_bits); + address_parts[2] &= grpc_htonl(mask_ip_addr); + memset(&address_parts[3], 0, sizeof(uint32_t)); + } else { + mask_bits -= 96; + uint32_t mask_ip_addr = (~(uint32_t(0))) << (32 - mask_bits); + address_parts[3] &= grpc_htonl(mask_ip_addr); + } + memcpy(&addr6->sin6_addr, address_parts, sizeof(grpc_in6_addr)); + } +} + +bool grpc_sockaddr_match_subnet(const grpc_resolved_address* address, + const grpc_resolved_address* subnet_address, + uint32_t mask_bits) { + auto* addr = reinterpret_cast<const grpc_sockaddr*>(address->addr); + auto* subnet_addr = + reinterpret_cast<const grpc_sockaddr*>(subnet_address->addr); + if (addr->sa_family != subnet_addr->sa_family) return false; + grpc_resolved_address masked_address; + memcpy(&masked_address, address, sizeof(grpc_resolved_address)); + addr = reinterpret_cast<grpc_sockaddr*>((&masked_address)->addr); + grpc_sockaddr_mask_bits(&masked_address, mask_bits); + if (addr->sa_family == GRPC_AF_INET) { + auto* addr4 = reinterpret_cast<const grpc_sockaddr_in*>(addr); + auto* subnet_addr4 = reinterpret_cast<const grpc_sockaddr_in*>(subnet_addr); + if (memcmp(&addr4->sin_addr, &subnet_addr4->sin_addr, + sizeof(addr4->sin_addr)) == 0) { + return true; + } + } else if (addr->sa_family == GRPC_AF_INET6) { + auto* addr6 = reinterpret_cast<const grpc_sockaddr_in6*>(addr); + auto* subnet_addr6 = + reinterpret_cast<const grpc_sockaddr_in6*>(subnet_addr); + if (memcmp(&addr6->sin6_addr, &subnet_addr6->sin6_addr, + sizeof(addr6->sin6_addr)) == 0) { + return true; + } + } + return false; +} diff --git a/grpc/src/core/lib/iomgr/sockaddr_utils.h b/grpc/src/core/lib/address_utils/sockaddr_utils.h index ba91e56d..e8bf79fd 100644 --- a/grpc/src/core/lib/iomgr/sockaddr_utils.h +++ b/grpc/src/core/lib/address_utils/sockaddr_utils.h @@ -16,8 +16,8 @@ * */ -#ifndef GRPC_CORE_LIB_IOMGR_SOCKADDR_UTILS_H -#define GRPC_CORE_LIB_IOMGR_SOCKADDR_UTILS_H +#ifndef GRPC_CORE_LIB_ADDRESS_UTILS_SOCKADDR_UTILS_H +#define GRPC_CORE_LIB_ADDRESS_UTILS_SOCKADDR_UTILS_H #include <grpc/support/port_platform.h> @@ -64,10 +64,12 @@ int grpc_sockaddr_set_port(grpc_resolved_address* addr, int port); // If the normalize flag is enabled, ::ffff:0.0.0.0/96 IPv6 addresses are // displayed as plain IPv4. std::string grpc_sockaddr_to_string(const grpc_resolved_address* addr, - bool normalize); + bool normalize) GRPC_MUST_USE_RESULT; -void grpc_string_to_sockaddr(grpc_resolved_address* out, const char* addr, - int port); +// Newer form of grpc_string_to_sockaddr which returns an error instead of +// crashing if \a addr is not IPv6/IPv6 +grpc_error_handle grpc_string_to_sockaddr(grpc_resolved_address* out, + const char* addr, int port); /* Returns the URI string corresponding to \a addr */ std::string grpc_sockaddr_to_uri(const grpc_resolved_address* addr); @@ -77,4 +79,22 @@ const char* grpc_sockaddr_get_uri_scheme(const grpc_resolved_address* addr); int grpc_sockaddr_get_family(const grpc_resolved_address* resolved_addr); -#endif /* GRPC_CORE_LIB_IOMGR_SOCKADDR_UTILS_H */ +std::string grpc_sockaddr_get_packed_host( + const grpc_resolved_address* resolved_addr); + +// Applies a mask of \a mask_bits to IPv4/IPv6 addresses. Has no effect if the +// address type is not IPv4/IPv6. +void grpc_sockaddr_mask_bits(grpc_resolved_address* address, + uint32_t mask_bits); + +// If \a address is IPv4/IPv6, checks if the IP address falls in the CIDR +// specified by \a subnet_address and \a mask_bits. +// Returns false if \a address is not an IPv4/IPv6 address. The ports (if set) +// are ignored for matching purposes. Note that, \a subnet_address should be +// normalized, i.e., `grpc_sockaddr_mask_bits` should have been called on it if +// necessary. +bool grpc_sockaddr_match_subnet(const grpc_resolved_address* address, + const grpc_resolved_address* subnet_address, + uint32_t mask_bits); + +#endif /* GRPC_CORE_LIB_ADDRESS_UTILS_SOCKADDR_UTILS_H */ diff --git a/grpc/src/core/lib/channel/channel_stack.cc b/grpc/src/core/lib/channel/channel_stack.cc index e9b34897..122d7a91 100644 --- a/grpc/src/core/lib/channel/channel_stack.cc +++ b/grpc/src/core/lib/channel/channel_stack.cc @@ -81,12 +81,24 @@ grpc_channel_element* grpc_channel_stack_last_element( return grpc_channel_stack_element(channel_stack, channel_stack->count - 1); } +size_t grpc_channel_stack_filter_instance_number( + grpc_channel_stack* channel_stack, grpc_channel_element* elem) { + size_t num_found = 0; + for (size_t i = 0; i < channel_stack->count; ++i) { + grpc_channel_element* element = + grpc_channel_stack_element(channel_stack, i); + if (element == elem) break; + if (element->filter == elem->filter) ++num_found; + } + return num_found; +} + grpc_call_element* grpc_call_stack_element(grpc_call_stack* call_stack, size_t index) { return CALL_ELEMS_FROM_STACK(call_stack) + index; } -grpc_error* grpc_channel_stack_init( +grpc_error_handle grpc_channel_stack_init( int initial_refs, grpc_iomgr_cb_func destroy, void* destroy_arg, const grpc_channel_filter** filters, size_t filter_count, const grpc_channel_args* channel_args, grpc_transport* optional_transport, @@ -108,7 +120,7 @@ grpc_error* grpc_channel_stack_init( sizeof(grpc_channel_element)); /* init per-filter data */ - grpc_error* first_error = GRPC_ERROR_NONE; + grpc_error_handle first_error = GRPC_ERROR_NONE; for (i = 0; i < filter_count; i++) { args.channel_stack = stack; args.channel_args = channel_args; @@ -117,7 +129,8 @@ grpc_error* grpc_channel_stack_init( args.is_last = i == (filter_count - 1); elems[i].filter = filters[i]; elems[i].channel_data = user_data; - grpc_error* error = elems[i].filter->init_channel_elem(&elems[i], &args); + grpc_error_handle error = + elems[i].filter->init_channel_elem(&elems[i], &args); if (error != GRPC_ERROR_NONE) { if (first_error == GRPC_ERROR_NONE) { first_error = error; @@ -149,10 +162,10 @@ void grpc_channel_stack_destroy(grpc_channel_stack* stack) { } } -grpc_error* grpc_call_stack_init(grpc_channel_stack* channel_stack, - int initial_refs, grpc_iomgr_cb_func destroy, - void* destroy_arg, - const grpc_call_element_args* elem_args) { +grpc_error_handle grpc_call_stack_init( + grpc_channel_stack* channel_stack, int initial_refs, + grpc_iomgr_cb_func destroy, void* destroy_arg, + const grpc_call_element_args* elem_args) { grpc_channel_element* channel_elems = CHANNEL_ELEMS_FROM_STACK(channel_stack); size_t count = channel_stack->count; grpc_call_element* call_elems; @@ -166,7 +179,7 @@ grpc_error* grpc_call_stack_init(grpc_channel_stack* channel_stack, GPR_ROUND_UP_TO_ALIGNMENT_SIZE(count * sizeof(grpc_call_element)); /* init per-filter data */ - grpc_error* first_error = GRPC_ERROR_NONE; + grpc_error_handle first_error = GRPC_ERROR_NONE; for (size_t i = 0; i < count; i++) { call_elems[i].filter = channel_elems[i].filter; call_elems[i].channel_data = channel_elems[i].channel_data; @@ -175,7 +188,7 @@ grpc_error* grpc_call_stack_init(grpc_channel_stack* channel_stack, GPR_ROUND_UP_TO_ALIGNMENT_SIZE(call_elems[i].filter->sizeof_call_data); } for (size_t i = 0; i < count; i++) { - grpc_error* error = + grpc_error_handle error = call_elems[i].filter->init_call_elem(&call_elems[i], elem_args); if (error != GRPC_ERROR_NONE) { if (first_error == GRPC_ERROR_NONE) { diff --git a/grpc/src/core/lib/channel/channel_stack.h b/grpc/src/core/lib/channel/channel_stack.h index e297df94..4832303c 100644 --- a/grpc/src/core/lib/channel/channel_stack.h +++ b/grpc/src/core/lib/channel/channel_stack.h @@ -125,8 +125,8 @@ struct grpc_channel_filter { transport and is on the server. Most filters want to ignore this argument. Implementations may assume that elem->call_data is all zeros. */ - grpc_error* (*init_call_elem)(grpc_call_element* elem, - const grpc_call_element_args* args); + grpc_error_handle (*init_call_elem)(grpc_call_element* elem, + const grpc_call_element_args* args); void (*set_pollset_or_pollset_set)(grpc_call_element* elem, grpc_polling_entity* pollent); /* Destroy per call data. @@ -148,8 +148,8 @@ struct grpc_channel_filter { useful for asserting correct configuration by upper layer code. The filter does not need to do any chaining. Implementations may assume that elem->channel_data is all zeros. */ - grpc_error* (*init_channel_elem)(grpc_channel_element* elem, - grpc_channel_element_args* args); + grpc_error_handle (*init_channel_elem)(grpc_channel_element* elem, + grpc_channel_element_args* args); /* Destroy per channel data. The filter does not need to do any chaining */ void (*destroy_channel_elem)(grpc_channel_element* elem); @@ -204,6 +204,13 @@ grpc_channel_element* grpc_channel_stack_element(grpc_channel_stack* stack, /* Get the last channel element in a channel stack */ grpc_channel_element* grpc_channel_stack_last_element( grpc_channel_stack* stack); + +// A utility function for a filter to determine how many other instances +// of the same filter exist above it in the same stack. Intended to be +// used in the filter's init_channel_elem() method. +size_t grpc_channel_stack_filter_instance_number( + grpc_channel_stack* channel_stack, grpc_channel_element* elem); + /* Get a call stack element given a call stack and an index */ grpc_call_element* grpc_call_stack_element(grpc_call_stack* stack, size_t i); @@ -211,7 +218,7 @@ grpc_call_element* grpc_call_stack_element(grpc_call_stack* stack, size_t i); size_t grpc_channel_stack_size(const grpc_channel_filter** filters, size_t filter_count); /* Initialize a channel stack given some filters */ -grpc_error* grpc_channel_stack_init( +grpc_error_handle grpc_channel_stack_init( int initial_refs, grpc_iomgr_cb_func destroy, void* destroy_arg, const grpc_channel_filter** filters, size_t filter_count, const grpc_channel_args* args, grpc_transport* optional_transport, @@ -222,10 +229,11 @@ void grpc_channel_stack_destroy(grpc_channel_stack* stack); /* Initialize a call stack given a channel stack. transport_server_data is expected to be NULL on a client, or an opaque transport owned pointer on the server. */ -grpc_error* grpc_call_stack_init(grpc_channel_stack* channel_stack, - int initial_refs, grpc_iomgr_cb_func destroy, - void* destroy_arg, - const grpc_call_element_args* elem_args); +grpc_error_handle grpc_call_stack_init(grpc_channel_stack* channel_stack, + int initial_refs, + grpc_iomgr_cb_func destroy, + void* destroy_arg, + const grpc_call_element_args* elem_args); /* Set a pollset or a pollset_set for a call stack: must occur before the first * op is started */ void grpc_call_stack_set_pollset_or_pollset_set(grpc_call_stack* call_stack, diff --git a/grpc/src/core/lib/channel/channel_stack_builder.cc b/grpc/src/core/lib/channel/channel_stack_builder.cc index 8b3008f2..7f7cf753 100644 --- a/grpc/src/core/lib/channel/channel_stack_builder.cc +++ b/grpc/src/core/lib/channel/channel_stack_builder.cc @@ -267,7 +267,7 @@ void grpc_channel_stack_builder_destroy(grpc_channel_stack_builder* builder) { gpr_free(builder); } -grpc_error* grpc_channel_stack_builder_finish( +grpc_error_handle grpc_channel_stack_builder_finish( grpc_channel_stack_builder* builder, size_t prefix_bytes, int initial_refs, grpc_iomgr_cb_func destroy, void* destroy_arg, void** result) { // count the number of filters @@ -294,7 +294,7 @@ grpc_error* grpc_channel_stack_builder_finish( grpc_channel_stack* channel_stack = reinterpret_cast<grpc_channel_stack*>( static_cast<char*>(*result) + prefix_bytes); // and initialize it - grpc_error* error = grpc_channel_stack_init( + grpc_error_handle error = grpc_channel_stack_init( initial_refs, destroy, destroy_arg == nullptr ? *result : destroy_arg, filters, num_filters, builder->args, builder->transport, builder->name, channel_stack); diff --git a/grpc/src/core/lib/channel/channel_stack_builder.h b/grpc/src/core/lib/channel/channel_stack_builder.h index 89c30e0c..6782a148 100644 --- a/grpc/src/core/lib/channel/channel_stack_builder.h +++ b/grpc/src/core/lib/channel/channel_stack_builder.h @@ -156,7 +156,7 @@ void grpc_channel_stack_builder_iterator_destroy( /// Returns the base pointer of the allocated block /// \a initial_refs, \a destroy, \a destroy_arg are as per /// grpc_channel_stack_init -grpc_error* grpc_channel_stack_builder_finish( +grpc_error_handle grpc_channel_stack_builder_finish( grpc_channel_stack_builder* builder, size_t prefix_bytes, int initial_refs, grpc_iomgr_cb_func destroy, void* destroy_arg, void** result); diff --git a/grpc/src/core/lib/channel/channelz.cc b/grpc/src/core/lib/channel/channelz.cc index 188203cb..452d6641 100644 --- a/grpc/src/core/lib/channel/channelz.cc +++ b/grpc/src/core/lib/channel/channelz.cc @@ -20,16 +20,19 @@ #include "src/core/lib/channel/channelz.h" +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +#include "absl/strings/escaping.h" #include "absl/strings/strip.h" #include <grpc/grpc.h> #include <grpc/support/alloc.h> #include <grpc/support/log.h> #include <grpc/support/string_util.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> +#include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channelz_registry.h" #include "src/core/lib/channel/status_util.h" #include "src/core/lib/gpr/string.h" @@ -39,6 +42,7 @@ #include "src/core/lib/gprpp/memory.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/slice/b64.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/surface/channel.h" @@ -337,6 +341,83 @@ Json ServerNode::RenderJson() { } // +// SocketNode::Security::Tls +// + +Json SocketNode::Security::Tls::RenderJson() { + Json::Object data; + if (type == NameType::kStandardName) { + data["standard_name"] = name; + } else if (type == NameType::kOtherName) { + data["other_name"] = name; + } + if (!local_certificate.empty()) { + data["local_certificate"] = absl::Base64Escape(local_certificate); + } + if (!remote_certificate.empty()) { + data["remote_certificate"] = absl::Base64Escape(remote_certificate); + } + return data; +} + +// +// SocketNode::Security +// + +Json SocketNode::Security::RenderJson() { + Json::Object data; + switch (type) { + case ModelType::kUnset: + break; + case ModelType::kTls: + if (tls) { + data["tls"] = tls->RenderJson(); + } + break; + case ModelType::kOther: + if (other) { + data["other"] = *other; + } + break; + } + return data; +} + +namespace { + +void* SecurityArgCopy(void* p) { + SocketNode::Security* xds_certificate_provider = + static_cast<SocketNode::Security*>(p); + return xds_certificate_provider->Ref().release(); +} + +void SecurityArgDestroy(void* p) { + SocketNode::Security* xds_certificate_provider = + static_cast<SocketNode::Security*>(p); + xds_certificate_provider->Unref(); +} + +int SecurityArgCmp(void* p, void* q) { return GPR_ICMP(p, q); } + +const grpc_arg_pointer_vtable kChannelArgVtable = { + SecurityArgCopy, SecurityArgDestroy, SecurityArgCmp}; + +} // namespace + +grpc_arg SocketNode::Security::MakeChannelArg() const { + return grpc_channel_arg_pointer_create( + const_cast<char*>(GRPC_ARG_CHANNELZ_SECURITY), + const_cast<SocketNode::Security*>(this), &kChannelArgVtable); +} + +RefCountedPtr<SocketNode::Security> SocketNode::Security::GetFromChannelArgs( + const grpc_channel_args* args) { + Security* security = grpc_channel_args_find_pointer<Security>( + args, GRPC_ARG_CHANNELZ_SECURITY); + return security != nullptr ? security->Ref() : nullptr; +} + +// // SocketNode // @@ -356,13 +437,22 @@ void PopulateSocketAddressJson(Json::Object* json, const char* name, if (!port.empty()) { port_num = atoi(port.data()); } - char* b64_host = grpc_base64_encode(host.data(), host.size(), false, false); - data["tcpip_address"] = Json::Object{ - {"port", port_num}, - {"ip_address", b64_host}, - }; - gpr_free(b64_host); - } else if (uri.ok() && uri->scheme() == "unix") { + grpc_resolved_address resolved_host; + grpc_error_handle error = + grpc_string_to_sockaddr(&resolved_host, host.c_str(), port_num); + if (error == GRPC_ERROR_NONE) { + std::string packed_host = grpc_sockaddr_get_packed_host(&resolved_host); + std::string b64_host = absl::Base64Escape(packed_host); + data["tcpip_address"] = Json::Object{ + {"port", port_num}, + {"ip_address", b64_host}, + }; + (*json)[name] = std::move(data); + return; + } + GRPC_ERROR_UNREF(error); + } + if (uri.ok() && uri->scheme() == "unix") { data["uds_address"] = Json::Object{ {"filename", uri->path()}, }; @@ -376,10 +466,12 @@ void PopulateSocketAddressJson(Json::Object* json, const char* name, } // namespace -SocketNode::SocketNode(std::string local, std::string remote, std::string name) +SocketNode::SocketNode(std::string local, std::string remote, std::string name, + RefCountedPtr<Security> security) : BaseNode(EntityType::kSocket, std::move(name)), local_(std::move(local)), - remote_(std::move(remote)) {} + remote_(std::move(remote)), + security_(std::move(security)) {} void SocketNode::RecordStreamStartedFromLocal() { streams_started_.FetchAdd(1, MemoryOrder::RELAXED); @@ -467,6 +559,10 @@ Json SocketNode::RenderJson() { }}, {"data", std::move(data)}, }; + if (security_ != nullptr && + security_->type != SocketNode::Security::ModelType::kUnset) { + object["security"] = security_->RenderJson(); + } PopulateSocketAddressJson(&object, "remote", remote_.c_str()); PopulateSocketAddressJson(&object, "local", local_.c_str()); return object; diff --git a/grpc/src/core/lib/channel/channelz.h b/grpc/src/core/lib/channel/channelz.h index 3c558735..a0a449ef 100644 --- a/grpc/src/core/lib/channel/channelz.h +++ b/grpc/src/core/lib/channel/channelz.h @@ -27,6 +27,7 @@ #include <string> #include "absl/container/inlined_vector.h" +#include "absl/types/optional.h" #include "src/core/lib/channel/channel_trace.h" #include "src/core/lib/gpr/time_precise.h" @@ -268,10 +269,37 @@ class ServerNode : public BaseNode { std::map<intptr_t, RefCountedPtr<ListenSocketNode>> child_listen_sockets_; }; +#define GRPC_ARG_CHANNELZ_SECURITY "grpc.internal.channelz_security" + // Handles channelz bookkeeping for sockets class SocketNode : public BaseNode { public: - SocketNode(std::string local, std::string remote, std::string name); + struct Security : public RefCounted<Security> { + struct Tls { + enum class NameType { kUnset = 0, kStandardName = 1, kOtherName = 2 }; + NameType type = NameType::kUnset; + // Holds the value of standard_name or other_names if type is not kUnset. + std::string name; + std::string local_certificate; + std::string remote_certificate; + + Json RenderJson(); + }; + enum class ModelType { kUnset = 0, kTls = 1, kOther = 2 }; + ModelType type = ModelType::kUnset; + absl::optional<Tls> tls; + absl::optional<Json> other; + + Json RenderJson(); + + grpc_arg MakeChannelArg() const; + + static RefCountedPtr<Security> GetFromChannelArgs( + const grpc_channel_args* args); + }; + + SocketNode(std::string local, std::string remote, std::string name, + RefCountedPtr<Security> security); ~SocketNode() override {} Json RenderJson() override; @@ -305,6 +333,7 @@ class SocketNode : public BaseNode { Atomic<gpr_cycle_counter> last_message_received_cycle_{0}; std::string local_; std::string remote_; + RefCountedPtr<Security> const security_; }; // Handles channelz bookkeeping for listen sockets diff --git a/grpc/src/core/lib/channel/channelz_registry.cc b/grpc/src/core/lib/channel/channelz_registry.cc index 6eea6eb5..c76b5b43 100644 --- a/grpc/src/core/lib/channel/channelz_registry.cc +++ b/grpc/src/core/lib/channel/channelz_registry.cc @@ -181,18 +181,24 @@ void ChannelzRegistry::InternalLogAllEntities() { } // namespace grpc_core char* grpc_channelz_get_top_channels(intptr_t start_channel_id) { + grpc_core::ApplicationCallbackExecCtx callback_exec_ctx; + grpc_core::ExecCtx exec_ctx; return gpr_strdup( grpc_core::channelz::ChannelzRegistry::GetTopChannels(start_channel_id) .c_str()); } char* grpc_channelz_get_servers(intptr_t start_server_id) { + grpc_core::ApplicationCallbackExecCtx callback_exec_ctx; + grpc_core::ExecCtx exec_ctx; return gpr_strdup( grpc_core::channelz::ChannelzRegistry::GetServers(start_server_id) .c_str()); } char* grpc_channelz_get_server(intptr_t server_id) { + grpc_core::ApplicationCallbackExecCtx callback_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_core::RefCountedPtr<grpc_core::channelz::BaseNode> server_node = grpc_core::channelz::ChannelzRegistry::Get(server_id); if (server_node == nullptr || @@ -209,6 +215,8 @@ char* grpc_channelz_get_server(intptr_t server_id) { char* grpc_channelz_get_server_sockets(intptr_t server_id, intptr_t start_socket_id, intptr_t max_results) { + grpc_core::ApplicationCallbackExecCtx callback_exec_ctx; + grpc_core::ExecCtx exec_ctx; // Validate inputs before handing them of to the renderer. grpc_core::RefCountedPtr<grpc_core::channelz::BaseNode> base_node = grpc_core::channelz::ChannelzRegistry::Get(server_id); @@ -226,6 +234,8 @@ char* grpc_channelz_get_server_sockets(intptr_t server_id, } char* grpc_channelz_get_channel(intptr_t channel_id) { + grpc_core::ApplicationCallbackExecCtx callback_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_core::RefCountedPtr<grpc_core::channelz::BaseNode> channel_node = grpc_core::channelz::ChannelzRegistry::Get(channel_id); if (channel_node == nullptr || @@ -242,6 +252,8 @@ char* grpc_channelz_get_channel(intptr_t channel_id) { } char* grpc_channelz_get_subchannel(intptr_t subchannel_id) { + grpc_core::ApplicationCallbackExecCtx callback_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_core::RefCountedPtr<grpc_core::channelz::BaseNode> subchannel_node = grpc_core::channelz::ChannelzRegistry::Get(subchannel_id); if (subchannel_node == nullptr || @@ -256,6 +268,8 @@ char* grpc_channelz_get_subchannel(intptr_t subchannel_id) { } char* grpc_channelz_get_socket(intptr_t socket_id) { + grpc_core::ApplicationCallbackExecCtx callback_exec_ctx; + grpc_core::ExecCtx exec_ctx; grpc_core::RefCountedPtr<grpc_core::channelz::BaseNode> socket_node = grpc_core::channelz::ChannelzRegistry::Get(socket_id); if (socket_node == nullptr || diff --git a/grpc/src/core/lib/channel/connected_channel.cc b/grpc/src/core/lib/channel/connected_channel.cc index be74d9e8..12b3d786 100644 --- a/grpc/src/core/lib/channel/connected_channel.cc +++ b/grpc/src/core/lib/channel/connected_channel.cc @@ -53,13 +53,13 @@ typedef struct connected_channel_call_data { callback_state recv_trailing_metadata_ready; } call_data; -static void run_in_call_combiner(void* arg, grpc_error* error) { +static void run_in_call_combiner(void* arg, grpc_error_handle error) { callback_state* state = static_cast<callback_state*>(arg); GRPC_CALL_COMBINER_START(state->call_combiner, state->original_closure, GRPC_ERROR_REF(error), state->reason); } -static void run_cancel_in_call_combiner(void* arg, grpc_error* error) { +static void run_cancel_in_call_combiner(void* arg, grpc_error_handle error) { run_in_call_combiner(arg, error); gpr_free(arg); } @@ -146,7 +146,7 @@ static void connected_channel_start_transport_op(grpc_channel_element* elem, } /* Constructor for call_data */ -static grpc_error* connected_channel_init_call_elem( +static grpc_error_handle connected_channel_init_call_elem( grpc_call_element* elem, const grpc_call_element_args* args) { call_data* calld = static_cast<call_data*>(elem->call_data); channel_data* chand = static_cast<channel_data*>(elem->channel_data); @@ -179,7 +179,7 @@ static void connected_channel_destroy_call_elem( } /* Constructor for channel_data */ -static grpc_error* connected_channel_init_channel_elem( +static grpc_error_handle connected_channel_init_channel_elem( grpc_channel_element* elem, grpc_channel_element_args* args) { channel_data* cd = static_cast<channel_data*>(elem->channel_data); GPR_ASSERT(args->is_last); diff --git a/grpc/src/core/lib/channel/handshaker.cc b/grpc/src/core/lib/channel/handshaker.cc index 8d1d45e5..632d2864 100644 --- a/grpc/src/core/lib/channel/handshaker.cc +++ b/grpc/src/core/lib/channel/handshaker.cc @@ -53,45 +53,7 @@ std::string HandshakerArgsString(HandshakerArgs* args) { } // namespace -HandshakeManager::HandshakeManager() { gpr_mu_init(&mu_); } - -/// Add \a mgr to the server side list of all pending handshake managers, the -/// list starts with \a *head. -// Not thread-safe. Caller needs to synchronize. -void HandshakeManager::AddToPendingMgrList(HandshakeManager** head) { - GPR_ASSERT(prev_ == nullptr); - GPR_ASSERT(next_ == nullptr); - next_ = *head; - if (*head) { - (*head)->prev_ = this; - } - *head = this; -} - -/// Remove \a mgr from the server side list of all pending handshake managers. -// Not thread-safe. Caller needs to synchronize. -void HandshakeManager::RemoveFromPendingMgrList(HandshakeManager** head) { - if (next_ != nullptr) { - next_->prev_ = prev_; - } - if (prev_ != nullptr) { - prev_->next_ = next_; - } else { - GPR_ASSERT(*head == this); - *head = next_; - } -} - -/// Shutdown all pending handshake managers starting at head on the server -/// side. Not thread-safe. Caller needs to synchronize. -void HandshakeManager::ShutdownAllPending(grpc_error* why) { - auto* head = this; - while (head != nullptr) { - head->Shutdown(GRPC_ERROR_REF(why)); - head = head->next_; - } - GRPC_ERROR_UNREF(why); -} +HandshakeManager::HandshakeManager() {} void HandshakeManager::Add(RefCountedPtr<Handshaker> handshaker) { if (GRPC_TRACE_FLAG_ENABLED(grpc_handshaker_trace)) { @@ -104,12 +66,9 @@ void HandshakeManager::Add(RefCountedPtr<Handshaker> handshaker) { handshakers_.push_back(std::move(handshaker)); } -HandshakeManager::~HandshakeManager() { - handshakers_.clear(); - gpr_mu_destroy(&mu_); -} +HandshakeManager::~HandshakeManager() { handshakers_.clear(); } -void HandshakeManager::Shutdown(grpc_error* why) { +void HandshakeManager::Shutdown(grpc_error_handle why) { { MutexLock lock(&mu_); // Shutdown the handshaker that's currently in progress, if any. @@ -124,12 +83,12 @@ void HandshakeManager::Shutdown(grpc_error* why) { // Helper function to call either the next handshaker or the // on_handshake_done callback. // Returns true if we've scheduled the on_handshake_done callback. -bool HandshakeManager::CallNextHandshakerLocked(grpc_error* error) { +bool HandshakeManager::CallNextHandshakerLocked(grpc_error_handle error) { if (GRPC_TRACE_FLAG_ENABLED(grpc_handshaker_trace)) { gpr_log(GPR_INFO, "handshake_manager %p: error=%s shutdown=%d index=%" PRIuPTR ", args=%s", - this, grpc_error_string(error), is_shutdown_, index_, + this, grpc_error_std_string(error).c_str(), is_shutdown_, index_, HandshakerArgsString(&args_).c_str()); } GPR_ASSERT(index_ <= handshakers_.size()); @@ -162,7 +121,7 @@ bool HandshakeManager::CallNextHandshakerLocked(grpc_error* error) { gpr_log(GPR_INFO, "handshake_manager %p: handshaking complete -- scheduling " "on_handshake_done with error=%s", - this, grpc_error_string(error)); + this, grpc_error_std_string(error).c_str()); } // Cancel deadline timer, since we're invoking the on_handshake_done // callback now. @@ -183,7 +142,8 @@ bool HandshakeManager::CallNextHandshakerLocked(grpc_error* error) { return is_shutdown_; } -void HandshakeManager::CallNextHandshakerFn(void* arg, grpc_error* error) { +void HandshakeManager::CallNextHandshakerFn(void* arg, + grpc_error_handle error) { auto* mgr = static_cast<HandshakeManager*>(arg); bool done; { @@ -198,7 +158,7 @@ void HandshakeManager::CallNextHandshakerFn(void* arg, grpc_error* error) { } } -void HandshakeManager::OnTimeoutFn(void* arg, grpc_error* error) { +void HandshakeManager::OnTimeoutFn(void* arg, grpc_error_handle error) { auto* mgr = static_cast<HandshakeManager*>(arg); if (error == GRPC_ERROR_NONE) { // Timer fired, rather than being cancelled mgr->Shutdown(GRPC_ERROR_CREATE_FROM_STATIC_STRING("Handshake timed out")); @@ -216,7 +176,6 @@ void HandshakeManager::DoHandshake(grpc_endpoint* endpoint, { MutexLock lock(&mu_); GPR_ASSERT(index_ == 0); - GPR_ASSERT(!is_shutdown_); // Construct handshaker args. These will be passed through all // handshakers and eventually be freed by the on_handshake_done callback. args_.endpoint = endpoint; diff --git a/grpc/src/core/lib/channel/handshaker.h b/grpc/src/core/lib/channel/handshaker.h index 541f38ed..b6b69da5 100644 --- a/grpc/src/core/lib/channel/handshaker.h +++ b/grpc/src/core/lib/channel/handshaker.h @@ -78,7 +78,7 @@ struct HandshakerArgs { class Handshaker : public RefCounted<Handshaker> { public: ~Handshaker() override = default; - virtual void Shutdown(grpc_error* why) = 0; + virtual void Shutdown(grpc_error_handle why) = 0; virtual void DoHandshake(grpc_tcp_server_acceptor* acceptor, grpc_closure* on_handshake_done, HandshakerArgs* args) = 0; @@ -94,26 +94,13 @@ class HandshakeManager : public RefCounted<HandshakeManager> { HandshakeManager(); ~HandshakeManager() override; - /// Add \a mgr to the server side list of all pending handshake managers, the - /// list starts with \a *head. - // Not thread-safe. Caller needs to synchronize. - void AddToPendingMgrList(HandshakeManager** head); - - /// Remove \a mgr from the server side list of all pending handshake managers. - // Not thread-safe. Caller needs to synchronize. - void RemoveFromPendingMgrList(HandshakeManager** head); - - /// Shutdown all pending handshake managers starting at head on the server - /// side. Not thread-safe. Caller needs to synchronize. - void ShutdownAllPending(grpc_error* why); - /// Adds a handshaker to the handshake manager. /// Takes ownership of \a handshaker. void Add(RefCountedPtr<Handshaker> handshaker); /// Shuts down the handshake manager (e.g., to clean up when the operation is /// aborted in the middle). - void Shutdown(grpc_error* why); + void Shutdown(grpc_error_handle why); /// Invokes handshakers in the order they were added. /// Takes ownership of \a endpoint, and then passes that ownership to @@ -133,18 +120,18 @@ class HandshakeManager : public RefCounted<HandshakeManager> { grpc_iomgr_cb_func on_handshake_done, void* user_data); private: - bool CallNextHandshakerLocked(grpc_error* error); + bool CallNextHandshakerLocked(grpc_error_handle error); // A function used as the handshaker-done callback when chaining // handshakers together. - static void CallNextHandshakerFn(void* arg, grpc_error* error); + static void CallNextHandshakerFn(void* arg, grpc_error_handle error); // Callback invoked when deadline is exceeded. - static void OnTimeoutFn(void* arg, grpc_error* error); + static void OnTimeoutFn(void* arg, grpc_error_handle error); static const size_t HANDSHAKERS_INIT_SIZE = 2; - gpr_mu mu_; + Mutex mu_; bool is_shutdown_ = false; // An array of handshakers added via grpc_handshake_manager_add(). absl::InlinedVector<RefCountedPtr<Handshaker>, HANDSHAKERS_INIT_SIZE> @@ -161,10 +148,6 @@ class HandshakeManager : public RefCounted<HandshakeManager> { grpc_closure on_handshake_done_; // Handshaker args. HandshakerArgs args_; - // Links to the previous and next managers in a list of all pending handshakes - // Used at server side only. - HandshakeManager* prev_ = nullptr; - HandshakeManager* next_ = nullptr; }; } // namespace grpc_core diff --git a/grpc/src/core/lib/channel/status_util.cc b/grpc/src/core/lib/channel/status_util.cc index 39f310a1..0c60030d 100644 --- a/grpc/src/core/lib/channel/status_util.cc +++ b/grpc/src/core/lib/channel/status_util.cc @@ -75,8 +75,6 @@ const char* grpc_status_code_to_string(grpc_status_code status) { return "ALREADY_EXISTS"; case GRPC_STATUS_PERMISSION_DENIED: return "PERMISSION_DENIED"; - case GRPC_STATUS_UNAUTHENTICATED: - return "UNAUTHENTICATED"; case GRPC_STATUS_RESOURCE_EXHAUSTED: return "RESOURCE_EXHAUSTED"; case GRPC_STATUS_FAILED_PRECONDITION: @@ -93,7 +91,19 @@ const char* grpc_status_code_to_string(grpc_status_code status) { return "UNAVAILABLE"; case GRPC_STATUS_DATA_LOSS: return "DATA_LOSS"; + case GRPC_STATUS_UNAUTHENTICATED: + return "UNAUTHENTICATED"; default: return "UNKNOWN"; } } + +bool grpc_status_code_from_int(int status_int, grpc_status_code* status) { + // The range of status code enum is [0, 16], 0 is OK, 16 is UNAUTHENTICATED. + if (status_int < GRPC_STATUS_OK || status_int > GRPC_STATUS_UNAUTHENTICATED) { + *status = GRPC_STATUS_UNKNOWN; + return false; + } + *status = static_cast<grpc_status_code>(status_int); + return true; +} diff --git a/grpc/src/core/lib/channel/status_util.h b/grpc/src/core/lib/channel/status_util.h index 5409de6b..969033ad 100644 --- a/grpc/src/core/lib/channel/status_util.h +++ b/grpc/src/core/lib/channel/status_util.h @@ -34,6 +34,11 @@ bool grpc_status_code_from_string(const char* status_str, /// Returns the string form of \a status, or "UNKNOWN" if invalid. const char* grpc_status_code_to_string(grpc_status_code status); +// Converts an int to grpc_status_code. If the int is not a valid status code, +// sets the code to GRPC_STATUS_UNKNOWN and returns false. Otherwise, returns +// true. +bool grpc_status_code_from_int(int status_int, grpc_status_code* status); + namespace grpc_core { namespace internal { diff --git a/grpc/src/core/lib/event_engine/slice_allocator.cc b/grpc/src/core/lib/event_engine/slice_allocator.cc new file mode 100644 index 00000000..3ea615ac --- /dev/null +++ b/grpc/src/core/lib/event_engine/slice_allocator.cc @@ -0,0 +1,59 @@ +// Copyright 2021 The 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 "grpc/event_engine/slice_allocator.h" + +#include <functional> + +#include "absl/status/status.h" + +#include "src/core/lib/iomgr/resource_quota.h" + +namespace grpc_event_engine { +namespace experimental { + +SliceAllocator::SliceAllocator(grpc_resource_user* user) + : resource_user_(user) { + grpc_resource_user_ref(resource_user_); +}; + +SliceAllocator::~SliceAllocator() { grpc_resource_user_unref(resource_user_); }; + +absl::Status SliceAllocator::Allocate(size_t size, SliceBuffer* dest, + SliceAllocator::AllocateCallback cb) { + // TODO(hork): implement + (void)size; + (void)dest; + (void)cb; + return absl::OkStatus(); +}; + +SliceAllocatorFactory::SliceAllocatorFactory(grpc_resource_quota* quota) + : resource_quota_(quota) { + grpc_resource_quota_ref_internal(resource_quota_); +}; + +SliceAllocatorFactory::~SliceAllocatorFactory() { + grpc_resource_quota_unref_internal(resource_quota_); +} + +SliceAllocator SliceAllocatorFactory::CreateSliceAllocator( + absl::string_view peer_name) { + return SliceAllocator( + grpc_resource_user_create(resource_quota_, peer_name.data())); +} + +} // namespace experimental +} // namespace grpc_event_engine diff --git a/grpc/src/core/lib/event_engine/sockaddr.cc b/grpc/src/core/lib/event_engine/sockaddr.cc new file mode 100644 index 00000000..811d3519 --- /dev/null +++ b/grpc/src/core/lib/event_engine/sockaddr.cc @@ -0,0 +1,38 @@ +// Copyright 2021 The 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 <string.h> + +#include "grpc/event_engine/event_engine.h" +#include "grpc/event_engine/port.h" +#include "grpc/support/log.h" + +namespace grpc_event_engine { +namespace experimental { + +EventEngine::ResolvedAddress::ResolvedAddress(const sockaddr* address, + socklen_t size) { + GPR_ASSERT(size <= sizeof(address_)); + memcpy(&address_, address, size); +} + +const struct sockaddr* EventEngine::ResolvedAddress::address() const { + return reinterpret_cast<const struct sockaddr*>(address_); +} + +socklen_t EventEngine::ResolvedAddress::size() const { return size_; } + +} // namespace experimental +} // namespace grpc_event_engine diff --git a/grpc/src/core/lib/gpr/log.cc b/grpc/src/core/lib/gpr/log.cc index 9a5a54f6..9400f7c4 100644 --- a/grpc/src/core/lib/gpr/log.cc +++ b/grpc/src/core/lib/gpr/log.cc @@ -28,7 +28,12 @@ #include <stdio.h> #include <string.h> -GPR_GLOBAL_CONFIG_DEFINE_STRING(grpc_verbosity, "ERROR", +#ifndef GPR_DEFAULT_LOG_VERBOSITY_STRING +#define GPR_DEFAULT_LOG_VERBOSITY_STRING "ERROR" +#endif // !GPR_DEFAULT_LOG_VERBOSITY_STRING + +GPR_GLOBAL_CONFIG_DEFINE_STRING(grpc_verbosity, + GPR_DEFAULT_LOG_VERBOSITY_STRING, "Default gRPC logging verbosity") GPR_GLOBAL_CONFIG_DEFINE_STRING(grpc_stacktrace_minloglevel, "", "Messages logged at the same or higher level " diff --git a/grpc/src/core/lib/gpr/sync_abseil.cc b/grpc/src/core/lib/gpr/sync_abseil.cc index 56b1cc7b..0da9caa9 100644 --- a/grpc/src/core/lib/gpr/sync_abseil.cc +++ b/grpc/src/core/lib/gpr/sync_abseil.cc @@ -62,8 +62,7 @@ void gpr_mu_unlock(gpr_mu* mu) ABSL_NO_THREAD_SAFETY_ANALYSIS { int gpr_mu_trylock(gpr_mu* mu) { GPR_TIMER_SCOPE("gpr_mu_trylock", 0); - int ret = reinterpret_cast<absl::Mutex*>(mu)->TryLock() == true; - return ret; + return reinterpret_cast<absl::Mutex*>(mu)->TryLock(); } /*----------------------------------------*/ @@ -89,10 +88,8 @@ int gpr_cv_wait(gpr_cv* cv, gpr_mu* mu, gpr_timespec abs_deadline) { abs_deadline = gpr_convert_clock_type(abs_deadline, GPR_CLOCK_REALTIME); timespec ts = {static_cast<decltype(ts.tv_sec)>(abs_deadline.tv_sec), static_cast<decltype(ts.tv_nsec)>(abs_deadline.tv_nsec)}; - int ret = reinterpret_cast<absl::CondVar*>(cv)->WaitWithDeadline( - reinterpret_cast<absl::Mutex*>(mu), - absl::TimeFromTimespec(ts)) == true; - return ret; + return reinterpret_cast<absl::CondVar*>(cv)->WaitWithDeadline( + reinterpret_cast<absl::Mutex*>(mu), absl::TimeFromTimespec(ts)); } void gpr_cv_signal(gpr_cv* cv) { diff --git a/grpc/src/core/lib/gpr/sync_windows.cc b/grpc/src/core/lib/gpr/sync_windows.cc index 64eec7c2..a6173c72 100644 --- a/grpc/src/core/lib/gpr/sync_windows.cc +++ b/grpc/src/core/lib/gpr/sync_windows.cc @@ -100,7 +100,7 @@ void gpr_cv_broadcast(gpr_cv* cv) { WakeAllConditionVariable(cv); } /*----------------------------------------*/ -static void* dummy; +static void* phony; struct run_once_func_arg { void (*init_function)(void); }; @@ -113,7 +113,7 @@ static BOOL CALLBACK run_once_func(gpr_once* once, void* v, void** pv) { void gpr_once_init(gpr_once* once, void (*init_function)(void)) { struct run_once_func_arg arg; arg.init_function = init_function; - InitOnceExecuteOnce(once, run_once_func, &arg, &dummy); + InitOnceExecuteOnce(once, run_once_func, &arg, &phony); } #endif /* defined(GPR_WINDOWS) && !defined(GPR_ABSEIL_SYNC) && \ diff --git a/grpc/src/core/lib/gprpp/atomic.h b/grpc/src/core/lib/gprpp/atomic.h index 4a53d2cf..dd99d9ed 100644 --- a/grpc/src/core/lib/gprpp/atomic.h +++ b/grpc/src/core/lib/gprpp/atomic.h @@ -81,8 +81,8 @@ class Atomic { // Atomically increment a counter only if the counter value is not zero. // Returns true if increment took place; false if counter is zero. - bool IncrementIfNonzero(MemoryOrder load_order = MemoryOrder::ACQUIRE) { - T count = storage_.load(static_cast<std::memory_order>(load_order)); + bool IncrementIfNonzero() { + T count = storage_.load(std::memory_order_acquire); do { // If zero, we are done (without an increment). If not, we must do a CAS // to maintain the contract: do not increment the counter if it is already @@ -91,7 +91,7 @@ class Atomic { return false; } } while (!CompareExchangeWeak(&count, count + 1, MemoryOrder::ACQ_REL, - load_order)); + MemoryOrder::ACQUIRE)); return true; } diff --git a/grpc/src/core/lib/gprpp/dual_ref_counted.h b/grpc/src/core/lib/gprpp/dual_ref_counted.h index 91469eaf..5217bfa1 100644 --- a/grpc/src/core/lib/gprpp/dual_ref_counted.h +++ b/grpc/src/core/lib/gprpp/dual_ref_counted.h @@ -170,8 +170,8 @@ class DualRefCounted : public Orphanable { #endif const uint64_t prev_ref_pair = refs_.FetchSub(MakeRefPair(0, 1), MemoryOrder::ACQ_REL); - const uint32_t weak_refs = GetWeakRefs(prev_ref_pair); #ifndef NDEBUG + const uint32_t weak_refs = GetWeakRefs(prev_ref_pair); const uint32_t strong_refs = GetStrongRefs(prev_ref_pair); if (trace != nullptr) { gpr_log(GPR_INFO, "%s:%p weak_unref %d -> %d (refs=%d)", trace, this, @@ -192,10 +192,10 @@ class DualRefCounted : public Orphanable { #endif const uint64_t prev_ref_pair = refs_.FetchSub(MakeRefPair(0, 1), MemoryOrder::ACQ_REL); - const uint32_t weak_refs = GetWeakRefs(prev_ref_pair); #ifndef NDEBUG + const uint32_t weak_refs = GetWeakRefs(prev_ref_pair); const uint32_t strong_refs = GetStrongRefs(prev_ref_pair); - if (trace_ != nullptr) { + if (trace != nullptr) { gpr_log(GPR_INFO, "%s:%p %s:%d weak_unref %d -> %d (refs=%d) %s", trace, this, location.file(), location.line(), weak_refs, weak_refs - 1, strong_refs, reason); diff --git a/grpc/src/core/lib/gprpp/mpscq.cc b/grpc/src/core/lib/gprpp/mpscq.cc index 2bf9981e..373ec09f 100644 --- a/grpc/src/core/lib/gprpp/mpscq.cc +++ b/grpc/src/core/lib/gprpp/mpscq.cc @@ -86,9 +86,9 @@ bool LockedMultiProducerSingleConsumerQueue::Push(Node* node) { LockedMultiProducerSingleConsumerQueue::Node* LockedMultiProducerSingleConsumerQueue::TryPop() { - if (gpr_mu_trylock(mu_.get())) { + if (mu_.TryLock()) { Node* node = queue_.Pop(); - gpr_mu_unlock(mu_.get()); + mu_.Unlock(); return node; } return nullptr; diff --git a/grpc/src/core/lib/gprpp/ref_counted.h b/grpc/src/core/lib/gprpp/ref_counted.h index 64f3f8fc..a8def8c9 100644 --- a/grpc/src/core/lib/gprpp/ref_counted.h +++ b/grpc/src/core/lib/gprpp/ref_counted.h @@ -215,31 +215,45 @@ class NonPolymorphicRefCount { ~NonPolymorphicRefCount() = default; }; +// Behavior of RefCounted<> upon ref count reaching 0. +enum UnrefBehavior { + // Default behavior: Delete the object. + kUnrefDelete, + // Do not delete the object upon unref. This is useful in cases where all + // existing objects must be tracked in a registry but the object's entry in + // the registry cannot be removed from the object's dtor due to + // synchronization issues. In this case, the registry can be cleaned up + // later by identifying entries for which RefIfNonZero() returns null. + kUnrefNoDelete, + // Call the object's dtor but do not delete it. This is useful for cases + // where the object is stored in memory allocated elsewhere (e.g., the call + // arena). + kUnrefCallDtor, +}; + namespace internal { -template <typename T, bool DoDelete> +template <typename T, UnrefBehavior UnrefBehaviorArg> class Delete; template <typename T> -class Delete<T, true> { +class Delete<T, kUnrefDelete> { public: explicit Delete(T* t) { delete t; } }; template <typename T> -class Delete<T, false> { +class Delete<T, kUnrefNoDelete> { + public: + explicit Delete(T* /*t*/) {} +}; +template <typename T> +class Delete<T, kUnrefCallDtor> { public: - explicit Delete(T* t) {} + explicit Delete(T* t) { t->~T(); } }; } // namespace internal // A base class for reference-counted objects. // New objects should be created via new and start with a refcount of 1. -// When the refcount reaches 0, the object will be deleted via delete. -// -// If DeleteUponUnref is false, deletion will not occur when the ref -// count reaches 0. This is useful in cases where all existing objects -// must be tracked in a registry but the object's entry in the registry -// cannot be removed from the object's dtor due to synchronization issues. -// In this case, the registry can be cleaned up later by identifying -// entries for which RefIfNonZero() returns null. +// When the refcount reaches 0, executes the specified UnrefBehavior. // // This will commonly be used by CRTP (curiously-recurring template pattern) // e.g., class MyClass : public RefCounted<MyClass> @@ -264,7 +278,7 @@ class Delete<T, false> { // ch->Unref(); // template <typename Child, typename Impl = PolymorphicRefCount, - bool DeleteUponUnref = true> + UnrefBehavior UnrefBehaviorArg = kUnrefDelete> class RefCounted : public Impl { public: // Note: Depending on the Impl used, this dtor can be implicitly virtual. @@ -287,12 +301,12 @@ class RefCounted : public Impl { // friend of this class. void Unref() { if (GPR_UNLIKELY(refs_.Unref())) { - internal::Delete<Child, DeleteUponUnref>(static_cast<Child*>(this)); + internal::Delete<Child, UnrefBehaviorArg>(static_cast<Child*>(this)); } } void Unref(const DebugLocation& location, const char* reason) { if (GPR_UNLIKELY(refs_.Unref(location, reason))) { - internal::Delete<Child, DeleteUponUnref>(static_cast<Child*>(this)); + internal::Delete<Child, UnrefBehaviorArg>(static_cast<Child*>(this)); } } diff --git a/grpc/src/core/lib/gprpp/ref_counted_ptr.h b/grpc/src/core/lib/gprpp/ref_counted_ptr.h index fd3bfbda..4ee1b950 100644 --- a/grpc/src/core/lib/gprpp/ref_counted_ptr.h +++ b/grpc/src/core/lib/gprpp/ref_counted_ptr.h @@ -83,6 +83,7 @@ class RefCountedPtr { } // Copy assignment. + // NOLINTNEXTLINE(bugprone-unhandled-self-assignment) RefCountedPtr& operator=(const RefCountedPtr& other) { // Note: Order of reffing and unreffing is important here in case value_ // and other.value_ are the same object. @@ -235,6 +236,7 @@ class WeakRefCountedPtr { } // Copy assignment. + // NOLINTNEXTLINE(bugprone-unhandled-self-assignment) WeakRefCountedPtr& operator=(const WeakRefCountedPtr& other) { // Note: Order of reffing and unreffing is important here in case value_ // and other.value_ are the same object. diff --git a/grpc/src/core/lib/gprpp/status_helper.cc b/grpc/src/core/lib/gprpp/status_helper.cc new file mode 100644 index 00000000..8266e167 --- /dev/null +++ b/grpc/src/core/lib/gprpp/status_helper.cc @@ -0,0 +1,407 @@ +// +// +// Copyright 2021 the 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/lib/gprpp/status_helper.h" +#include "src/core/lib/gprpp/time_util.h" + +#include <grpc/support/log.h> + +#include "absl/strings/cord.h" +#include "absl/strings/escaping.h" +#include "absl/strings/match.h" +#include "absl/strings/str_format.h" +#include "absl/strings/str_join.h" +#include "absl/time/clock.h" + +#include "google/protobuf/any.upb.h" +#include "google/rpc/status.upb.h" +#include "upb/upb.hpp" + +namespace grpc_core { + +namespace { + +#define TYPE_URL_PREFIX "type.googleapis.com/grpc.status." +#define TYPE_INT_TAG "int." +#define TYPE_STR_TAG "str." +#define TYPE_TIME_TAG "time." +#define TYPE_CHILDREN_TAG "children" +#define TYPE_URL(name) (TYPE_URL_PREFIX name) +const absl::string_view kTypeUrlPrefix = TYPE_URL_PREFIX; +const absl::string_view kTypeIntTag = TYPE_INT_TAG; +const absl::string_view kTypeStrTag = TYPE_STR_TAG; +const absl::string_view kTypeTimeTag = TYPE_TIME_TAG; +const absl::string_view kTypeChildrenTag = TYPE_CHILDREN_TAG; +const absl::string_view kChildrenPropertyUrl = TYPE_URL(TYPE_CHILDREN_TAG); + +const char* GetStatusIntPropertyUrl(StatusIntProperty key) { + switch (key) { + case StatusIntProperty::kErrorNo: + return TYPE_URL(TYPE_INT_TAG "errno"); + case StatusIntProperty::kFileLine: + return TYPE_URL(TYPE_INT_TAG "file_line"); + case StatusIntProperty::kStreamId: + return TYPE_URL(TYPE_INT_TAG "stream_id"); + case StatusIntProperty::kRpcStatus: + return TYPE_URL(TYPE_INT_TAG "grpc_status"); + case StatusIntProperty::kOffset: + return TYPE_URL(TYPE_INT_TAG "offset"); + case StatusIntProperty::kIndex: + return TYPE_URL(TYPE_INT_TAG "index"); + case StatusIntProperty::kSize: + return TYPE_URL(TYPE_INT_TAG "size"); + case StatusIntProperty::kHttp2Error: + return TYPE_URL(TYPE_INT_TAG "http2_error"); + case StatusIntProperty::kTsiCode: + return TYPE_URL(TYPE_INT_TAG "tsi_code"); + case StatusIntProperty::kWsaError: + return TYPE_URL(TYPE_INT_TAG "wsa_error"); + case StatusIntProperty::kFd: + return TYPE_URL(TYPE_INT_TAG "fd"); + case StatusIntProperty::kHttpStatus: + return TYPE_URL(TYPE_INT_TAG "http_status"); + case StatusIntProperty::kOccurredDuringWrite: + return TYPE_URL(TYPE_INT_TAG "occurred_during_write"); + case StatusIntProperty::ChannelConnectivityState: + return TYPE_URL(TYPE_INT_TAG "channel_connectivity_state"); + case StatusIntProperty::kLbPolicyDrop: + return TYPE_URL(TYPE_INT_TAG "lb_policy_drop"); + } + GPR_UNREACHABLE_CODE(return "unknown"); +} + +const char* GetStatusStrPropertyUrl(StatusStrProperty key) { + switch (key) { + case StatusStrProperty::kDescription: + return TYPE_URL(TYPE_STR_TAG "description"); + case StatusStrProperty::kFile: + return TYPE_URL(TYPE_STR_TAG "file"); + case StatusStrProperty::kOsError: + return TYPE_URL(TYPE_STR_TAG "os_error"); + case StatusStrProperty::kSyscall: + return TYPE_URL(TYPE_STR_TAG "syscall"); + case StatusStrProperty::kTargetAddress: + return TYPE_URL(TYPE_STR_TAG "target_address"); + case StatusStrProperty::kGrpcMessage: + return TYPE_URL(TYPE_STR_TAG "grpc_message"); + case StatusStrProperty::kRawBytes: + return TYPE_URL(TYPE_STR_TAG "raw_bytes"); + case StatusStrProperty::kTsiError: + return TYPE_URL(TYPE_STR_TAG "tsi_error"); + case StatusStrProperty::kFilename: + return TYPE_URL(TYPE_STR_TAG "filename"); + case StatusStrProperty::kKey: + return TYPE_URL(TYPE_STR_TAG "key"); + case StatusStrProperty::kValue: + return TYPE_URL(TYPE_STR_TAG "value"); + } + GPR_UNREACHABLE_CODE(return "unknown"); +} + +const char* GetStatusTimePropertyUrl(StatusTimeProperty key) { + switch (key) { + case StatusTimeProperty::kCreated: + return TYPE_URL(TYPE_TIME_TAG "created_time"); + } + GPR_UNREACHABLE_CODE(return "unknown"); +} + +void EncodeUInt32ToBytes(uint32_t v, char* buf) { + buf[0] = v & 0xFF; + buf[1] = (v >> 8) & 0xFF; + buf[2] = (v >> 16) & 0xFF; + buf[3] = (v >> 24) & 0xFF; +} + +uint32_t DecodeUInt32FromBytes(const char* buf) { + return buf[0] | (uint32_t(buf[1]) << 8) | (uint32_t(buf[2]) << 16) | + (uint32_t(buf[3]) << 24); +} + +std::vector<absl::Status> ParseChildren(absl::Cord children) { + std::vector<absl::Status> result; + upb::Arena arena; + // Cord is flattened to iterate the buffer easily at the cost of memory copy. + // TODO(veblush): Optimize this once CordReader is introduced. + absl::string_view buf = children.Flatten(); + size_t cur = 0; + while (buf.size() - cur >= sizeof(uint32_t)) { + size_t msg_size = DecodeUInt32FromBytes(buf.data() + cur); + cur += sizeof(uint32_t); + GPR_ASSERT(buf.size() - cur >= msg_size); + google_rpc_Status* msg = + google_rpc_Status_parse(buf.data() + cur, msg_size, arena.ptr()); + cur += msg_size; + result.push_back(internal::StatusFromProto(msg)); + } + return result; +} + +} // namespace + +absl::Status StatusCreate(absl::StatusCode code, absl::string_view msg, + const DebugLocation& location, + std::initializer_list<absl::Status> children) { + absl::Status s(code, msg); + if (location.file() != nullptr) { + StatusSetStr(&s, StatusStrProperty::kFile, location.file()); + } + if (location.line() != -1) { + StatusSetInt(&s, StatusIntProperty::kFileLine, location.line()); + } + StatusSetTime(&s, StatusTimeProperty::kCreated, absl::Now()); + for (const absl::Status& child : children) { + if (!child.ok()) { + StatusAddChild(&s, child); + } + } + return s; +} + +void StatusSetInt(absl::Status* status, StatusIntProperty key, intptr_t value) { + status->SetPayload(GetStatusIntPropertyUrl(key), + absl::Cord(std::to_string(value))); +} + +absl::optional<intptr_t> StatusGetInt(const absl::Status& status, + StatusIntProperty key) { + absl::optional<absl::Cord> p = + status.GetPayload(GetStatusIntPropertyUrl(key)); + if (p.has_value()) { + absl::optional<absl::string_view> sv = p->TryFlat(); + intptr_t value; + if (sv.has_value()) { + if (absl::SimpleAtoi(*sv, &value)) { + return value; + } + } else { + if (absl::SimpleAtoi(std::string(*p), &value)) { + return value; + } + } + } + return {}; +} + +void StatusSetStr(absl::Status* status, StatusStrProperty key, + absl::string_view value) { + status->SetPayload(GetStatusStrPropertyUrl(key), absl::Cord(value)); +} + +absl::optional<std::string> StatusGetStr(const absl::Status& status, + StatusStrProperty key) { + absl::optional<absl::Cord> p = + status.GetPayload(GetStatusStrPropertyUrl(key)); + if (p.has_value()) { + return std::string(*p); + } + return {}; +} + +void StatusSetTime(absl::Status* status, StatusTimeProperty key, + absl::Time time) { + status->SetPayload(GetStatusTimePropertyUrl(key), + absl::Cord(absl::string_view( + reinterpret_cast<const char*>(&time), sizeof(time)))); +} + +absl::optional<absl::Time> StatusGetTime(const absl::Status& status, + StatusTimeProperty key) { + absl::optional<absl::Cord> p = + status.GetPayload(GetStatusTimePropertyUrl(key)); + if (p.has_value()) { + absl::optional<absl::string_view> sv = p->TryFlat(); + if (sv.has_value()) { + return *reinterpret_cast<const absl::Time*>(sv->data()); + } else { + std::string s = std::string(*p); + return *reinterpret_cast<const absl::Time*>(s.c_str()); + } + } + return {}; +} + +void StatusAddChild(absl::Status* status, absl::Status child) { + upb::Arena arena; + // Serialize msg to buf + google_rpc_Status* msg = internal::StatusToProto(child, arena.ptr()); + size_t buf_len = 0; + char* buf = google_rpc_Status_serialize(msg, arena.ptr(), &buf_len); + // Append (msg-length and msg) to children payload + absl::optional<absl::Cord> old_children = + status->GetPayload(kChildrenPropertyUrl); + absl::Cord children; + if (old_children.has_value()) { + children = *old_children; + } + char head_buf[sizeof(uint32_t)]; + EncodeUInt32ToBytes(buf_len, head_buf); + children.Append(absl::string_view(head_buf, sizeof(uint32_t))); + children.Append(absl::string_view(buf, buf_len)); + status->SetPayload(kChildrenPropertyUrl, std::move(children)); +} + +std::vector<absl::Status> StatusGetChildren(absl::Status status) { + absl::optional<absl::Cord> children = status.GetPayload(kChildrenPropertyUrl); + return children.has_value() ? ParseChildren(*children) + : std::vector<absl::Status>(); +} + +std::string StatusToString(const absl::Status& status) { + if (status.ok()) { + return "OK"; + } + std::string head; + absl::StrAppend(&head, absl::StatusCodeToString(status.code())); + if (!status.message().empty()) { + absl::StrAppend(&head, ":", status.message()); + } + std::vector<std::string> kvs; + absl::optional<absl::Cord> children; + status.ForEachPayload([&](absl::string_view type_url, + const absl::Cord& payload) { + if (absl::StartsWith(type_url, kTypeUrlPrefix)) { + type_url.remove_prefix(kTypeUrlPrefix.size()); + if (type_url == kTypeChildrenTag) { + children = payload; + return; + } + absl::string_view payload_view; + std::string payload_storage; + if (payload.TryFlat().has_value()) { + payload_view = payload.TryFlat().value(); + } else { + payload_storage = std::string(payload); + payload_view = payload_storage; + } + if (absl::StartsWith(type_url, kTypeIntTag)) { + type_url.remove_prefix(kTypeIntTag.size()); + kvs.push_back(absl::StrCat(type_url, ":", payload_view)); + } else if (absl::StartsWith(type_url, kTypeStrTag)) { + type_url.remove_prefix(kTypeStrTag.size()); + kvs.push_back(absl::StrCat(type_url, ":\"", + absl::CHexEscape(payload_view), "\"")); + } else if (absl::StartsWith(type_url, kTypeTimeTag)) { + type_url.remove_prefix(kTypeTimeTag.size()); + absl::Time t = + *reinterpret_cast<const absl::Time*>(payload_view.data()); + kvs.push_back(absl::StrCat(type_url, ":\"", absl::FormatTime(t), "\"")); + } else { + kvs.push_back(absl::StrCat(type_url, ":\"", + absl::CHexEscape(payload_view), "\"")); + } + } else { + absl::optional<absl::string_view> payload_view = payload.TryFlat(); + std::string payload_str = absl::CHexEscape( + payload_view.has_value() ? *payload_view : std::string(payload)); + kvs.push_back(absl::StrCat(type_url, ":\"", payload_str, "\"")); + } + }); + if (children.has_value()) { + std::vector<absl::Status> children_status = ParseChildren(*children); + std::vector<std::string> children_text; + children_text.reserve(children_status.size()); + for (const absl::Status& child_status : children_status) { + children_text.push_back(StatusToString(child_status)); + } + kvs.push_back( + absl::StrCat("children:[", absl::StrJoin(children_text, ", "), "]")); + } + return kvs.empty() ? head + : absl::StrCat(head, " {", absl::StrJoin(kvs, ", "), "}"); +} + +namespace internal { + +google_rpc_Status* StatusToProto(absl::Status status, upb_arena* arena) { + google_rpc_Status* msg = google_rpc_Status_new(arena); + google_rpc_Status_set_code(msg, int32_t(status.code())); + google_rpc_Status_set_message( + msg, upb_strview_make(status.message().data(), status.message().size())); + status.ForEachPayload([&](absl::string_view type_url, + const absl::Cord& payload) { + google_protobuf_Any* any = google_rpc_Status_add_details(msg, arena); + char* type_url_buf = + reinterpret_cast<char*>(upb_arena_malloc(arena, type_url.size())); + memcpy(type_url_buf, type_url.data(), type_url.size()); + google_protobuf_Any_set_type_url( + any, upb_strview_make(type_url_buf, type_url.size())); + absl::optional<absl::string_view> v_view = payload.TryFlat(); + if (v_view.has_value()) { + google_protobuf_Any_set_value( + any, upb_strview_make(v_view->data(), v_view->size())); + } else { + char* buf = + reinterpret_cast<char*>(upb_arena_malloc(arena, payload.size())); + char* cur = buf; + for (absl::string_view chunk : payload.Chunks()) { + memcpy(cur, chunk.data(), chunk.size()); + cur += chunk.size(); + } + google_protobuf_Any_set_value(any, upb_strview_make(buf, payload.size())); + } + }); + return msg; +} + +absl::Status StatusFromProto(google_rpc_Status* msg) { + int32_t code = google_rpc_Status_code(msg); + upb_strview message = google_rpc_Status_message(msg); + absl::Status status(static_cast<absl::StatusCode>(code), + absl::string_view(message.data, message.size)); + size_t detail_len; + const google_protobuf_Any* const* details = + google_rpc_Status_details(msg, &detail_len); + for (size_t i = 0; i < detail_len; i++) { + upb_strview type_url = google_protobuf_Any_type_url(details[i]); + upb_strview value = google_protobuf_Any_value(details[i]); + status.SetPayload(absl::string_view(type_url.data, type_url.size), + absl::Cord(absl::string_view(value.data, value.size))); + } + return status; +} + +uintptr_t StatusAllocPtr(absl::Status s) { + // This relies the fact that absl::Status has only one member, StatusRep* + // so the sizeof(absl::Status) has the same size of intptr_t and StatusRep* + // can be stolen using placement allocation. + static_assert(sizeof(intptr_t) == sizeof(absl::Status), + "absl::Status should be as big as intptr_t"); + // This does two things; + // 1. Copies StatusRep* of absl::Status to ptr + // 2. Increases the counter of StatusRep if it's not inlined + uintptr_t ptr; + new (&ptr) absl::Status(s); + return ptr; +} + +void StatusFreePtr(uintptr_t ptr) { + // Decreases the counter of StatusRep if it's not inlined. + reinterpret_cast<absl::Status*>(&ptr)->~Status(); +} + +absl::Status StatusGetFromPtr(uintptr_t ptr) { + // Constructs Status from ptr having the address of StatusRep. + return *reinterpret_cast<absl::Status*>(&ptr); +} + +} // namespace internal + +} // namespace grpc_core diff --git a/grpc/src/core/lib/gprpp/status_helper.h b/grpc/src/core/lib/gprpp/status_helper.h new file mode 100644 index 00000000..50bcdffe --- /dev/null +++ b/grpc/src/core/lib/gprpp/status_helper.h @@ -0,0 +1,180 @@ +// +// +// Copyright 2021 the 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_GPRPP_STATUS_HELPER_H +#define GRPC_CORE_LIB_GPRPP_STATUS_HELPER_H + +#include <grpc/support/port_platform.h> + +#include "absl/status/status.h" +#include "absl/time/time.h" + +#include "src/core/lib/gprpp/debug_location.h" + +extern "C" { +struct google_rpc_Status; +struct upb_arena; +} + +namespace grpc_core { + +/// This enum should have the same value of grpc_error_ints +// TODO(veblush): Use camel-case names once migration to absl::Status is done. +enum class StatusIntProperty { + /// 'errno' from the operating system + kErrorNo, + /// __LINE__ from the call site creating the error + kFileLine, + /// stream identifier: for errors that are associated with an individual + /// wire stream + kStreamId, + /// grpc status code representing this error + // TODO(veblush): Remove this after grpc_error is replaced with absl::Status + kRpcStatus, + /// offset into some binary blob (usually represented by + /// RAW_BYTES) where the error occurred + kOffset, + /// context sensitive index associated with the error + kIndex, + /// context sensitive size associated with the error + kSize, + /// http2 error code associated with the error (see the HTTP2 RFC) + kHttp2Error, + /// TSI status code associated with the error + kTsiCode, + /// WSAGetLastError() reported when this error occurred + kWsaError, + /// File descriptor associated with this error + kFd, + /// HTTP status (i.e. 404) + kHttpStatus, + /// chttp2: did the error occur while a write was in progress + kOccurredDuringWrite, + /// channel connectivity state associated with the error + ChannelConnectivityState, + /// LB policy drop + kLbPolicyDrop, +}; + +/// This enum should have the same value of grpc_error_strs +// TODO(veblush): Use camel-case names once migration to absl::Status is done. +enum class StatusStrProperty { + /// top-level textual description of this error + kDescription, + /// source file in which this error occurred + kFile, + /// operating system description of this error + kOsError, + /// syscall that generated this error + kSyscall, + /// peer that we were trying to communicate when this error occurred + kTargetAddress, + /// grpc status message associated with this error + kGrpcMessage, + /// hex dump (or similar) with the data that generated this error + kRawBytes, + /// tsi error string associated with this error + kTsiError, + /// filename that we were trying to read/write when this error occurred + kFilename, + /// key associated with the error + kKey, + /// value associated with the error + kValue, +}; + +/// This enum should have the same value of grpc_error_times +enum class StatusTimeProperty { + /// timestamp of error creation + kCreated, +}; + +/// Creates a status with given additional information +absl::Status StatusCreate( + absl::StatusCode code, absl::string_view msg, const DebugLocation& location, + std::initializer_list<absl::Status> children) GRPC_MUST_USE_RESULT; + +/// Sets the int property to the status +void StatusSetInt(absl::Status* status, StatusIntProperty key, intptr_t value); + +/// Gets the int property from the status +absl::optional<intptr_t> StatusGetInt( + const absl::Status& status, StatusIntProperty key) GRPC_MUST_USE_RESULT; + +/// Sets the str property to the status +void StatusSetStr(absl::Status* status, StatusStrProperty key, + absl::string_view value); + +/// Gets the str property from the status +absl::optional<std::string> StatusGetStr( + const absl::Status& status, StatusStrProperty key) GRPC_MUST_USE_RESULT; + +/// Sets the time property to the status +void StatusSetTime(absl::Status* status, StatusTimeProperty key, + absl::Time time); + +/// Gets the time property from the status +absl::optional<absl::Time> StatusGetTime( + const absl::Status& status, StatusTimeProperty key) GRPC_MUST_USE_RESULT; + +/// Adds a child status to status +void StatusAddChild(absl::Status* status, absl::Status child); + +/// Returns all children status from a status +std::vector<absl::Status> StatusGetChildren(absl::Status status) + GRPC_MUST_USE_RESULT; + +/// Returns a string representation from status +/// Error status will be like +/// STATUS[:MESSAGE] [{PAYLOADS[, children:[CHILDREN-STATUS-LISTS]]}] +/// e.g. +/// CANCELLATION:SampleMessage {errno:'2021', line:'54', children:[ABORTED]} +std::string StatusToString(const absl::Status& status) GRPC_MUST_USE_RESULT; + +namespace internal { + +/// Builds a upb message, google_rpc_Status from a status +/// This is for internal implementation & test only +google_rpc_Status* StatusToProto(absl::Status status, + upb_arena* arena) GRPC_MUST_USE_RESULT; + +/// Builds a status from a upb message, google_rpc_Status +/// This is for internal implementation & test only +absl::Status StatusFromProto(google_rpc_Status* msg) GRPC_MUST_USE_RESULT; + +/// The same value of grpc_core::internal::StatusAllocPtr(absl::OkStatus()) +static constexpr uintptr_t kOkStatusPtr = 0; + +/// Returns ptr where the given status is copied into. +/// This ptr can be used to get Status later and should be freed by +/// StatusFreePtr. This shouldn't be used except migration purpose. +uintptr_t StatusAllocPtr(absl::Status s); + +/// Frees the allocated status at ptr. +/// This shouldn't be used except migration purpose. +void StatusFreePtr(uintptr_t ptr); + +/// Get the status from ptr. +/// This shouldn't be used except migration purpose. +absl::Status StatusGetFromPtr(uintptr_t ptr); + +} // namespace internal + +} // namespace grpc_core + +#endif // GRPC_CORE_LIB_GPRPP_STATUS_HELPER_H diff --git a/grpc/src/core/lib/gprpp/sync.h b/grpc/src/core/lib/gprpp/sync.h index 0a911b1c..f385883d 100644 --- a/grpc/src/core/lib/gprpp/sync.h +++ b/grpc/src/core/lib/gprpp/sync.h @@ -26,6 +26,9 @@ #include <grpc/support/sync.h> #include <grpc/support/time.h> +#include "absl/synchronization/mutex.h" +#include "src/core/lib/gprpp/time_util.h" + // The core library is not accessible in C++ codegen headers, and vice versa. // Thus, we need to have duplicate headers with similar functionality. // Make sure any change to this file is also reflected in @@ -37,7 +40,23 @@ namespace grpc_core { -class Mutex { +#ifdef GPR_ABSEIL_SYNC + +using Mutex = absl::Mutex; +using MutexLock = absl::MutexLock; +using ReleasableMutexLock = absl::ReleasableMutexLock; +using CondVar = absl::CondVar; + +// Returns the underlying gpr_mu from Mutex. This should be used only when +// it has to like passing the C++ mutex to C-core API. +// TODO(veblush): Remove this after C-core no longer uses gpr_mu. +inline gpr_mu* GetUnderlyingGprMu(Mutex* mutex) { + return reinterpret_cast<gpr_mu*>(mutex); +} + +#else + +class ABSL_LOCKABLE Mutex { public: Mutex() { gpr_mu_init(&mu_); } ~Mutex() { gpr_mu_destroy(&mu_); } @@ -45,52 +64,59 @@ class Mutex { Mutex(const Mutex&) = delete; Mutex& operator=(const Mutex&) = delete; - gpr_mu* get() { return &mu_; } - const gpr_mu* get() const { return &mu_; } + void Lock() ABSL_EXCLUSIVE_LOCK_FUNCTION() { gpr_mu_lock(&mu_); } + void Unlock() ABSL_UNLOCK_FUNCTION() { gpr_mu_unlock(&mu_); } + bool TryLock() ABSL_EXCLUSIVE_TRYLOCK_FUNCTION(true) { + return gpr_mu_trylock(&mu_) != 0; + } private: gpr_mu mu_; + + friend class CondVar; + friend gpr_mu* GetUnderlyingGprMu(Mutex* mutex); }; -// MutexLock is a std:: -class MutexLock { +// Returns the underlying gpr_mu from Mutex. This should be used only when +// it has to like passing the C++ mutex to C-core API. +// TODO(veblush): Remove this after C-core no longer uses gpr_mu. +inline gpr_mu* GetUnderlyingGprMu(Mutex* mutex) { return &mutex->mu_; } + +class ABSL_SCOPED_LOCKABLE MutexLock { public: - explicit MutexLock(Mutex* mu) : mu_(mu->get()) { gpr_mu_lock(mu_); } - explicit MutexLock(gpr_mu* mu) : mu_(mu) { gpr_mu_lock(mu_); } - ~MutexLock() { gpr_mu_unlock(mu_); } + explicit MutexLock(Mutex* mu) ABSL_EXCLUSIVE_LOCK_FUNCTION(mu) : mu_(mu) { + mu_->Lock(); + } + ~MutexLock() ABSL_UNLOCK_FUNCTION() { mu_->Unlock(); } MutexLock(const MutexLock&) = delete; MutexLock& operator=(const MutexLock&) = delete; private: - gpr_mu* const mu_; + Mutex* const mu_; }; -class ReleasableMutexLock { +class ABSL_SCOPED_LOCKABLE ReleasableMutexLock { public: - explicit ReleasableMutexLock(Mutex* mu) : mu_(mu->get()) { gpr_mu_lock(mu_); } - explicit ReleasableMutexLock(gpr_mu* mu) : mu_(mu) { gpr_mu_lock(mu_); } - ~ReleasableMutexLock() { - if (!released_) gpr_mu_unlock(mu_); + explicit ReleasableMutexLock(Mutex* mu) ABSL_EXCLUSIVE_LOCK_FUNCTION(mu) + : mu_(mu) { + mu_->Lock(); + } + ~ReleasableMutexLock() ABSL_UNLOCK_FUNCTION() { + if (!released_) mu_->Unlock(); } ReleasableMutexLock(const ReleasableMutexLock&) = delete; ReleasableMutexLock& operator=(const ReleasableMutexLock&) = delete; - void Lock() { - GPR_DEBUG_ASSERT(released_); - gpr_mu_lock(mu_); - released_ = false; - } - - void Unlock() { + void Release() ABSL_UNLOCK_FUNCTION() { GPR_DEBUG_ASSERT(!released_); released_ = true; - gpr_mu_unlock(mu_); + mu_->Unlock(); } private: - gpr_mu* const mu_; + Mutex* const mu_; bool released_ = false; }; @@ -103,31 +129,94 @@ class CondVar { CondVar& operator=(const CondVar&) = delete; void Signal() { gpr_cv_signal(&cv_); } - void Broadcast() { gpr_cv_broadcast(&cv_); } + void SignalAll() { gpr_cv_broadcast(&cv_); } + + void Wait(Mutex* mu) { WaitWithDeadline(mu, absl::InfiniteFuture()); } + bool WaitWithTimeout(Mutex* mu, absl::Duration timeout) { + return gpr_cv_wait(&cv_, &mu->mu_, ToGprTimeSpec(timeout)) != 0; + } + bool WaitWithDeadline(Mutex* mu, absl::Time deadline) { + return gpr_cv_wait(&cv_, &mu->mu_, ToGprTimeSpec(deadline)) != 0; + } + + private: + gpr_cv cv_; +}; + +#endif // GPR_ABSEIL_SYNC + +template <typename Predicate> +static void WaitUntil(CondVar* cv, Mutex* mu, Predicate pred) { + while (!pred()) { + cv->Wait(mu); + } +} + +// Returns true iff we timed-out +template <typename Predicate> +static bool WaitUntilWithTimeout(CondVar* cv, Mutex* mu, Predicate pred, + absl::Duration timeout) { + while (!pred()) { + if (cv->WaitWithTimeout(mu, timeout)) return true; + } + return false; +} + +// Returns true iff we timed-out +template <typename Predicate> +static bool WaitUntilWithDeadline(CondVar* cv, Mutex* mu, Predicate pred, + absl::Time deadline) { + while (!pred()) { + if (cv->WaitWithDeadline(mu, deadline)) return true; + } + return false; +} + +// Deprecated. Prefer MutexLock +class MutexLockForGprMu { + public: + explicit MutexLockForGprMu(gpr_mu* mu) : mu_(mu) { gpr_mu_lock(mu_); } + ~MutexLockForGprMu() { gpr_mu_unlock(mu_); } + + MutexLockForGprMu(const MutexLock&) = delete; + MutexLockForGprMu& operator=(const MutexLock&) = delete; + + private: + gpr_mu* const mu_; +}; - int Wait(Mutex* mu) { return Wait(mu, gpr_inf_future(GPR_CLOCK_REALTIME)); } - int Wait(Mutex* mu, const gpr_timespec& deadline) { - return gpr_cv_wait(&cv_, mu->get(), deadline); +// Deprecated. Prefer MutexLock or ReleasableMutexLock +class ABSL_SCOPED_LOCKABLE LockableAndReleasableMutexLock { + public: + explicit LockableAndReleasableMutexLock(Mutex* mu) + ABSL_EXCLUSIVE_LOCK_FUNCTION(mu) + : mu_(mu) { + mu_->Lock(); } + ~LockableAndReleasableMutexLock() ABSL_UNLOCK_FUNCTION() { + if (!released_) mu_->Unlock(); + } + + LockableAndReleasableMutexLock(const LockableAndReleasableMutexLock&) = + delete; + LockableAndReleasableMutexLock& operator=( + const LockableAndReleasableMutexLock&) = delete; - template <typename Predicate> - void WaitUntil(Mutex* mu, Predicate pred) { - while (!pred()) { - Wait(mu, gpr_inf_future(GPR_CLOCK_REALTIME)); - } + void Lock() ABSL_EXCLUSIVE_LOCK_FUNCTION() { + GPR_DEBUG_ASSERT(released_); + mu_->Lock(); + released_ = false; } - // Returns true iff we timed-out - template <typename Predicate> - bool WaitUntil(Mutex* mu, Predicate pred, const gpr_timespec& deadline) { - while (!pred()) { - if (Wait(mu, deadline)) return true; - } - return false; + void Release() ABSL_UNLOCK_FUNCTION() { + GPR_DEBUG_ASSERT(!released_); + released_ = true; + mu_->Unlock(); } private: - gpr_cv cv_; + Mutex* const mu_; + bool released_ = false; }; } // namespace grpc_core diff --git a/grpc/src/core/lib/gprpp/thd.h b/grpc/src/core/lib/gprpp/thd.h index 2e7135e9..c4ce04ce 100644 --- a/grpc/src/core/lib/gprpp/thd.h +++ b/grpc/src/core/lib/gprpp/thd.h @@ -157,7 +157,7 @@ class Thread { Thread& operator=(const Thread&) = delete; /// The thread states are as follows: - /// FAKE -- just a dummy placeholder Thread created by the default constructor + /// FAKE -- just a phony placeholder Thread created by the default constructor /// ALIVE -- an actual thread of control exists associated with this thread /// STARTED -- the thread of control has been started /// DONE -- the thread of control has completed and been joined diff --git a/grpc/src/core/lib/gprpp/time_util.cc b/grpc/src/core/lib/gprpp/time_util.cc new file mode 100644 index 00000000..d3aa25ae --- /dev/null +++ b/grpc/src/core/lib/gprpp/time_util.cc @@ -0,0 +1,77 @@ +// +// Copyright 2021 the 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 <grpc/support/log.h> + +#include "src/core/lib/gprpp/time_util.h" + +namespace grpc_core { + +gpr_timespec ToGprTimeSpec(absl::Duration duration) { + if (duration == absl::InfiniteDuration()) { + return gpr_inf_future(GPR_TIMESPAN); + } else if (duration == -absl::InfiniteDuration()) { + return gpr_inf_past(GPR_TIMESPAN); + } else { + int64_t s = absl::IDivDuration(duration, absl::Seconds(1), &duration); + int64_t n = absl::IDivDuration(duration, absl::Nanoseconds(1), &duration); + return gpr_time_add(gpr_time_from_seconds(s, GPR_TIMESPAN), + gpr_time_from_nanos(n, GPR_TIMESPAN)); + } +} + +gpr_timespec ToGprTimeSpec(absl::Time time) { + if (time == absl::InfiniteFuture()) { + return gpr_inf_future(GPR_CLOCK_REALTIME); + } else if (time == absl::InfinitePast()) { + return gpr_inf_past(GPR_CLOCK_REALTIME); + } else { + timespec ts = absl::ToTimespec(time); + gpr_timespec out; + out.tv_sec = static_cast<decltype(out.tv_sec)>(ts.tv_sec); + out.tv_nsec = static_cast<decltype(out.tv_nsec)>(ts.tv_nsec); + out.clock_type = GPR_CLOCK_REALTIME; + return out; + } +} + +absl::Duration ToAbslDuration(gpr_timespec ts) { + GPR_ASSERT(ts.clock_type == GPR_TIMESPAN); + if (gpr_time_cmp(ts, gpr_inf_future(GPR_TIMESPAN)) == 0) { + return absl::InfiniteDuration(); + } else if (gpr_time_cmp(ts, gpr_inf_past(GPR_TIMESPAN)) == 0) { + return -absl::InfiniteDuration(); + } else { + return absl::Seconds(ts.tv_sec) + absl::Nanoseconds(ts.tv_nsec); + } +} + +absl::Time ToAbslTime(gpr_timespec ts) { + GPR_ASSERT(ts.clock_type != GPR_TIMESPAN); + gpr_timespec rts = gpr_convert_clock_type(ts, GPR_CLOCK_REALTIME); + if (gpr_time_cmp(rts, gpr_inf_future(GPR_CLOCK_REALTIME)) == 0) { + return absl::InfiniteFuture(); + } else if (gpr_time_cmp(rts, gpr_inf_past(GPR_CLOCK_REALTIME)) == 0) { + return absl::InfinitePast(); + } else { + return absl::UnixEpoch() + absl::Seconds(rts.tv_sec) + + absl::Nanoseconds(rts.tv_nsec); + } +} + +} // namespace grpc_core diff --git a/grpc/src/core/lib/gprpp/time_util.h b/grpc/src/core/lib/gprpp/time_util.h new file mode 100644 index 00000000..4ae4a407 --- /dev/null +++ b/grpc/src/core/lib/gprpp/time_util.h @@ -0,0 +1,42 @@ +// +// Copyright 2021 the 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_GPRPP_TIME_UTIL_H +#define GRPC_CORE_LIB_GPRPP_TIME_UTIL_H + +#include <grpc/support/port_platform.h> + +#include <grpc/support/time.h> + +#include "absl/time/time.h" + +namespace grpc_core { + +// Converts absl::Duration to gpr_timespec(GPR_TIMESPAN) +gpr_timespec ToGprTimeSpec(absl::Duration duration); + +// Converts absl::Time to gpr_timespec(GPR_CLOCK_REALTIME) +gpr_timespec ToGprTimeSpec(absl::Time time); + +// Converts gpr_timespec(GPR_TIMESPAN) to absl::Duration +absl::Duration ToAbslDuration(gpr_timespec ts); + +// Converts gpr_timespec(GPR_CLOCK_[MONOTONIC|REALTIME|PRECISE]) to absl::Time +absl::Time ToAbslTime(gpr_timespec ts); + +} // namespace grpc_core + +#endif // GRPC_CORE_LIB_GPRPP_TIME_UTIL_H diff --git a/grpc/src/core/lib/http/httpcli.cc b/grpc/src/core/lib/http/httpcli.cc index 8d024dd3..e3d2fbef 100644 --- a/grpc/src/core/lib/http/httpcli.cc +++ b/grpc/src/core/lib/http/httpcli.cc @@ -30,6 +30,7 @@ #include <grpc/support/log.h> #include <grpc/support/string_util.h> +#include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gpr/string.h" #include "src/core/lib/gprpp/memory.h" @@ -38,7 +39,6 @@ #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/iomgr_internal.h" #include "src/core/lib/iomgr/resolve_address.h" -#include "src/core/lib/iomgr/sockaddr_utils.h" #include "src/core/lib/iomgr/tcp_client.h" #include "src/core/lib/slice/slice_internal.h" @@ -62,7 +62,7 @@ struct internal_request { grpc_closure on_read; grpc_closure done_write; grpc_closure connected; - grpc_error* overall_error; + grpc_error_handle overall_error; grpc_resource_quota* resource_quota; }; static grpc_httpcli_get_override g_get_override = nullptr; @@ -86,9 +86,9 @@ void grpc_httpcli_context_destroy(grpc_httpcli_context* context) { grpc_pollset_set_destroy(context->pollset_set); } -static void next_address(internal_request* req, grpc_error* due_to_error); +static void next_address(internal_request* req, grpc_error_handle due_to_error); -static void finish(internal_request* req, grpc_error* error) { +static void finish(internal_request* req, grpc_error_handle error) { grpc_polling_entity_del_from_pollset_set(req->pollent, req->context->pollset_set); grpc_core::ExecCtx::Run(DEBUG_LOCATION, req->on_done, error); @@ -110,7 +110,7 @@ static void finish(internal_request* req, grpc_error* error) { gpr_free(req); } -static void append_error(internal_request* req, grpc_error* error) { +static void append_error(internal_request* req, grpc_error_handle error) { if (req->overall_error == GRPC_ERROR_NONE) { req->overall_error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("Failed HTTP/1 client request"); @@ -127,14 +127,14 @@ static void do_read(internal_request* req) { grpc_endpoint_read(req->ep, &req->incoming, &req->on_read, /*urgent=*/true); } -static void on_read(void* user_data, grpc_error* error) { +static void on_read(void* user_data, grpc_error_handle error) { internal_request* req = static_cast<internal_request*>(user_data); size_t i; for (i = 0; i < req->incoming.count; i++) { if (GRPC_SLICE_LENGTH(req->incoming.slices[i])) { req->have_read_byte = 1; - grpc_error* err = grpc_http_parser_parse( + grpc_error_handle err = grpc_http_parser_parse( &req->parser, req->incoming.slices[i], nullptr); if (err != GRPC_ERROR_NONE) { finish(req, err); @@ -154,7 +154,7 @@ static void on_read(void* user_data, grpc_error* error) { static void on_written(internal_request* req) { do_read(req); } -static void done_write(void* arg, grpc_error* error) { +static void done_write(void* arg, grpc_error_handle error) { internal_request* req = static_cast<internal_request*>(arg); if (error == GRPC_ERROR_NONE) { on_written(req); @@ -182,7 +182,7 @@ static void on_handshake_done(void* arg, grpc_endpoint* ep) { start_write(req); } -static void on_connected(void* arg, grpc_error* error) { +static void on_connected(void* arg, grpc_error_handle error) { internal_request* req = static_cast<internal_request*>(arg); if (!req->ep) { @@ -194,7 +194,7 @@ static void on_connected(void* arg, grpc_error* error) { req->deadline, on_handshake_done); } -static void next_address(internal_request* req, grpc_error* error) { +static void next_address(internal_request* req, grpc_error_handle error) { grpc_resolved_address* addr; if (error != GRPC_ERROR_NONE) { append_error(req, error); @@ -216,7 +216,7 @@ static void next_address(internal_request* req, grpc_error* error) { &args, addr, req->deadline); } -static void on_resolved(void* arg, grpc_error* error) { +static void on_resolved(void* arg, grpc_error_handle error) { internal_request* req = static_cast<internal_request*>(arg); if (error != GRPC_ERROR_NONE) { finish(req, GRPC_ERROR_REF(error)); diff --git a/grpc/src/core/lib/http/httpcli_security_connector.cc b/grpc/src/core/lib/http/httpcli_security_connector.cc index 15aea333..e26f99b4 100644 --- a/grpc/src/core/lib/http/httpcli_security_connector.cc +++ b/grpc/src/core/lib/http/httpcli_security_connector.cc @@ -91,7 +91,7 @@ class grpc_httpcli_ssl_channel_security_connector final void check_peer(tsi_peer peer, grpc_endpoint* /*ep*/, grpc_core::RefCountedPtr<grpc_auth_context>* /*auth_context*/, grpc_closure* on_peer_checked) override { - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; /* Check the peer name. */ if (secure_peer_name_ != nullptr && @@ -105,6 +105,11 @@ class grpc_httpcli_ssl_channel_security_connector final tsi_peer_destruct(&peer); } + void cancel_check_peer(grpc_closure* /*on_peer_checked*/, + grpc_error_handle error) override { + GRPC_ERROR_UNREF(error); + } + int cmp(const grpc_security_connector* other_sc) const override { auto* other = reinterpret_cast<const grpc_httpcli_ssl_channel_security_connector*>( @@ -115,13 +120,13 @@ class grpc_httpcli_ssl_channel_security_connector final bool check_call_host(absl::string_view /*host*/, grpc_auth_context* /*auth_context*/, grpc_closure* /*on_call_host_checked*/, - grpc_error** error) override { + grpc_error_handle* error) override { *error = GRPC_ERROR_NONE; return true; } void cancel_check_call_host(grpc_closure* /*on_call_host_checked*/, - grpc_error* error) override { + grpc_error_handle error) override { GRPC_ERROR_UNREF(error); } @@ -160,13 +165,12 @@ struct on_done_closure { void* arg; grpc_core::RefCountedPtr<grpc_core::HandshakeManager> handshake_mgr; }; -static void on_handshake_done(void* arg, grpc_error* error) { +static void on_handshake_done(void* arg, grpc_error_handle error) { auto* args = static_cast<grpc_core::HandshakerArgs*>(arg); on_done_closure* c = static_cast<on_done_closure*>(args->user_data); if (error != GRPC_ERROR_NONE) { - const char* msg = grpc_error_string(error); - gpr_log(GPR_ERROR, "Secure transport setup failed: %s", msg); - + gpr_log(GPR_ERROR, "Secure transport setup failed: %s", + grpc_error_std_string(error).c_str()); c->func(c->arg, nullptr); } else { grpc_channel_args_destroy(args->args); @@ -203,8 +207,8 @@ static void ssl_handshake(void* arg, grpc_endpoint* tcp, const char* host, grpc_channel_args args = {1, &channel_arg}; c->handshake_mgr = grpc_core::MakeRefCounted<grpc_core::HandshakeManager>(); grpc_core::HandshakerRegistry::AddHandshakers( - grpc_core::HANDSHAKER_CLIENT, &args, /*interested_parties=*/nullptr, - c->handshake_mgr.get()); + grpc_core::HANDSHAKER_CLIENT, &args, + /*interested_parties=*/nullptr, c->handshake_mgr.get()); c->handshake_mgr->DoHandshake(tcp, /*channel_args=*/nullptr, deadline, /*acceptor=*/nullptr, on_handshake_done, /*user_data=*/c); diff --git a/grpc/src/core/lib/http/parser.cc b/grpc/src/core/lib/http/parser.cc index 3a0b2be4..c47a0177 100644 --- a/grpc/src/core/lib/http/parser.cc +++ b/grpc/src/core/lib/http/parser.cc @@ -37,7 +37,7 @@ static char* buf2str(void* buffer, size_t length) { return out; } -static grpc_error* handle_response_line(grpc_http_parser* parser) { +static grpc_error_handle handle_response_line(grpc_http_parser* parser) { uint8_t* beg = parser->cur_line; uint8_t* cur = beg; uint8_t* end = beg + parser->cur_line_length; @@ -90,7 +90,7 @@ static grpc_error* handle_response_line(grpc_http_parser* parser) { return GRPC_ERROR_NONE; } -static grpc_error* handle_request_line(grpc_http_parser* parser) { +static grpc_error_handle handle_request_line(grpc_http_parser* parser) { uint8_t* beg = parser->cur_line; uint8_t* cur = beg; uint8_t* end = beg + parser->cur_line_length; @@ -161,7 +161,7 @@ static grpc_error* handle_request_line(grpc_http_parser* parser) { return GRPC_ERROR_NONE; } -static grpc_error* handle_first_line(grpc_http_parser* parser) { +static grpc_error_handle handle_first_line(grpc_http_parser* parser) { switch (parser->type) { case GRPC_HTTP_REQUEST: return handle_request_line(parser); @@ -172,14 +172,14 @@ static grpc_error* handle_first_line(grpc_http_parser* parser) { return GRPC_ERROR_CREATE_FROM_STATIC_STRING("Should never reach here")); } -static grpc_error* add_header(grpc_http_parser* parser) { +static grpc_error_handle add_header(grpc_http_parser* parser) { uint8_t* beg = parser->cur_line; uint8_t* cur = beg; uint8_t* end = beg + parser->cur_line_length; size_t* hdr_count = nullptr; grpc_http_header** hdrs = nullptr; grpc_http_header hdr = {nullptr, nullptr}; - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; GPR_ASSERT(cur != end); @@ -235,9 +235,9 @@ done: return error; } -static grpc_error* finish_line(grpc_http_parser* parser, - bool* found_body_start) { - grpc_error* err; +static grpc_error_handle finish_line(grpc_http_parser* parser, + bool* found_body_start) { + grpc_error_handle err; switch (parser->state) { case GRPC_HTTP_FIRST_LINE: err = handle_first_line(parser); @@ -264,7 +264,7 @@ static grpc_error* finish_line(grpc_http_parser* parser, return GRPC_ERROR_NONE; } -static grpc_error* addbyte_body(grpc_http_parser* parser, uint8_t byte) { +static grpc_error_handle addbyte_body(grpc_http_parser* parser, uint8_t byte) { size_t* body_length = nullptr; char** body = nullptr; @@ -313,8 +313,8 @@ static bool check_line(grpc_http_parser* parser) { return false; } -static grpc_error* addbyte(grpc_http_parser* parser, uint8_t byte, - bool* found_body_start) { +static grpc_error_handle addbyte(grpc_http_parser* parser, uint8_t byte, + bool* found_body_start) { switch (parser->state) { case GRPC_HTTP_FIRST_LINE: case GRPC_HTTP_HEADERS: @@ -371,12 +371,12 @@ void grpc_http_response_destroy(grpc_http_response* response) { gpr_free(response->hdrs); } -grpc_error* grpc_http_parser_parse(grpc_http_parser* parser, - const grpc_slice& slice, - size_t* start_of_body) { +grpc_error_handle grpc_http_parser_parse(grpc_http_parser* parser, + const grpc_slice& slice, + size_t* start_of_body) { for (size_t i = 0; i < GRPC_SLICE_LENGTH(slice); i++) { bool found_body_start = false; - grpc_error* err = + grpc_error_handle err = addbyte(parser, GRPC_SLICE_START_PTR(slice)[i], &found_body_start); if (err != GRPC_ERROR_NONE) return err; if (found_body_start && start_of_body != nullptr) *start_of_body = i + 1; @@ -384,7 +384,7 @@ grpc_error* grpc_http_parser_parse(grpc_http_parser* parser, return GRPC_ERROR_NONE; } -grpc_error* grpc_http_parser_eof(grpc_http_parser* parser) { +grpc_error_handle grpc_http_parser_eof(grpc_http_parser* parser) { if (parser->state != GRPC_HTTP_BODY) { return GRPC_ERROR_CREATE_FROM_STATIC_STRING("Did not finish headers"); } diff --git a/grpc/src/core/lib/http/parser.h b/grpc/src/core/lib/http/parser.h index 2da21903..613b9726 100644 --- a/grpc/src/core/lib/http/parser.h +++ b/grpc/src/core/lib/http/parser.h @@ -100,10 +100,10 @@ void grpc_http_parser_init(grpc_http_parser* parser, grpc_http_type type, void grpc_http_parser_destroy(grpc_http_parser* parser); /* Sets \a start_of_body to the offset in \a slice of the start of the body. */ -grpc_error* grpc_http_parser_parse(grpc_http_parser* parser, - const grpc_slice& slice, - size_t* start_of_body); -grpc_error* grpc_http_parser_eof(grpc_http_parser* parser); +grpc_error_handle grpc_http_parser_parse(grpc_http_parser* parser, + const grpc_slice& slice, + size_t* start_of_body); +grpc_error_handle grpc_http_parser_eof(grpc_http_parser* parser); void grpc_http_request_destroy(grpc_http_request* request); void grpc_http_response_destroy(grpc_http_response* response); diff --git a/grpc/src/core/lib/iomgr/buffer_list.cc b/grpc/src/core/lib/iomgr/buffer_list.cc index e1b87da4..f92fc9b1 100644 --- a/grpc/src/core/lib/iomgr/buffer_list.cc +++ b/grpc/src/core/lib/iomgr/buffer_list.cc @@ -40,14 +40,14 @@ void fill_gpr_from_timestamp(gpr_timespec* gts, const struct timespec* ts) { } void default_timestamps_callback(void* /*arg*/, grpc_core::Timestamps* /*ts*/, - grpc_error* /*shudown_err*/) { + grpc_error_handle /*shudown_err*/) { gpr_log(GPR_DEBUG, "Timestamps callback has not been registered"); } /** The saved callback function that will be invoked when we get all the * timestamps that we are going to get for a TracedBuffer. */ void (*timestamps_callback)(void*, grpc_core::Timestamps*, - grpc_error* shutdown_err) = + grpc_error_handle shutdown_err) = default_timestamps_callback; /* Used to extract individual opt stats from cmsg, so as to avoid troubles with @@ -268,7 +268,7 @@ void TracedBuffer::ProcessTimestamp(TracedBuffer** head, } void TracedBuffer::Shutdown(TracedBuffer** head, void* remaining, - grpc_error* shutdown_err) { + grpc_error_handle shutdown_err) { GPR_DEBUG_ASSERT(head != nullptr); TracedBuffer* elem = *head; while (elem != nullptr) { @@ -284,9 +284,8 @@ void TracedBuffer::Shutdown(TracedBuffer** head, void* remaining, GRPC_ERROR_UNREF(shutdown_err); } -void grpc_tcp_set_write_timestamps_callback(void (*fn)(void*, - grpc_core::Timestamps*, - grpc_error* error)) { +void grpc_tcp_set_write_timestamps_callback( + void (*fn)(void*, grpc_core::Timestamps*, grpc_error_handle error)) { timestamps_callback = fn; } } /* namespace grpc_core */ @@ -294,9 +293,8 @@ void grpc_tcp_set_write_timestamps_callback(void (*fn)(void*, #else /* GRPC_LINUX_ERRQUEUE */ namespace grpc_core { -void grpc_tcp_set_write_timestamps_callback(void (*fn)(void*, - grpc_core::Timestamps*, - grpc_error* error)) { +void grpc_tcp_set_write_timestamps_callback( + void (*fn)(void*, grpc_core::Timestamps*, grpc_error_handle error)) { // Cast value of fn to void to avoid unused parameter warning. // Can't comment out the name because some compilers and formatters don't // like the sequence */* , which would arise from */*fn*/. diff --git a/grpc/src/core/lib/iomgr/buffer_list.h b/grpc/src/core/lib/iomgr/buffer_list.h index f804f021..982c4c6b 100644 --- a/grpc/src/core/lib/iomgr/buffer_list.h +++ b/grpc/src/core/lib/iomgr/buffer_list.h @@ -135,7 +135,7 @@ class TracedBuffer { /** Cleans the list by calling the callback for each traced buffer in the list * with timestamps that it has. */ static void Shutdown(grpc_core::TracedBuffer** head, void* remaining, - grpc_error* shutdown_err); + grpc_error_handle shutdown_err); private: uint32_t seq_no_; /* The sequence number for the last byte in the buffer */ @@ -146,9 +146,9 @@ class TracedBuffer { #else /* GRPC_LINUX_ERRQUEUE */ class TracedBuffer { public: - /* Dummy shutdown function */ + /* Phony shutdown function */ static void Shutdown(grpc_core::TracedBuffer** /*head*/, void* /*remaining*/, - grpc_error* shutdown_err) { + grpc_error_handle shutdown_err) { GRPC_ERROR_UNREF(shutdown_err); } }; @@ -156,9 +156,8 @@ class TracedBuffer { /** Sets the callback function to call when timestamps for a write are * collected. The callback does not own a reference to error. */ -void grpc_tcp_set_write_timestamps_callback(void (*fn)(void*, - grpc_core::Timestamps*, - grpc_error* error)); +void grpc_tcp_set_write_timestamps_callback( + void (*fn)(void*, grpc_core::Timestamps*, grpc_error_handle error)); } /* namespace grpc_core */ diff --git a/grpc/src/core/lib/iomgr/call_combiner.cc b/grpc/src/core/lib/iomgr/call_combiner.cc index 043b3bb4..44ffb127 100644 --- a/grpc/src/core/lib/iomgr/call_combiner.cc +++ b/grpc/src/core/lib/iomgr/call_combiner.cc @@ -32,15 +32,15 @@ DebugOnlyTraceFlag grpc_call_combiner_trace(false, "call_combiner"); namespace { -grpc_error* DecodeCancelStateError(gpr_atm cancel_state) { +grpc_error_handle DecodeCancelStateError(gpr_atm cancel_state) { if (cancel_state & 1) { - return reinterpret_cast<grpc_error*>(cancel_state & - ~static_cast<gpr_atm>(1)); + return reinterpret_cast<grpc_error_handle>(cancel_state & + ~static_cast<gpr_atm>(1)); } return GRPC_ERROR_NONE; } -gpr_atm EncodeCancelStateError(grpc_error* error) { +gpr_atm EncodeCancelStateError(grpc_error_handle error) { return static_cast<gpr_atm>(1) | reinterpret_cast<gpr_atm>(error); } @@ -60,7 +60,7 @@ CallCombiner::~CallCombiner() { } #ifdef GRPC_TSAN_ENABLED -void CallCombiner::TsanClosure(void* arg, grpc_error* error) { +void CallCombiner::TsanClosure(void* arg, grpc_error_handle error) { CallCombiner* self = static_cast<CallCombiner*>(arg); // We ref-count the lock, and check if it's already taken. // If it was taken, we should do nothing. Otherwise, we will mark it as @@ -91,7 +91,8 @@ void CallCombiner::TsanClosure(void* arg, grpc_error* error) { } #endif -void CallCombiner::ScheduleClosure(grpc_closure* closure, grpc_error* error) { +void CallCombiner::ScheduleClosure(grpc_closure* closure, + grpc_error_handle error) { #ifdef GRPC_TSAN_ENABLED original_closure_ = closure; ExecCtx::Run(DEBUG_LOCATION, &tsan_closure_, error); @@ -110,14 +111,15 @@ void CallCombiner::ScheduleClosure(grpc_closure* closure, grpc_error* error) { #define DEBUG_FMT_ARGS #endif -void CallCombiner::Start(grpc_closure* closure, grpc_error* error, +void CallCombiner::Start(grpc_closure* closure, grpc_error_handle error, DEBUG_ARGS const char* reason) { GPR_TIMER_SCOPE("CallCombiner::Start", 0); if (GRPC_TRACE_FLAG_ENABLED(grpc_call_combiner_trace)) { gpr_log(GPR_INFO, "==> CallCombiner::Start() [%p] closure=%p [" DEBUG_FMT_STR "%s] error=%s", - this, closure DEBUG_FMT_ARGS, reason, grpc_error_string(error)); + this, closure DEBUG_FMT_ARGS, reason, + grpc_error_std_string(error).c_str()); } size_t prev_size = static_cast<size_t>(gpr_atm_full_fetch_add(&size_, (gpr_atm)1)); @@ -176,7 +178,8 @@ void CallCombiner::Stop(DEBUG_ARGS const char* reason) { } if (GRPC_TRACE_FLAG_ENABLED(grpc_call_combiner_trace)) { gpr_log(GPR_INFO, " EXECUTING FROM QUEUE: closure=%p error=%s", - closure, grpc_error_string(closure->error_data.error)); + closure, + grpc_error_std_string(closure->error_data.error).c_str()); } ScheduleClosure(closure, closure->error_data.error); break; @@ -191,7 +194,7 @@ void CallCombiner::SetNotifyOnCancel(grpc_closure* closure) { while (true) { // Decode original state. gpr_atm original_state = gpr_atm_acq_load(&cancel_state_); - grpc_error* original_error = DecodeCancelStateError(original_state); + grpc_error_handle original_error = DecodeCancelStateError(original_state); // If error is set, invoke the cancellation closure immediately. // Otherwise, store the new closure. if (original_error != GRPC_ERROR_NONE) { @@ -229,11 +232,11 @@ void CallCombiner::SetNotifyOnCancel(grpc_closure* closure) { } } -void CallCombiner::Cancel(grpc_error* error) { +void CallCombiner::Cancel(grpc_error_handle error) { GRPC_STATS_INC_CALL_COMBINER_CANCELLED(); while (true) { gpr_atm original_state = gpr_atm_acq_load(&cancel_state_); - grpc_error* original_error = DecodeCancelStateError(original_state); + grpc_error_handle original_error = DecodeCancelStateError(original_state); if (original_error != GRPC_ERROR_NONE) { GRPC_ERROR_UNREF(error); break; diff --git a/grpc/src/core/lib/iomgr/call_combiner.h b/grpc/src/core/lib/iomgr/call_combiner.h index 44acd9fe..e5429cca 100644 --- a/grpc/src/core/lib/iomgr/call_combiner.h +++ b/grpc/src/core/lib/iomgr/call_combiner.h @@ -58,7 +58,7 @@ class CallCombiner { #define GRPC_CALL_COMBINER_STOP(call_combiner, reason) \ (call_combiner)->Stop(__FILE__, __LINE__, (reason)) /// Starts processing \a closure. - void Start(grpc_closure* closure, grpc_error* error, const char* file, + void Start(grpc_closure* closure, grpc_error_handle error, const char* file, int line, const char* reason); /// Yields the call combiner to the next closure in the queue, if any. void Stop(const char* file, int line, const char* reason); @@ -68,7 +68,8 @@ class CallCombiner { #define GRPC_CALL_COMBINER_STOP(call_combiner, reason) \ (call_combiner)->Stop((reason)) /// Starts processing \a closure. - void Start(grpc_closure* closure, grpc_error* error, const char* reason); + void Start(grpc_closure* closure, grpc_error_handle error, + const char* reason); /// Yields the call combiner to the next closure in the queue, if any. void Stop(const char* reason); #endif @@ -94,26 +95,22 @@ class CallCombiner { /// cancellation; this effectively unregisters the previously set closure. /// However, most filters will not need to explicitly unregister their /// callbacks, as this is done automatically when the call is destroyed. - /// Filters that schedule the cancellation closure on ExecCtx do not need - /// to take a ref on the call stack to guarantee closure liveness. This is - /// done by explicitly flushing ExecCtx after the unregistration during - /// call destruction. void SetNotifyOnCancel(grpc_closure* closure); /// Indicates that the call has been cancelled. - void Cancel(grpc_error* error); + void Cancel(grpc_error_handle error); private: - void ScheduleClosure(grpc_closure* closure, grpc_error* error); + void ScheduleClosure(grpc_closure* closure, grpc_error_handle error); #ifdef GRPC_TSAN_ENABLED - static void TsanClosure(void* arg, grpc_error* error); + static void TsanClosure(void* arg, grpc_error_handle error); #endif gpr_atm size_ = 0; // size_t, num closures in queue or currently executing MultiProducerSingleConsumerQueue queue_; // Either 0 (if not cancelled and no cancellation closure set), // a grpc_closure* (if the lowest bit is 0), - // or a grpc_error* (if the lowest bit is 1). + // or a grpc_error_handle (if the lowest bit is 1). gpr_atm cancel_state_ = 0; #ifdef GRPC_TSAN_ENABLED // A fake ref-counted lock that is kept alive after the destruction of @@ -150,7 +147,7 @@ class CallCombinerClosureList { // Adds a closure to the list. The closure must eventually result in // the call combiner being yielded. - void Add(grpc_closure* closure, grpc_error* error, const char* reason) { + void Add(grpc_closure* closure, grpc_error_handle error, const char* reason) { closures_.emplace_back(closure, error, reason); } @@ -176,7 +173,8 @@ class CallCombinerClosureList { "CallCombinerClosureList executing closure while already " "holding call_combiner %p: closure=%p error=%s reason=%s", call_combiner, closures_[0].closure, - grpc_error_string(closures_[0].error), closures_[0].reason); + grpc_error_std_string(closures_[0].error).c_str(), + closures_[0].reason); } // This will release the call combiner. ExecCtx::Run(DEBUG_LOCATION, closures_[0].closure, closures_[0].error); @@ -199,10 +197,10 @@ class CallCombinerClosureList { private: struct CallCombinerClosure { grpc_closure* closure; - grpc_error* error; + grpc_error_handle error; const char* reason; - CallCombinerClosure(grpc_closure* closure, grpc_error* error, + CallCombinerClosure(grpc_closure* closure, grpc_error_handle error, const char* reason) : closure(closure), error(error), reason(reason) {} }; diff --git a/grpc/src/core/lib/iomgr/cfstream_handle.cc b/grpc/src/core/lib/iomgr/cfstream_handle.cc index 46914e51..fb112316 100644 --- a/grpc/src/core/lib/iomgr/cfstream_handle.cc +++ b/grpc/src/core/lib/iomgr/cfstream_handle.cc @@ -62,7 +62,7 @@ void CFStreamHandle::ReadCallback(CFReadStreamRef stream, void* client_callback_info) { grpc_core::ApplicationCallbackExecCtx callback_exec_ctx; grpc_core::ExecCtx exec_ctx; - grpc_error* error; + grpc_error_handle error; CFErrorRef stream_error; CFStreamHandle* handle = static_cast<CFStreamHandle*>(client_callback_info); if (grpc_tcp_trace.enabled()) { @@ -97,7 +97,7 @@ void CFStreamHandle::WriteCallback(CFWriteStreamRef stream, void* clientCallBackInfo) { grpc_core::ApplicationCallbackExecCtx callback_exec_ctx; grpc_core::ExecCtx exec_ctx; - grpc_error* error; + grpc_error_handle error; CFErrorRef stream_error; CFStreamHandle* handle = static_cast<CFStreamHandle*>(clientCallBackInfo); if (grpc_tcp_trace.enabled()) { @@ -171,7 +171,7 @@ void CFStreamHandle::NotifyOnWrite(grpc_closure* closure) { write_event_.NotifyOn(closure); } -void CFStreamHandle::Shutdown(grpc_error* error) { +void CFStreamHandle::Shutdown(grpc_error_handle error) { open_event_.SetShutdown(GRPC_ERROR_REF(error)); read_event_.SetShutdown(GRPC_ERROR_REF(error)); write_event_.SetShutdown(GRPC_ERROR_REF(error)); @@ -202,9 +202,9 @@ void CFStreamHandle::Unref(const char* file, int line, const char* reason) { #else -/* Creating a dummy function so that the grpc_cfstream library will be +/* Creating a phony function so that the grpc_cfstream library will be * non-empty. */ -void CFStreamDummy() {} +void CFStreamPhony() {} #endif diff --git a/grpc/src/core/lib/iomgr/cfstream_handle.h b/grpc/src/core/lib/iomgr/cfstream_handle.h index b0f0664a..2358758f 100644 --- a/grpc/src/core/lib/iomgr/cfstream_handle.h +++ b/grpc/src/core/lib/iomgr/cfstream_handle.h @@ -53,7 +53,7 @@ class CFStreamHandle : public GrpcLibraryInitHolder { void NotifyOnOpen(grpc_closure* closure); void NotifyOnRead(grpc_closure* closure); void NotifyOnWrite(grpc_closure* closure); - void Shutdown(grpc_error* error); + void Shutdown(grpc_error_handle error); void Ref(const char* file = "", int line = 0, const char* reason = nullptr); void Unref(const char* file = "", int line = 0, const char* reason = nullptr); diff --git a/grpc/src/core/lib/iomgr/closure.h b/grpc/src/core/lib/iomgr/closure.h index 6bb65340..b429c9e3 100644 --- a/grpc/src/core/lib/iomgr/closure.h +++ b/grpc/src/core/lib/iomgr/closure.h @@ -50,7 +50,7 @@ typedef struct grpc_closure_list { * describing what went wrong. * Error contract: it is not the cb's job to unref this error; * the closure scheduler will do that after the cb returns */ -typedef void (*grpc_iomgr_cb_func)(void* arg, grpc_error* error); +typedef void (*grpc_iomgr_cb_func)(void* arg, grpc_error_handle error); /** A closure over a grpc_iomgr_cb_func. */ struct grpc_closure { @@ -72,7 +72,7 @@ struct grpc_closure { /** Once queued, the result of the closure. Before then: scratch space */ union { - grpc_error* error; + grpc_error_handle error; uintptr_t scratch; } error_data; @@ -126,7 +126,7 @@ struct wrapped_closure { void* cb_arg; grpc_closure wrapper; }; -inline void closure_wrapper(void* arg, grpc_error* error) { +inline void closure_wrapper(void* arg, grpc_error_handle error) { wrapped_closure* wc = static_cast<wrapped_closure*>(arg); grpc_iomgr_cb_func cb = wc->cb; void* cb_arg = wc->cb_arg; @@ -175,7 +175,8 @@ inline void grpc_closure_list_init(grpc_closure_list* closure_list) { and set \a closure's result to \a error Returns true if \a list becomes non-empty */ inline bool grpc_closure_list_append(grpc_closure_list* closure_list, - grpc_closure* closure, grpc_error* error) { + grpc_closure* closure, + grpc_error_handle error) { if (closure == nullptr) { GRPC_ERROR_UNREF(error); return false; @@ -194,7 +195,7 @@ inline bool grpc_closure_list_append(grpc_closure_list* closure_list, /** force all success bits in \a list to false */ inline void grpc_closure_list_fail_all(grpc_closure_list* list, - grpc_error* forced_failure) { + grpc_error_handle forced_failure) { for (grpc_closure* c = list->head; c != nullptr; c = c->next_data.next) { if (c->error_data.error == GRPC_ERROR_NONE) { c->error_data.error = GRPC_ERROR_REF(forced_failure); @@ -227,7 +228,7 @@ namespace grpc_core { class Closure { public: static void Run(const DebugLocation& location, grpc_closure* closure, - grpc_error* error) { + grpc_error_handle error) { (void)location; if (closure == nullptr) { GRPC_ERROR_UNREF(error); diff --git a/grpc/src/core/lib/iomgr/combiner.cc b/grpc/src/core/lib/iomgr/combiner.cc index aa5a2ea4..48237e5a 100644 --- a/grpc/src/core/lib/iomgr/combiner.cc +++ b/grpc/src/core/lib/iomgr/combiner.cc @@ -46,11 +46,12 @@ grpc_core::DebugOnlyTraceFlag grpc_combiner_trace(false, "combiner"); #define STATE_ELEM_COUNT_LOW_BIT 2 static void combiner_exec(grpc_core::Combiner* lock, grpc_closure* closure, - grpc_error* error); + grpc_error_handle error); static void combiner_finally_exec(grpc_core::Combiner* lock, - grpc_closure* closure, grpc_error* error); + grpc_closure* closure, + grpc_error_handle error); -static void offload(void* arg, grpc_error* error); +static void offload(void* arg, grpc_error_handle error); grpc_core::Combiner* grpc_combiner_create(void) { grpc_core::Combiner* lock = new grpc_core::Combiner(); @@ -126,7 +127,7 @@ static void push_first_on_exec_ctx(grpc_core::Combiner* lock) { } static void combiner_exec(grpc_core::Combiner* lock, grpc_closure* cl, - grpc_error* error) { + grpc_error_handle error) { GPR_TIMER_SCOPE("combiner.execute", 0); GRPC_STATS_INC_COMBINER_LOCKS_SCHEDULED_ITEMS(); gpr_atm last = gpr_atm_full_fetch_add(&lock->state, STATE_ELEM_COUNT_LOW_BIT); @@ -167,7 +168,7 @@ static void move_next() { } } -static void offload(void* arg, grpc_error* /*error*/) { +static void offload(void* arg, grpc_error_handle /*error*/) { grpc_core::Combiner* lock = static_cast<grpc_core::Combiner*>(arg); push_last_on_exec_ctx(lock); } @@ -230,7 +231,7 @@ bool grpc_combiner_continue_exec_ctx() { } GPR_TIMER_SCOPE("combiner.exec1", 0); grpc_closure* cl = reinterpret_cast<grpc_closure*>(n); - grpc_error* cl_err = cl->error_data.error; + grpc_error_handle cl_err = cl->error_data.error; #ifndef NDEBUG cl->scheduled = false; #endif @@ -246,7 +247,7 @@ bool grpc_combiner_continue_exec_ctx() { GRPC_COMBINER_TRACE( gpr_log(GPR_INFO, "C:%p execute_final[%d] c=%p", lock, loops, c)); grpc_closure* next = c->next_data.next; - grpc_error* error = c->error_data.error; + grpc_error_handle error = c->error_data.error; #ifndef NDEBUG c->scheduled = false; #endif @@ -297,10 +298,11 @@ bool grpc_combiner_continue_exec_ctx() { return true; } -static void enqueue_finally(void* closure, grpc_error* error); +static void enqueue_finally(void* closure, grpc_error_handle error); static void combiner_finally_exec(grpc_core::Combiner* lock, - grpc_closure* closure, grpc_error* error) { + grpc_closure* closure, + grpc_error_handle error) { GPR_ASSERT(lock != nullptr); GPR_TIMER_SCOPE("combiner.execute_finally", 0); GRPC_STATS_INC_COMBINER_LOCKS_SCHEDULED_FINAL_ITEMS(); @@ -322,7 +324,7 @@ static void combiner_finally_exec(grpc_core::Combiner* lock, grpc_closure_list_append(&lock->final_list, closure, error); } -static void enqueue_finally(void* closure, grpc_error* error) { +static void enqueue_finally(void* closure, grpc_error_handle error) { grpc_closure* cl = static_cast<grpc_closure*>(closure); combiner_finally_exec( reinterpret_cast<grpc_core::Combiner*>(cl->error_data.scratch), cl, @@ -330,11 +332,11 @@ static void enqueue_finally(void* closure, grpc_error* error) { } namespace grpc_core { -void Combiner::Run(grpc_closure* closure, grpc_error* error) { +void Combiner::Run(grpc_closure* closure, grpc_error_handle error) { combiner_exec(this, closure, error); } -void Combiner::FinallyRun(grpc_closure* closure, grpc_error* error) { +void Combiner::FinallyRun(grpc_closure* closure, grpc_error_handle error) { combiner_finally_exec(this, closure, error); } } // namespace grpc_core diff --git a/grpc/src/core/lib/iomgr/combiner.h b/grpc/src/core/lib/iomgr/combiner.h index 32712066..efa2bce6 100644 --- a/grpc/src/core/lib/iomgr/combiner.h +++ b/grpc/src/core/lib/iomgr/combiner.h @@ -32,9 +32,9 @@ namespace grpc_core { // use ExecCtx class Combiner { public: - void Run(grpc_closure* closure, grpc_error* error); + void Run(grpc_closure* closure, grpc_error_handle error); // TODO(yashkt) : Remove this method - void FinallyRun(grpc_closure* closure, grpc_error* error); + void FinallyRun(grpc_closure* closure, grpc_error_handle error); Combiner* next_combiner_on_this_exec_ctx = nullptr; MultiProducerSingleConsumerQueue queue; // either: diff --git a/grpc/src/core/lib/iomgr/endpoint.cc b/grpc/src/core/lib/iomgr/endpoint.cc index 8954f9dc..4c84501a 100644 --- a/grpc/src/core/lib/iomgr/endpoint.cc +++ b/grpc/src/core/lib/iomgr/endpoint.cc @@ -46,7 +46,7 @@ void grpc_endpoint_delete_from_pollset_set(grpc_endpoint* ep, ep->vtable->delete_from_pollset_set(ep, pollset_set); } -void grpc_endpoint_shutdown(grpc_endpoint* ep, grpc_error* why) { +void grpc_endpoint_shutdown(grpc_endpoint* ep, grpc_error_handle why) { ep->vtable->shutdown(ep, why); } diff --git a/grpc/src/core/lib/iomgr/endpoint.h b/grpc/src/core/lib/iomgr/endpoint.h index b6e6086f..4db5e3de 100644 --- a/grpc/src/core/lib/iomgr/endpoint.h +++ b/grpc/src/core/lib/iomgr/endpoint.h @@ -44,7 +44,7 @@ struct grpc_endpoint_vtable { void (*add_to_pollset)(grpc_endpoint* ep, grpc_pollset* pollset); void (*add_to_pollset_set)(grpc_endpoint* ep, grpc_pollset_set* pollset); void (*delete_from_pollset_set)(grpc_endpoint* ep, grpc_pollset_set* pollset); - void (*shutdown)(grpc_endpoint* ep, grpc_error* why); + void (*shutdown)(grpc_endpoint* ep, grpc_error_handle why); void (*destroy)(grpc_endpoint* ep); grpc_resource_user* (*get_resource_user)(grpc_endpoint* ep); absl::string_view (*get_peer)(grpc_endpoint* ep); @@ -86,7 +86,7 @@ void grpc_endpoint_write(grpc_endpoint* ep, grpc_slice_buffer* slices, /* Causes any pending and future read/write callbacks to run immediately with success==0 */ -void grpc_endpoint_shutdown(grpc_endpoint* ep, grpc_error* why); +void grpc_endpoint_shutdown(grpc_endpoint* ep, grpc_error_handle why); void grpc_endpoint_destroy(grpc_endpoint* ep); /* Add an endpoint to a pollset or pollset_set, so that when the pollset is diff --git a/grpc/src/core/lib/iomgr/endpoint_cfstream.cc b/grpc/src/core/lib/iomgr/endpoint_cfstream.cc index 75cd0f09..63945065 100644 --- a/grpc/src/core/lib/iomgr/endpoint_cfstream.cc +++ b/grpc/src/core/lib/iomgr/endpoint_cfstream.cc @@ -29,13 +29,13 @@ #include <grpc/support/alloc.h> #include <grpc/support/string_util.h> +#include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/gpr/string.h" #include "src/core/lib/iomgr/cfstream_handle.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error_cfstream.h" #include "src/core/lib/iomgr/sockaddr.h" -#include "src/core/lib/iomgr/sockaddr_utils.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/slice/slice_string_helpers.h" @@ -106,8 +106,8 @@ static void CFStreamUnref(CFStreamEndpoint* ep) { static void CFStreamRef(CFStreamEndpoint* ep) { gpr_ref(&ep->refcount); } #endif -static grpc_error* CFStreamAnnotateError(grpc_error* src_error, - CFStreamEndpoint* ep) { +static grpc_error_handle CFStreamAnnotateError(grpc_error_handle src_error, + CFStreamEndpoint* ep) { return grpc_error_set_str( grpc_error_set_int(src_error, GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_UNAVAILABLE), @@ -115,13 +115,12 @@ static grpc_error* CFStreamAnnotateError(grpc_error* src_error, grpc_slice_from_copied_string(ep->peer_string.c_str())); } -static void CallReadCb(CFStreamEndpoint* ep, grpc_error* error) { +static void CallReadCb(CFStreamEndpoint* ep, grpc_error_handle error) { if (grpc_tcp_trace.enabled()) { gpr_log(GPR_DEBUG, "CFStream endpoint:%p call_read_cb %p %p:%p", ep, ep->read_cb, ep->read_cb->cb, ep->read_cb->cb_arg); size_t i; - const char* str = grpc_error_string(error); - gpr_log(GPR_DEBUG, "read: error=%s", str); + gpr_log(GPR_DEBUG, "read: error=%s", grpc_error_std_string(error).c_str()); for (i = 0; i < ep->read_slices->count; i++) { char* dump = grpc_dump_slice(ep->read_slices->slices[i], @@ -137,12 +136,11 @@ static void CallReadCb(CFStreamEndpoint* ep, grpc_error* error) { grpc_core::ExecCtx::Run(DEBUG_LOCATION, cb, error); } -static void CallWriteCb(CFStreamEndpoint* ep, grpc_error* error) { +static void CallWriteCb(CFStreamEndpoint* ep, grpc_error_handle error) { if (grpc_tcp_trace.enabled()) { gpr_log(GPR_DEBUG, "CFStream endpoint:%p call_write_cb %p %p:%p", ep, ep->write_cb, ep->write_cb->cb, ep->write_cb->cb_arg); - const char* str = grpc_error_string(error); - gpr_log(GPR_DEBUG, "write: error=%s", str); + gpr_log(GPR_DEBUG, "write: error=%s", grpc_error_std_string(error).c_str()); } grpc_closure* cb = ep->write_cb; ep->write_cb = nullptr; @@ -150,7 +148,7 @@ static void CallWriteCb(CFStreamEndpoint* ep, grpc_error* error) { grpc_core::ExecCtx::Run(DEBUG_LOCATION, cb, error); } -static void ReadAction(void* arg, grpc_error* error) { +static void ReadAction(void* arg, grpc_error_handle error) { CFStreamEndpoint* ep = static_cast<CFStreamEndpoint*>(arg); GPR_ASSERT(ep->read_cb != nullptr); if (error) { @@ -192,7 +190,7 @@ static void ReadAction(void* arg, grpc_error* error) { } } -static void WriteAction(void* arg, grpc_error* error) { +static void WriteAction(void* arg, grpc_error_handle error) { CFStreamEndpoint* ep = static_cast<CFStreamEndpoint*>(arg); GPR_ASSERT(ep->write_cb != nullptr); if (error) { @@ -242,7 +240,7 @@ static void WriteAction(void* arg, grpc_error* error) { grpc_slice_unref_internal(slice); } -static void CFStreamReadAllocationDone(void* arg, grpc_error* error) { +static void CFStreamReadAllocationDone(void* arg, grpc_error_handle error) { CFStreamEndpoint* ep = static_cast<CFStreamEndpoint*>(arg); if (error == GRPC_ERROR_NONE) { ep->stream_sync->NotifyOnRead(&ep->read_action); @@ -286,7 +284,7 @@ static void CFStreamWrite(grpc_endpoint* ep, grpc_slice_buffer* slices, ep_impl->stream_sync->NotifyOnWrite(&ep_impl->write_action); } -void CFStreamShutdown(grpc_endpoint* ep, grpc_error* why) { +void CFStreamShutdown(grpc_endpoint* ep, grpc_error_handle why) { CFStreamEndpoint* ep_impl = reinterpret_cast<CFStreamEndpoint*>(ep); if (grpc_tcp_trace.enabled()) { gpr_log(GPR_DEBUG, "CFStream endpoint:%p shutdown (%p)", ep_impl, why); diff --git a/grpc/src/core/lib/iomgr/endpoint_pair_windows.cc b/grpc/src/core/lib/iomgr/endpoint_pair_windows.cc index 9962809a..c1113e1e 100644 --- a/grpc/src/core/lib/iomgr/endpoint_pair_windows.cc +++ b/grpc/src/core/lib/iomgr/endpoint_pair_windows.cc @@ -21,9 +21,9 @@ #include "src/core/lib/iomgr/port.h" #ifdef GRPC_WINSOCK_SOCKET +#include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/iomgr/endpoint_pair.h" #include "src/core/lib/iomgr/sockaddr.h" -#include "src/core/lib/iomgr/sockaddr_utils.h" #include <errno.h> #include <fcntl.h> diff --git a/grpc/src/core/lib/iomgr/error.cc b/grpc/src/core/lib/iomgr/error.cc index 09101459..378bdf72 100644 --- a/grpc/src/core/lib/iomgr/error.cc +++ b/grpc/src/core/lib/iomgr/error.cc @@ -41,6 +41,114 @@ grpc_core::DebugOnlyTraceFlag grpc_trace_error_refcount(false, "error_refcount"); grpc_core::DebugOnlyTraceFlag grpc_trace_closure(false, "closure"); +static gpr_atm g_error_creation_allowed = true; + +void grpc_disable_error_creation() { + gpr_atm_no_barrier_store(&g_error_creation_allowed, false); +} + +void grpc_enable_error_creation() { + gpr_atm_no_barrier_store(&g_error_creation_allowed, true); +} + +#ifdef GRPC_ERROR_IS_ABSEIL_STATUS + +absl::Status grpc_status_create(absl::StatusCode code, absl::string_view msg, + const grpc_core::DebugLocation& location, + size_t children_count, absl::Status* children) { + absl::Status s = StatusCreate(code, msg, location, {}); + for (size_t i = 0; i < children_count; ++i) { + if (!children[i].ok()) { + StatusAddChild(&s, children[i]); + } + } + return s; +} + +std::string grpc_error_std_string(const absl::Status& error) { + return grpc_core::StatusToString(error); +} + +absl::Status grpc_os_error(const grpc_core::DebugLocation& location, int err, + const char* call_name) { + absl::Status s = + StatusCreate(absl::StatusCode::kUnknown, "OS Error", location, {}); + grpc_core::StatusSetInt(&s, grpc_core::StatusIntProperty::ERRNO, err); + grpc_core::StatusSetStr(&s, grpc_core::StatusStrProperty::OS_ERROR, + strerror(err)); + grpc_core::StatusSetStr(&s, grpc_core::StatusStrProperty::SYSCALL, call_name); + return s; +} + +#ifdef GPR_WINDOWS +absl::Status grpc_wsa_error(const grpc_core::DebugLocation& location, int err, + const char* call_name) { + char* utf8_message = gpr_format_message(err); + absl::Status s = + StatusCreate(absl::StatusCode::kUnknown, "WSA Error", location, {}); + StatusSetInt(&s, StatusIntProperty::WSA_ERROR, err); + StatusSetStr(&s, StatusStrProperty::OS_ERROR, utf8_message); + StatusSetStr(&s, StatusStrProperty::SYSCALL, call_name); +} +#endif + +grpc_error_handle grpc_error_set_int(grpc_error_handle src, + grpc_error_ints which, intptr_t value) { + grpc_core::StatusSetInt( + &src, static_cast<grpc_core::StatusIntProperty>(which), value); + return src; +} + +bool grpc_error_get_int(grpc_error_handle error, grpc_error_ints which, + intptr_t* p) { + absl::optional<intptr_t> value = grpc_core::StatusGetInt( + error, static_cast<grpc_core::StatusIntProperty>(which)); + if (value.has_value()) { + *p = *value; + return true; + } else { + return false; + } +} + +grpc_error_handle grpc_error_set_str(grpc_error_handle src, + grpc_error_strs which, + const grpc_slice& str) { + grpc_core::StatusSetStr( + &src, static_cast<grpc_core::StatusStrProperty>(which), + std::string(reinterpret_cast<const char*>(GRPC_SLICE_START_PTR(str)), + GRPC_SLICE_LENGTH(str))); + return src; +} + +bool grpc_error_get_str(grpc_error_handle error, grpc_error_strs which, + grpc_slice* s) { + absl::optional<std::string> value = grpc_core::StatusGetStr( + error, static_cast<grpc_core::StatusStrProperty>(which)); + if (value.has_value()) { + *s = grpc_slice_from_copied_buffer(value->c_str(), value->size()); + return true; + } else { + return false; + } +} + +grpc_error_handle grpc_error_add_child(grpc_error_handle src, + grpc_error_handle child) { + grpc_core::StatusAddChild(&src, child); + return src; +} + +bool grpc_log_error(const char* what, grpc_error_handle error, const char* file, + int line) { + GPR_DEBUG_ASSERT(error != GRPC_ERROR_NONE); + gpr_log(file, line, GPR_LOG_SEVERITY_ERROR, "%s: %s", what, + grpc_core::StatusToString(error).c_str()); + return false; +} + +#else // GRPC_ERROR_IS_ABSEIL_STATUS + static const char* error_int_name(grpc_error_ints key) { switch (key) { case GRPC_ERROR_INT_ERRNO: @@ -61,20 +169,18 @@ static const char* error_int_name(grpc_error_ints key) { return "http2_error"; case GRPC_ERROR_INT_TSI_CODE: return "tsi_code"; - case GRPC_ERROR_INT_SECURITY_STATUS: - return "security_status"; case GRPC_ERROR_INT_FD: return "fd"; case GRPC_ERROR_INT_WSA_ERROR: return "wsa_error"; case GRPC_ERROR_INT_HTTP_STATUS: return "http_status"; - case GRPC_ERROR_INT_LIMIT: - return "limit"; case GRPC_ERROR_INT_OCCURRED_DURING_WRITE: return "occurred_during_write"; case GRPC_ERROR_INT_CHANNEL_CONNECTIVITY_STATE: return "channel_connectivity_state"; + case GRPC_ERROR_INT_LB_POLICY_DROP: + return "lb_policy_drop"; case GRPC_ERROR_INT_MAX: GPR_UNREACHABLE_CODE(return "unknown"); } @@ -105,8 +211,6 @@ static const char* error_str_name(grpc_error_strs key) { return "tsi_error"; case GRPC_ERROR_STR_FILENAME: return "filename"; - case GRPC_ERROR_STR_QUEUED_BUFFERS: - return "queued_buffers"; case GRPC_ERROR_STR_MAX: GPR_UNREACHABLE_CODE(return "unknown"); } @@ -124,7 +228,8 @@ static const char* error_time_name(grpc_error_times key) { } #ifndef NDEBUG -grpc_error* grpc_error_do_ref(grpc_error* err, const char* file, int line) { +grpc_error_handle grpc_error_do_ref(grpc_error_handle err, const char* file, + int line) { if (grpc_trace_error_refcount.enabled()) { gpr_log(GPR_DEBUG, "%p: %" PRIdPTR " -> %" PRIdPTR " [%s:%d]", err, gpr_atm_no_barrier_load(&err->atomics.refs.count), @@ -134,13 +239,13 @@ grpc_error* grpc_error_do_ref(grpc_error* err, const char* file, int line) { return err; } #else -grpc_error* grpc_error_do_ref(grpc_error* err) { +grpc_error_handle grpc_error_do_ref(grpc_error_handle err) { gpr_ref(&err->atomics.refs); return err; } #endif -static void unref_errs(grpc_error* err) { +static void unref_errs(grpc_error_handle err) { uint8_t slot = err->first_err; while (slot != UINT8_MAX) { grpc_linked_error* lerr = @@ -152,7 +257,7 @@ static void unref_errs(grpc_error* err) { } } -static void unref_strs(grpc_error* err) { +static void unref_strs(grpc_error_handle err) { for (size_t which = 0; which < GRPC_ERROR_STR_MAX; ++which) { uint8_t slot = err->strs[which]; if (slot != UINT8_MAX) { @@ -162,7 +267,7 @@ static void unref_strs(grpc_error* err) { } } -static void error_destroy(grpc_error* err) { +static void error_destroy(grpc_error_handle err) { GPR_ASSERT(!grpc_error_is_special(err)); unref_errs(err); unref_strs(err); @@ -172,7 +277,7 @@ static void error_destroy(grpc_error* err) { } #ifndef NDEBUG -void grpc_error_do_unref(grpc_error* err, const char* file, int line) { +void grpc_error_do_unref(grpc_error_handle err, const char* file, int line) { if (grpc_trace_error_refcount.enabled()) { gpr_log(GPR_DEBUG, "%p: %" PRIdPTR " -> %" PRIdPTR " [%s:%d]", err, gpr_atm_no_barrier_load(&err->atomics.refs.count), @@ -183,14 +288,14 @@ void grpc_error_do_unref(grpc_error* err, const char* file, int line) { } } #else -void grpc_error_do_unref(grpc_error* err) { +void grpc_error_do_unref(grpc_error_handle err) { if (gpr_unref(&err->atomics.refs)) { error_destroy(err); } } #endif -static uint8_t get_placement(grpc_error** err, size_t size) { +static uint8_t get_placement(grpc_error_handle* err, size_t size) { GPR_ASSERT(*err); uint8_t slots = static_cast<uint8_t>(size / sizeof(intptr_t)); if ((*err)->arena_size + slots > (*err)->arena_capacity) { @@ -200,9 +305,9 @@ static uint8_t get_placement(grpc_error** err, size_t size) { return UINT8_MAX; } #ifndef NDEBUG - grpc_error* orig = *err; + grpc_error_handle orig = *err; #endif - *err = static_cast<grpc_error*>(gpr_realloc( + *err = static_cast<grpc_error_handle>(gpr_realloc( *err, sizeof(grpc_error) + (*err)->arena_capacity * sizeof(intptr_t))); #ifndef NDEBUG if (grpc_trace_error_refcount.enabled()) { @@ -217,7 +322,7 @@ static uint8_t get_placement(grpc_error** err, size_t size) { return placement; } -static void internal_set_int(grpc_error** err, grpc_error_ints which, +static void internal_set_int(grpc_error_handle* err, grpc_error_ints which, intptr_t value) { uint8_t slot = (*err)->ints[which]; if (slot == UINT8_MAX) { @@ -232,7 +337,7 @@ static void internal_set_int(grpc_error** err, grpc_error_ints which, (*err)->arena[slot] = value; } -static void internal_set_str(grpc_error** err, grpc_error_strs which, +static void internal_set_str(grpc_error_handle* err, grpc_error_strs which, const grpc_slice& value) { uint8_t slot = (*err)->strs[which]; if (slot == UINT8_MAX) { @@ -253,7 +358,7 @@ static void internal_set_str(grpc_error** err, grpc_error_strs which, } static char* fmt_time(gpr_timespec tm); -static void internal_set_time(grpc_error** err, grpc_error_times which, +static void internal_set_time(grpc_error_handle* err, grpc_error_times which, gpr_timespec value) { uint8_t slot = (*err)->times[which]; if (slot == UINT8_MAX) { @@ -270,7 +375,8 @@ static void internal_set_time(grpc_error** err, grpc_error_times which, memcpy((*err)->arena + slot, &value, sizeof(value)); } -static void internal_add_error(grpc_error** err, grpc_error* new_err) { +static void internal_add_error(grpc_error_handle* err, + grpc_error_handle new_err) { grpc_linked_error new_last = {new_err, UINT8_MAX}; uint8_t slot = get_placement(err, sizeof(grpc_linked_error)); if (slot == UINT8_MAX) { @@ -306,25 +412,16 @@ static void internal_add_error(grpc_error** err, grpc_error* new_err) { // It is very common to include and extra int and string in an error #define SURPLUS_CAPACITY (2 * SLOTS_PER_INT + SLOTS_PER_TIME) -static gpr_atm g_error_creation_allowed = true; - -void grpc_disable_error_creation() { - gpr_atm_no_barrier_store(&g_error_creation_allowed, false); -} - -void grpc_enable_error_creation() { - gpr_atm_no_barrier_store(&g_error_creation_allowed, true); -} - -grpc_error* grpc_error_create(const char* file, int line, - const grpc_slice& desc, grpc_error** referencing, - size_t num_referencing) { +grpc_error_handle grpc_error_create(const char* file, int line, + const grpc_slice& desc, + grpc_error_handle* referencing, + size_t num_referencing) { GPR_TIMER_SCOPE("grpc_error_create", 0); uint8_t initial_arena_capacity = static_cast<uint8_t>( DEFAULT_ERROR_CAPACITY + static_cast<uint8_t>(num_referencing * SLOTS_PER_LINKED_ERROR) + SURPLUS_CAPACITY); - grpc_error* err = static_cast<grpc_error*>( + grpc_error_handle err = static_cast<grpc_error_handle>( gpr_malloc(sizeof(*err) + initial_arena_capacity * sizeof(intptr_t))); if (err == nullptr) { // TODO(ctiller): make gpr_malloc return NULL return GRPC_ERROR_OOM; @@ -370,7 +467,7 @@ grpc_error* grpc_error_create(const char* file, int line, return err; } -static void ref_strs(grpc_error* err) { +static void ref_strs(grpc_error_handle err) { for (size_t i = 0; i < GRPC_ERROR_STR_MAX; ++i) { uint8_t slot = err->strs[i]; if (slot != UINT8_MAX) { @@ -380,7 +477,7 @@ static void ref_strs(grpc_error* err) { } } -static void ref_errs(grpc_error* err) { +static void ref_errs(grpc_error_handle err) { uint8_t slot = err->first_err; while (slot != UINT8_MAX) { grpc_linked_error* lerr = @@ -390,9 +487,9 @@ static void ref_errs(grpc_error* err) { } } -static grpc_error* copy_error_and_unref(grpc_error* in) { +static grpc_error_handle copy_error_and_unref(grpc_error_handle in) { GPR_TIMER_SCOPE("copy_error_and_unref", 0); - grpc_error* out; + grpc_error_handle out; if (grpc_error_is_special(in)) { out = GRPC_ERROR_CREATE_FROM_STATIC_STRING("unknown"); if (in == GRPC_ERROR_NONE) { @@ -417,7 +514,7 @@ static grpc_error* copy_error_and_unref(grpc_error* in) { static_cast<uint8_t> SLOTS_PER_STR) { new_arena_capacity = static_cast<uint8_t>(3 * new_arena_capacity / 2); } - out = static_cast<grpc_error*>( + out = static_cast<grpc_error_handle>( gpr_malloc(sizeof(*in) + new_arena_capacity * sizeof(intptr_t))); #ifndef NDEBUG if (grpc_trace_error_refcount.enabled()) { @@ -441,10 +538,10 @@ static grpc_error* copy_error_and_unref(grpc_error* in) { return out; } -grpc_error* grpc_error_set_int(grpc_error* src, grpc_error_ints which, - intptr_t value) { +grpc_error_handle grpc_error_set_int(grpc_error_handle src, + grpc_error_ints which, intptr_t value) { GPR_TIMER_SCOPE("grpc_error_set_int", 0); - grpc_error* new_err = copy_error_and_unref(src); + grpc_error_handle new_err = copy_error_and_unref(src); internal_set_int(&new_err, which, value); return new_err; } @@ -464,7 +561,8 @@ const special_error_status_map error_status_map[] = { strlen("Cancelled")}, // GRPC_ERROR_CANCELLED }; -bool grpc_error_get_int(grpc_error* err, grpc_error_ints which, intptr_t* p) { +bool grpc_error_get_int(grpc_error_handle err, grpc_error_ints which, + intptr_t* p) { GPR_TIMER_SCOPE("grpc_error_get_int", 0); if (grpc_error_is_special(err)) { if (which != GRPC_ERROR_INT_GRPC_STATUS) return false; @@ -479,15 +577,16 @@ bool grpc_error_get_int(grpc_error* err, grpc_error_ints which, intptr_t* p) { return false; } -grpc_error* grpc_error_set_str(grpc_error* src, grpc_error_strs which, - const grpc_slice& str) { +grpc_error_handle grpc_error_set_str(grpc_error_handle src, + grpc_error_strs which, + const grpc_slice& str) { GPR_TIMER_SCOPE("grpc_error_set_str", 0); - grpc_error* new_err = copy_error_and_unref(src); + grpc_error_handle new_err = copy_error_and_unref(src); internal_set_str(&new_err, which, str); return new_err; } -bool grpc_error_get_str(grpc_error* err, grpc_error_strs which, +bool grpc_error_get_str(grpc_error_handle err, grpc_error_strs which, grpc_slice* str) { if (grpc_error_is_special(err)) { if (which != GRPC_ERROR_STR_GRPC_MESSAGE) return false; @@ -508,14 +607,15 @@ bool grpc_error_get_str(grpc_error* err, grpc_error_strs which, } } -grpc_error* grpc_error_add_child(grpc_error* src, grpc_error* child) { +grpc_error_handle grpc_error_add_child(grpc_error_handle src, + grpc_error_handle child) { GPR_TIMER_SCOPE("grpc_error_add_child", 0); if (src != GRPC_ERROR_NONE) { if (child == GRPC_ERROR_NONE) { /* \a child is empty. Simply return the ref to \a src */ return src; } else if (child != src) { - grpc_error* new_err = copy_error_and_unref(src); + grpc_error_handle new_err = copy_error_and_unref(src); internal_add_error(&new_err, child); return new_err; } else { @@ -616,7 +716,7 @@ static char* fmt_int(intptr_t p) { return s; } -static void collect_ints_kvs(grpc_error* err, kv_pairs* kvs) { +static void collect_ints_kvs(grpc_error_handle err, kv_pairs* kvs) { for (size_t which = 0; which < GRPC_ERROR_INT_MAX; ++which) { uint8_t slot = err->ints[which]; if (slot != UINT8_MAX) { @@ -640,7 +740,7 @@ static char* fmt_str(const grpc_slice& slice) { return s; } -static void collect_strs_kvs(grpc_error* err, kv_pairs* kvs) { +static void collect_strs_kvs(grpc_error_handle err, kv_pairs* kvs) { for (size_t which = 0; which < GRPC_ERROR_STR_MAX; ++which) { uint8_t slot = err->strs[which]; if (slot != UINT8_MAX) { @@ -675,7 +775,7 @@ static char* fmt_time(gpr_timespec tm) { return out; } -static void collect_times_kvs(grpc_error* err, kv_pairs* kvs) { +static void collect_times_kvs(grpc_error_handle err, kv_pairs* kvs) { for (size_t which = 0; which < GRPC_ERROR_TIME_MAX; ++which) { uint8_t slot = err->times[which]; if (slot != UINT8_MAX) { @@ -685,7 +785,7 @@ static void collect_times_kvs(grpc_error* err, kv_pairs* kvs) { } } -static void add_errs(grpc_error* err, char** s, size_t* sz, size_t* cap) { +static void add_errs(grpc_error_handle err, char** s, size_t* sz, size_t* cap) { uint8_t slot = err->first_err; bool first = true; while (slot != UINT8_MAX) { @@ -701,7 +801,7 @@ static void add_errs(grpc_error* err, char** s, size_t* sz, size_t* cap) { } } -static char* errs_string(grpc_error* err) { +static char* errs_string(grpc_error_handle err) { char* s = nullptr; size_t sz = 0; size_t cap = 0; @@ -740,7 +840,7 @@ static char* finish_kvs(kv_pairs* kvs) { return s; } -const char* grpc_error_string(grpc_error* err) { +const char* grpc_error_string(grpc_error_handle err) { GPR_TIMER_SCOPE("grpc_error_string", 0); if (err == GRPC_ERROR_NONE) return no_error_string; if (err == GRPC_ERROR_OOM) return oom_error_string; @@ -775,8 +875,12 @@ const char* grpc_error_string(grpc_error* err) { return out; } -grpc_error* grpc_os_error(const char* file, int line, int err, - const char* call_name) { +std::string grpc_error_std_string(grpc_error_handle error) { + return std::string(grpc_error_string(error)); +} + +grpc_error_handle grpc_os_error(const char* file, int line, int err, + const char* call_name) { return grpc_error_set_str( grpc_error_set_str( grpc_error_set_int( @@ -790,10 +894,10 @@ grpc_error* grpc_os_error(const char* file, int line, int err, } #ifdef GPR_WINDOWS -grpc_error* grpc_wsa_error(const char* file, int line, int err, - const char* call_name) { +grpc_error_handle grpc_wsa_error(const char* file, int line, int err, + const char* call_name) { char* utf8_message = gpr_format_message(err); - grpc_error* error = grpc_error_set_str( + grpc_error_handle error = grpc_error_set_str( grpc_error_set_str( grpc_error_set_int( grpc_error_create(file, line, @@ -807,7 +911,7 @@ grpc_error* grpc_wsa_error(const char* file, int line, int err, } #endif -bool grpc_log_error(const char* what, grpc_error* error, const char* file, +bool grpc_log_error(const char* what, grpc_error_handle error, const char* file, int line) { GPR_DEBUG_ASSERT(error != GRPC_ERROR_NONE); const char* msg = grpc_error_string(error); @@ -815,3 +919,5 @@ bool grpc_log_error(const char* what, grpc_error* error, const char* file, GRPC_ERROR_UNREF(error); return false; } + +#endif // GRPC_ERROR_IS_ABSEIL_STATUS diff --git a/grpc/src/core/lib/iomgr/error.h b/grpc/src/core/lib/iomgr/error.h index ac3ff876..aecd1e90 100644 --- a/grpc/src/core/lib/iomgr/error.h +++ b/grpc/src/core/lib/iomgr/error.h @@ -30,50 +30,70 @@ #include <grpc/support/time.h> #include "src/core/lib/debug/trace.h" +#include "src/core/lib/gprpp/status_helper.h" + +#include "absl/status/status.h" /// Opaque representation of an error. /// See https://github.com/grpc/grpc/blob/master/doc/core/grpc-error.md for a /// full write up of this object. +#ifdef GRPC_ERROR_IS_ABSEIL_STATUS + +typedef absl::Status grpc_error_handle; + +#else // GRPC_ERROR_IS_ABSEIL_STATUS + typedef struct grpc_error grpc_error; +typedef grpc_error* grpc_error_handle; -extern grpc_core::DebugOnlyTraceFlag grpc_trace_error_refcount; +#endif // GRPC_ERROR_IS_ABSEIL_STATUS typedef enum { /// 'errno' from the operating system - GRPC_ERROR_INT_ERRNO, + GRPC_ERROR_INT_ERRNO = + static_cast<int>(grpc_core::StatusIntProperty::kErrorNo), /// __LINE__ from the call site creating the error - GRPC_ERROR_INT_FILE_LINE, + GRPC_ERROR_INT_FILE_LINE = + static_cast<int>(grpc_core::StatusIntProperty::kFileLine), /// stream identifier: for errors that are associated with an individual /// wire stream - GRPC_ERROR_INT_STREAM_ID, + GRPC_ERROR_INT_STREAM_ID = + static_cast<int>(grpc_core::StatusIntProperty::kStreamId), /// grpc status code representing this error - GRPC_ERROR_INT_GRPC_STATUS, + GRPC_ERROR_INT_GRPC_STATUS = + static_cast<int>(grpc_core::StatusIntProperty::kRpcStatus), /// offset into some binary blob (usually represented by /// GRPC_ERROR_STR_RAW_BYTES) where the error occurred - GRPC_ERROR_INT_OFFSET, + GRPC_ERROR_INT_OFFSET = + static_cast<int>(grpc_core::StatusIntProperty::kOffset), /// context sensitive index associated with the error - GRPC_ERROR_INT_INDEX, + GRPC_ERROR_INT_INDEX = static_cast<int>(grpc_core::StatusIntProperty::kIndex), /// context sensitive size associated with the error - GRPC_ERROR_INT_SIZE, + GRPC_ERROR_INT_SIZE = static_cast<int>(grpc_core::StatusIntProperty::kSize), /// http2 error code associated with the error (see the HTTP2 RFC) - GRPC_ERROR_INT_HTTP2_ERROR, + GRPC_ERROR_INT_HTTP2_ERROR = + static_cast<int>(grpc_core::StatusIntProperty::kHttp2Error), /// TSI status code associated with the error - GRPC_ERROR_INT_TSI_CODE, - /// grpc_security_status associated with the error - GRPC_ERROR_INT_SECURITY_STATUS, + GRPC_ERROR_INT_TSI_CODE = + static_cast<int>(grpc_core::StatusIntProperty::kTsiCode), /// WSAGetLastError() reported when this error occurred - GRPC_ERROR_INT_WSA_ERROR, + GRPC_ERROR_INT_WSA_ERROR = + static_cast<int>(grpc_core::StatusIntProperty::kWsaError), /// File descriptor associated with this error - GRPC_ERROR_INT_FD, + GRPC_ERROR_INT_FD = static_cast<int>(grpc_core::StatusIntProperty::kFd), /// HTTP status (i.e. 404) - GRPC_ERROR_INT_HTTP_STATUS, - /// context sensitive limit associated with the error - GRPC_ERROR_INT_LIMIT, + GRPC_ERROR_INT_HTTP_STATUS = + static_cast<int>(grpc_core::StatusIntProperty::kHttpStatus), /// chttp2: did the error occur while a write was in progress - GRPC_ERROR_INT_OCCURRED_DURING_WRITE, + GRPC_ERROR_INT_OCCURRED_DURING_WRITE = + static_cast<int>(grpc_core::StatusIntProperty::kOccurredDuringWrite), /// channel connectivity state associated with the error - GRPC_ERROR_INT_CHANNEL_CONNECTIVITY_STATE, + GRPC_ERROR_INT_CHANNEL_CONNECTIVITY_STATE = + static_cast<int>(grpc_core::StatusIntProperty::ChannelConnectivityState), + /// LB policy drop + GRPC_ERROR_INT_LB_POLICY_DROP = + static_cast<int>(grpc_core::StatusIntProperty::kLbPolicyDrop), /// Must always be last GRPC_ERROR_INT_MAX, @@ -81,29 +101,35 @@ typedef enum { typedef enum { /// top-level textual description of this error - GRPC_ERROR_STR_DESCRIPTION, + GRPC_ERROR_STR_DESCRIPTION = + static_cast<int>(grpc_core::StatusStrProperty::kDescription), /// source file in which this error occurred - GRPC_ERROR_STR_FILE, + GRPC_ERROR_STR_FILE = static_cast<int>(grpc_core::StatusStrProperty::kFile), /// operating system description of this error - GRPC_ERROR_STR_OS_ERROR, + GRPC_ERROR_STR_OS_ERROR = + static_cast<int>(grpc_core::StatusStrProperty::kOsError), /// syscall that generated this error - GRPC_ERROR_STR_SYSCALL, + GRPC_ERROR_STR_SYSCALL = + static_cast<int>(grpc_core::StatusStrProperty::kSyscall), /// peer that we were trying to communicate when this error occurred - GRPC_ERROR_STR_TARGET_ADDRESS, + GRPC_ERROR_STR_TARGET_ADDRESS = + static_cast<int>(grpc_core::StatusStrProperty::kTargetAddress), /// grpc status message associated with this error - GRPC_ERROR_STR_GRPC_MESSAGE, + GRPC_ERROR_STR_GRPC_MESSAGE = + static_cast<int>(grpc_core::StatusStrProperty::kGrpcMessage), /// hex dump (or similar) with the data that generated this error - GRPC_ERROR_STR_RAW_BYTES, + GRPC_ERROR_STR_RAW_BYTES = + static_cast<int>(grpc_core::StatusStrProperty::kRawBytes), /// tsi error string associated with this error - GRPC_ERROR_STR_TSI_ERROR, + GRPC_ERROR_STR_TSI_ERROR = + static_cast<int>(grpc_core::StatusStrProperty::kTsiError), /// filename that we were trying to read/write when this error occurred - GRPC_ERROR_STR_FILENAME, - /// which data was queued for writing when the error occurred - GRPC_ERROR_STR_QUEUED_BUFFERS, + GRPC_ERROR_STR_FILENAME = + static_cast<int>(grpc_core::StatusStrProperty::kFilename), /// key associated with the error - GRPC_ERROR_STR_KEY, + GRPC_ERROR_STR_KEY = static_cast<int>(grpc_core::StatusStrProperty::kKey), /// value associated with the error - GRPC_ERROR_STR_VALUE, + GRPC_ERROR_STR_VALUE = static_cast<int>(grpc_core::StatusStrProperty::kValue), /// Must always be last GRPC_ERROR_STR_MAX, @@ -117,32 +143,135 @@ typedef enum { GRPC_ERROR_TIME_MAX, } grpc_error_times; +// DEPRECATED: Use grpc_error_std_string instead +const char* grpc_error_string(grpc_error_handle error); +std::string grpc_error_std_string(grpc_error_handle error); + +// debug only toggles that allow for a sanity to check that ensures we will +// never create any errors in the per-RPC hotpath. +void grpc_disable_error_creation(); +void grpc_enable_error_creation(); + +#ifdef GRPC_ERROR_IS_ABSEIL_STATUS + +#define GRPC_ERROR_NONE absl::OkStatus() +#define GRPC_ERROR_OOM absl::Status(absl::ResourceExhaustedError) +#define GRPC_ERROR_CANCELLED absl::CancelledError() + +#define GRPC_ERROR_REF(err) (err) +#define GRPC_ERROR_UNREF(err) + +#define GRPC_ERROR_CREATE_FROM_STATIC_STRING(desc) \ + StatusCreate(absl::StatusCode::kUnknown, desc, DEBUG_LOCATION, {}) +#define GRPC_ERROR_CREATE_FROM_COPIED_STRING(desc) \ + StatusCreate(absl::StatusCode::kUnknown, desc, DEBUG_LOCATION, {}) +#define GRPC_ERROR_CREATE_FROM_STRING_VIEW(desc) \ + StatusCreate(ababsl::StatusCode::kUnknown, desc, DEBUG_LOCATION, {}) + +absl::Status grpc_status_create(absl::StatusCode code, absl::string_view msg, + const grpc_core::DebugLocation& location, + size_t children_count, + absl::Status* children) GRPC_MUST_USE_RESULT; + +// Create an error that references some other errors. This function adds a +// reference to each error in errs - it does not consume an existing reference +#define GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING(desc, errs, count) \ + grpc_status_create(absl::StatusCode::kUnknown, desc, DEBUG_LOCATION, count, \ + errs) +#define GRPC_ERROR_CREATE_REFERENCING_FROM_COPIED_STRING(desc, errs, count) \ + grpc_status_create(absl::StatusCode::kUnknown, desc, DEBUG_LOCATION, count, \ + errs) + +// Consumes all the errors in the vector and forms a referencing error from +// them. If the vector is empty, return GRPC_ERROR_NONE. +template <typename VectorType> +static absl::Status grpc_status_create_from_vector( + const grpc_core::DebugLocation& location, const char* desc, + VectorType* error_list) { + absl::Status error = GRPC_ERROR_NONE; + if (error_list->size() != 0) { + error = grpc_status_create(absl::StatusCode::kUnknown, desc, DEBUG_LOCATION, + error_list->size(), error_list->data()); + error_list->clear(); + } + return error; +} + +#define GRPC_ERROR_CREATE_FROM_VECTOR(desc, error_list) \ + grpc_status_create_from_vector(DEBUG_LOCATION, desc, error_list) + +absl::Status grpc_os_error(const grpc_core::DebugLocation& location, int err, + const char* call_name) GRPC_MUST_USE_RESULT; + +inline absl::Status grpc_assert_never_ok(absl::Status error) { + GPR_ASSERT(error != GRPC_ERROR_NONE); + return error; +} + +/// create an error associated with errno!=0 (an 'operating system' error) +#define GRPC_OS_ERROR(err, call_name) \ + grpc_assert_never_ok(grpc_os_error(DEBUG_LOCATION, err, call_name)) + +absl::Status grpc_wsa_error(const grpc_core::DebugLocation& location, int err, + const char* call_name) GRPC_MUST_USE_RESULT; + +/// windows only: create an error associated with WSAGetLastError()!=0 +#define GRPC_WSA_ERROR(err, call_name) \ + grpc_wsa_error(DEBUG_LOCATION, err, call_name) + +#else // GRPC_ERROR_IS_ABSEIL_STATUS + /// The following "special" errors can be propagated without allocating memory. /// They are always even so that other code (particularly combiner locks, /// polling engines) can safely use the lower bit for themselves. -#define GRPC_ERROR_NONE ((grpc_error*)NULL) -#define GRPC_ERROR_RESERVED_1 ((grpc_error*)1) -#define GRPC_ERROR_OOM ((grpc_error*)2) -#define GRPC_ERROR_RESERVED_2 ((grpc_error*)3) -#define GRPC_ERROR_CANCELLED ((grpc_error*)4) +#define GRPC_ERROR_NONE ((grpc_error_handle)NULL) +#define GRPC_ERROR_RESERVED_1 ((grpc_error_handle)1) +#define GRPC_ERROR_OOM ((grpc_error_handle)2) +#define GRPC_ERROR_RESERVED_2 ((grpc_error_handle)3) +#define GRPC_ERROR_CANCELLED ((grpc_error_handle)4) #define GRPC_ERROR_SPECIAL_MAX GRPC_ERROR_CANCELLED -inline bool grpc_error_is_special(struct grpc_error* err) { +inline bool grpc_error_is_special(grpc_error_handle err) { return err <= GRPC_ERROR_SPECIAL_MAX; } -// debug only toggles that allow for a sanity to check that ensures we will -// never create any errors in the per-RPC hotpath. -void grpc_disable_error_creation(); -void grpc_enable_error_creation(); - -const char* grpc_error_string(grpc_error* error); +#ifndef NDEBUG +grpc_error_handle grpc_error_do_ref(grpc_error_handle err, const char* file, + int line); +void grpc_error_do_unref(grpc_error_handle err, const char* file, int line); +inline grpc_error_handle grpc_error_ref(grpc_error_handle err, const char* file, + int line) { + if (grpc_error_is_special(err)) return err; + return grpc_error_do_ref(err, file, line); +} +inline void grpc_error_unref(grpc_error_handle err, const char* file, + int line) { + if (grpc_error_is_special(err)) return; + grpc_error_do_unref(err, file, line); +} +#define GRPC_ERROR_REF(err) grpc_error_ref(err, __FILE__, __LINE__) +#define GRPC_ERROR_UNREF(err) grpc_error_unref(err, __FILE__, __LINE__) +#else +grpc_error_handle grpc_error_do_ref(grpc_error_handle err); +void grpc_error_do_unref(grpc_error_handle err); +inline grpc_error_handle grpc_error_ref(grpc_error_handle err) { + if (grpc_error_is_special(err)) return err; + return grpc_error_do_ref(err); +} +inline void grpc_error_unref(grpc_error_handle err) { + if (grpc_error_is_special(err)) return; + grpc_error_do_unref(err); +} +#define GRPC_ERROR_REF(err) grpc_error_ref(err) +#define GRPC_ERROR_UNREF(err) grpc_error_unref(err) +#endif /// Create an error - but use GRPC_ERROR_CREATE instead -grpc_error* grpc_error_create(const char* file, int line, - const grpc_slice& desc, grpc_error** referencing, - size_t num_referencing); +grpc_error_handle grpc_error_create(const char* file, int line, + const grpc_slice& desc, + grpc_error_handle* referencing, + size_t num_referencing); /// Create an error (this is the preferred way of generating an error that is /// not due to a system call - for system calls, use GRPC_OS_ERROR or /// GRPC_WSA_ERROR as appropriate) @@ -157,6 +286,10 @@ grpc_error* grpc_error_create(const char* file, int line, #define GRPC_ERROR_CREATE_FROM_COPIED_STRING(desc) \ grpc_error_create(__FILE__, __LINE__, grpc_slice_from_copied_string(desc), \ NULL, 0) +#define GRPC_ERROR_CREATE_FROM_STRING_VIEW(desc) \ + grpc_error_create( \ + __FILE__, __LINE__, \ + grpc_slice_from_copied_buffer((desc).data(), (desc).size()), NULL, 0) // Create an error that references some other errors. This function adds a // reference to each error in errs - it does not consume an existing reference @@ -170,41 +303,14 @@ grpc_error* grpc_error_create(const char* file, int line, #define GRPC_ERROR_CREATE_FROM_VECTOR(desc, error_list) \ grpc_error_create_from_vector(__FILE__, __LINE__, desc, error_list) -#ifndef NDEBUG -grpc_error* grpc_error_do_ref(grpc_error* err, const char* file, int line); -void grpc_error_do_unref(grpc_error* err, const char* file, int line); -inline grpc_error* grpc_error_ref(grpc_error* err, const char* file, int line) { - if (grpc_error_is_special(err)) return err; - return grpc_error_do_ref(err, file, line); -} -inline void grpc_error_unref(grpc_error* err, const char* file, int line) { - if (grpc_error_is_special(err)) return; - grpc_error_do_unref(err, file, line); -} -#define GRPC_ERROR_REF(err) grpc_error_ref(err, __FILE__, __LINE__) -#define GRPC_ERROR_UNREF(err) grpc_error_unref(err, __FILE__, __LINE__) -#else -grpc_error* grpc_error_do_ref(grpc_error* err); -void grpc_error_do_unref(grpc_error* err); -inline grpc_error* grpc_error_ref(grpc_error* err) { - if (grpc_error_is_special(err)) return err; - return grpc_error_do_ref(err); -} -inline void grpc_error_unref(grpc_error* err) { - if (grpc_error_is_special(err)) return; - grpc_error_do_unref(err); -} -#define GRPC_ERROR_REF(err) grpc_error_ref(err) -#define GRPC_ERROR_UNREF(err) grpc_error_unref(err) -#endif - // Consumes all the errors in the vector and forms a referencing error from // them. If the vector is empty, return GRPC_ERROR_NONE. template <typename VectorType> -static grpc_error* grpc_error_create_from_vector(const char* file, int line, - const char* desc, - VectorType* error_list) { - grpc_error* error = GRPC_ERROR_NONE; +static grpc_error_handle grpc_error_create_from_vector(const char* file, + int line, + const char* desc, + VectorType* error_list) { + grpc_error_handle error = GRPC_ERROR_NONE; if (error_list->size() != 0) { error = grpc_error_create(file, line, grpc_slice_from_static_string(desc), error_list->data(), error_list->size()); @@ -217,18 +323,40 @@ static grpc_error* grpc_error_create_from_vector(const char* file, int line, return error; } -grpc_error* grpc_error_set_int(grpc_error* src, grpc_error_ints which, - intptr_t value) GRPC_MUST_USE_RESULT; -/// It is an error to pass nullptr as `p`. Caller should allocate a dummy +grpc_error_handle grpc_os_error(const char* file, int line, int err, + const char* call_name) GRPC_MUST_USE_RESULT; + +inline grpc_error_handle grpc_assert_never_ok(grpc_error_handle error) { + GPR_ASSERT(error != GRPC_ERROR_NONE); + return error; +} + +/// create an error associated with errno!=0 (an 'operating system' error) +#define GRPC_OS_ERROR(err, call_name) \ + grpc_assert_never_ok(grpc_os_error(__FILE__, __LINE__, err, call_name)) +grpc_error_handle grpc_wsa_error(const char* file, int line, int err, + const char* call_name) GRPC_MUST_USE_RESULT; +/// windows only: create an error associated with WSAGetLastError()!=0 +#define GRPC_WSA_ERROR(err, call_name) \ + grpc_wsa_error(__FILE__, __LINE__, err, call_name) + +#endif // GRPC_ERROR_IS_ABSEIL_STATUS + +grpc_error_handle grpc_error_set_int(grpc_error_handle src, + grpc_error_ints which, + intptr_t value) GRPC_MUST_USE_RESULT; +/// It is an error to pass nullptr as `p`. Caller should allocate a phony /// intptr_t for `p`, even if the value of `p` is not used. -bool grpc_error_get_int(grpc_error* error, grpc_error_ints which, intptr_t* p); +bool grpc_error_get_int(grpc_error_handle error, grpc_error_ints which, + intptr_t* p); /// This call takes ownership of the slice; the error is responsible for /// eventually unref-ing it. -grpc_error* grpc_error_set_str(grpc_error* src, grpc_error_strs which, - const grpc_slice& str) GRPC_MUST_USE_RESULT; +grpc_error_handle grpc_error_set_str( + grpc_error_handle src, grpc_error_strs which, + const grpc_slice& str) GRPC_MUST_USE_RESULT; /// Returns false if the specified string is not set. /// Caller does NOT own the slice. -bool grpc_error_get_str(grpc_error* error, grpc_error_strs which, +bool grpc_error_get_str(grpc_error_handle error, grpc_error_strs which, grpc_slice* s); /// Add a child error: an error that is believed to have contributed to this @@ -242,29 +370,12 @@ bool grpc_error_get_str(grpc_error* error, grpc_error_strs which, /// returns GRPC_ERROR_NONE. 3) If \a src and \a child point to the same error, /// returns a single reference. (Note that, 2 references should have been /// received to the error in this case.) -grpc_error* grpc_error_add_child(grpc_error* src, - grpc_error* child) GRPC_MUST_USE_RESULT; - -grpc_error* grpc_os_error(const char* file, int line, int err, - const char* call_name) GRPC_MUST_USE_RESULT; - -inline grpc_error* grpc_assert_never_ok(grpc_error* error) { - GPR_ASSERT(error != GRPC_ERROR_NONE); - return error; -} - -/// create an error associated with errno!=0 (an 'operating system' error) -#define GRPC_OS_ERROR(err, call_name) \ - grpc_assert_never_ok(grpc_os_error(__FILE__, __LINE__, err, call_name)) -grpc_error* grpc_wsa_error(const char* file, int line, int err, - const char* call_name) GRPC_MUST_USE_RESULT; -/// windows only: create an error associated with WSAGetLastError()!=0 -#define GRPC_WSA_ERROR(err, call_name) \ - grpc_wsa_error(__FILE__, __LINE__, err, call_name) +grpc_error_handle grpc_error_add_child( + grpc_error_handle src, grpc_error_handle child) GRPC_MUST_USE_RESULT; -bool grpc_log_error(const char* what, grpc_error* error, const char* file, +bool grpc_log_error(const char* what, grpc_error_handle error, const char* file, int line); -inline bool grpc_log_if_error(const char* what, grpc_error* error, +inline bool grpc_log_if_error(const char* what, grpc_error_handle error, const char* file, int line) { return error == GRPC_ERROR_NONE ? true : grpc_log_error(what, error, file, line); diff --git a/grpc/src/core/lib/iomgr/error_cfstream.cc b/grpc/src/core/lib/iomgr/error_cfstream.cc index 7bf28658..114b3f2e 100644 --- a/grpc/src/core/lib/iomgr/error_cfstream.cc +++ b/grpc/src/core/lib/iomgr/error_cfstream.cc @@ -31,8 +31,9 @@ #define MAX_ERROR_DESCRIPTION 256 -grpc_error* grpc_error_create_from_cferror(const char* file, int line, - void* arg, const char* custom_desc) { +grpc_error_handle grpc_error_create_from_cferror(const char* file, int line, + void* arg, + const char* custom_desc) { CFErrorRef error = static_cast<CFErrorRef>(arg); char buf_domain[MAX_ERROR_DESCRIPTION]; char buf_desc[MAX_ERROR_DESCRIPTION]; diff --git a/grpc/src/core/lib/iomgr/error_cfstream.h b/grpc/src/core/lib/iomgr/error_cfstream.h index 06ab7513..2d5b744c 100644 --- a/grpc/src/core/lib/iomgr/error_cfstream.h +++ b/grpc/src/core/lib/iomgr/error_cfstream.h @@ -24,8 +24,8 @@ #define GRPC_ERROR_CREATE_FROM_CFERROR(error, desc) \ grpc_error_create_from_cferror(__FILE__, __LINE__, \ static_cast<void*>((error)), (desc)) -grpc_error* grpc_error_create_from_cferror(const char* file, int line, - void* arg, const char* desc); +grpc_error_handle grpc_error_create_from_cferror(const char* file, int line, + void* arg, const char* desc); #endif /* GRPC_CFSTREAM */ #endif /* GRPC_CORE_LIB_IOMGR_ERROR_CFSTREAM_H */ diff --git a/grpc/src/core/lib/iomgr/error_internal.h b/grpc/src/core/lib/iomgr/error_internal.h index 33c233b9..50c1ddeb 100644 --- a/grpc/src/core/lib/iomgr/error_internal.h +++ b/grpc/src/core/lib/iomgr/error_internal.h @@ -27,10 +27,12 @@ #include <grpc/support/sync.h> #include "src/core/lib/iomgr/error.h" +#ifndef GRPC_ERROR_IS_ABSEIL_STATUS + typedef struct grpc_linked_error grpc_linked_error; struct grpc_linked_error { - grpc_error* err; + grpc_error_handle err; uint8_t next; }; @@ -58,4 +60,6 @@ struct grpc_error { intptr_t arena[0]; }; +#endif // GRPC_ERROR_IS_ABSEIL_STATUS + #endif /* GRPC_CORE_LIB_IOMGR_ERROR_INTERNAL_H */ diff --git a/grpc/src/core/lib/iomgr/ev_apple.cc b/grpc/src/core/lib/iomgr/ev_apple.cc index d1525828..25805826 100644 --- a/grpc/src/core/lib/iomgr/ev_apple.cc +++ b/grpc/src/core/lib/iomgr/ev_apple.cc @@ -20,7 +20,7 @@ /// is enabled (see iomgr_posix_cfstream.cc), a global thread is started to /// handle and trigger all the CFStream events. The CFStream streams register /// themselves with the run loop with functions grpc_apple_register_read_stream -/// and grpc_apple_register_read_stream. Pollsets are dummy and block on a +/// and grpc_apple_register_read_stream. Pollsets are phony and block on a /// condition variable in pollset_work(). #include <grpc/support/port_platform.h> @@ -33,7 +33,10 @@ #include <list> +#include "absl/time/time.h" + #include "src/core/lib/gprpp/thd.h" +#include "src/core/lib/gprpp/time_util.h" #include "src/core/lib/iomgr/ev_apple.h" grpc_core::DebugOnlyTraceFlag grpc_apple_polling_trace(false, "apple_polling"); @@ -161,7 +164,7 @@ void grpc_apple_register_write_stream(CFWriteStreamRef write_stream, /// Drive the run loop in a global singleton thread until the global run loop is /// shutdown. static void GlobalRunLoopFunc(void* arg) { - grpc_core::ReleasableMutexLock lock(&gGlobalRunLoopContext->mu); + grpc_core::LockableAndReleasableMutexLock lock(&gGlobalRunLoopContext->mu); gGlobalRunLoopContext->run_loop = CFRunLoopGetCurrent(); gGlobalRunLoopContext->init_cv.Signal(); @@ -173,11 +176,11 @@ static void GlobalRunLoopFunc(void* arg) { gGlobalRunLoopContext->input_source_cv.Wait(&gGlobalRunLoopContext->mu); } gGlobalRunLoopContext->input_source_registered = false; - lock.Unlock(); + lock.Release(); CFRunLoopRun(); lock.Lock(); } - lock.Unlock(); + lock.Release(); } // pollset implementation @@ -216,9 +219,9 @@ static void pollset_global_shutdown(void) { /// The Apple pollset simply waits on a condition variable until it is kicked. /// The network events are handled in the global run loop thread. Processing of /// these events will eventually trigger the kick. -static grpc_error* pollset_work(grpc_pollset* pollset, - grpc_pollset_worker** worker, - grpc_millis deadline) { +static grpc_error_handle pollset_work(grpc_pollset* pollset, + grpc_pollset_worker** worker, + grpc_millis deadline) { GRPC_POLLING_TRACE("pollset work: %p, worker: %p, deadline: %" PRIu64, pollset, worker, deadline); GrpcApplePollset* apple_pollset = @@ -237,9 +240,9 @@ static grpc_error* pollset_work(grpc_pollset* pollset, auto it = apple_pollset->workers.begin(); while (!actual_worker.kicked && !apple_pollset->is_shutdown) { - if (actual_worker.cv.Wait( - &apple_pollset->mu, - grpc_millis_to_timespec(deadline, GPR_CLOCK_REALTIME))) { + if (actual_worker.cv.WaitWithDeadline( + &apple_pollset->mu, grpc_core::ToAbslTime(grpc_millis_to_timespec( + deadline, GPR_CLOCK_REALTIME)))) { // timed out break; } @@ -269,8 +272,8 @@ static void kick_worker(GrpcAppleWorker* worker) { /// The caller must acquire the lock GrpcApplePollset.mu before calling this /// function. The kick action simply signals the condition variable of the /// worker. -static grpc_error* pollset_kick(grpc_pollset* pollset, - grpc_pollset_worker* specific_worker) { +static grpc_error_handle pollset_kick(grpc_pollset* pollset, + grpc_pollset_worker* specific_worker) { GrpcApplePollset* apple_pollset = reinterpret_cast<GrpcApplePollset*>(pollset); @@ -299,7 +302,7 @@ static grpc_error* pollset_kick(grpc_pollset* pollset, static void pollset_init(grpc_pollset* pollset, gpr_mu** mu) { GRPC_POLLING_TRACE("pollset init: %p", pollset); GrpcApplePollset* apple_pollset = new (pollset) GrpcApplePollset(); - *mu = apple_pollset->mu.get(); + *mu = grpc_core::GetUnderlyingGprMu(&apple_pollset->mu); } /// The caller must acquire the lock GrpcApplePollset.mu before calling this diff --git a/grpc/src/core/lib/iomgr/ev_epoll1_linux.cc b/grpc/src/core/lib/iomgr/ev_epoll1_linux.cc index 8a1013da..f09cd78b 100644 --- a/grpc/src/core/lib/iomgr/ev_epoll1_linux.cc +++ b/grpc/src/core/lib/iomgr/ev_epoll1_linux.cc @@ -241,7 +241,7 @@ struct grpc_pollset_set { * Common helpers */ -static bool append_error(grpc_error** composite, grpc_error* error, +static bool append_error(grpc_error_handle* composite, grpc_error_handle error, const char* desc) { if (error == GRPC_ERROR_NONE) return true; if (*composite == GRPC_ERROR_NONE) { @@ -382,15 +382,15 @@ static int fd_wrapped_fd(grpc_fd* fd) { return fd->fd; } /* if 'releasing_fd' is true, it means that we are going to detach the internal * fd from grpc_fd structure (i.e which means we should not be calling * shutdown() syscall on that fd) */ -static void fd_shutdown_internal(grpc_fd* fd, grpc_error* why, +static void fd_shutdown_internal(grpc_fd* fd, grpc_error_handle why, bool releasing_fd) { if (fd->read_closure->SetShutdown(GRPC_ERROR_REF(why))) { if (!releasing_fd) { shutdown(fd->fd, SHUT_RDWR); } else { - /* we need a dummy event for earlier linux versions. */ - epoll_event dummy_event; - if (epoll_ctl(g_epoll_set.epfd, EPOLL_CTL_DEL, fd->fd, &dummy_event) != + /* we need a phony event for earlier linux versions. */ + epoll_event phony_event; + if (epoll_ctl(g_epoll_set.epfd, EPOLL_CTL_DEL, fd->fd, &phony_event) != 0) { gpr_log(GPR_ERROR, "epoll_ctl failed: %s", strerror(errno)); } @@ -402,13 +402,13 @@ static void fd_shutdown_internal(grpc_fd* fd, grpc_error* why, } /* Might be called multiple times */ -static void fd_shutdown(grpc_fd* fd, grpc_error* why) { +static void fd_shutdown(grpc_fd* fd, grpc_error_handle why) { fd_shutdown_internal(fd, why, false); } static void fd_orphan(grpc_fd* fd, grpc_closure* on_done, int* release_fd, const char* reason) { - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; bool is_release_fd = (release_fd != nullptr); if (!fd->read_closure->IsShutdown()) { @@ -514,12 +514,12 @@ static size_t choose_neighborhood(void) { return static_cast<size_t>(gpr_cpu_current_cpu()) % g_num_neighborhoods; } -static grpc_error* pollset_global_init(void) { +static grpc_error_handle pollset_global_init(void) { gpr_tls_init(&g_current_thread_pollset); gpr_tls_init(&g_current_thread_worker); gpr_atm_no_barrier_store(&g_active_poller, 0); global_wakeup_fd.read_fd = -1; - grpc_error* err = grpc_wakeup_fd_init(&global_wakeup_fd); + grpc_error_handle err = grpc_wakeup_fd_init(&global_wakeup_fd); if (err != GRPC_ERROR_NONE) return err; struct epoll_event ev; ev.events = static_cast<uint32_t>(EPOLLIN | EPOLLET); @@ -589,9 +589,9 @@ static void pollset_destroy(grpc_pollset* pollset) { gpr_mu_destroy(&pollset->mu); } -static grpc_error* pollset_kick_all(grpc_pollset* pollset) { +static grpc_error_handle pollset_kick_all(grpc_pollset* pollset) { GPR_TIMER_SCOPE("pollset_kick_all", 0); - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; if (pollset->root_worker != nullptr) { grpc_pollset_worker* worker = pollset->root_worker; do { @@ -663,11 +663,11 @@ static int poll_deadline_to_millis_timeout(grpc_millis millis) { NOTE ON SYNCRHONIZATION: Similar to do_epoll_wait(), this function is only called by g_active_poller thread. So there is no need for synchronization when accessing fields in g_epoll_set */ -static grpc_error* process_epoll_events(grpc_pollset* /*pollset*/) { +static grpc_error_handle process_epoll_events(grpc_pollset* /*pollset*/) { GPR_TIMER_SCOPE("process_epoll_events", 0); static const char* err_desc = "process_events"; - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; long num_events = gpr_atm_acq_load(&g_epoll_set.num_events); long cursor = gpr_atm_acq_load(&g_epoll_set.cursor); for (int idx = 0; @@ -715,7 +715,7 @@ static grpc_error* process_epoll_events(grpc_pollset* /*pollset*/) { NOTE ON SYNCHRONIZATION: At any point of time, only the g_active_poller (i.e the designated poller thread) will be calling this function. So there is no need for any synchronization when accesing fields in g_epoll_set */ -static grpc_error* do_epoll_wait(grpc_pollset* ps, grpc_millis deadline) { +static grpc_error_handle do_epoll_wait(grpc_pollset* ps, grpc_millis deadline) { GPR_TIMER_SCOPE("do_epoll_wait", 0); int r; @@ -1014,12 +1014,12 @@ static void end_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, The function pollset_work() may temporarily release the lock (pollset->po.mu) during the course of its execution but it will always re-acquire the lock and ensure that it is held by the time the function returns */ -static grpc_error* pollset_work(grpc_pollset* ps, - grpc_pollset_worker** worker_hdl, - grpc_millis deadline) { +static grpc_error_handle pollset_work(grpc_pollset* ps, + grpc_pollset_worker** worker_hdl, + grpc_millis deadline) { GPR_TIMER_SCOPE("pollset_work", 0); grpc_pollset_worker worker; - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; static const char* err_desc = "pollset_work"; if (ps->kicked_without_poller) { ps->kicked_without_poller = false; @@ -1065,11 +1065,11 @@ static grpc_error* pollset_work(grpc_pollset* ps, return error; } -static grpc_error* pollset_kick(grpc_pollset* pollset, - grpc_pollset_worker* specific_worker) { +static grpc_error_handle pollset_kick(grpc_pollset* pollset, + grpc_pollset_worker* specific_worker) { GPR_TIMER_SCOPE("pollset_kick", 0); GRPC_STATS_INC_POLLSET_KICK(); - grpc_error* ret_err = GRPC_ERROR_NONE; + grpc_error_handle ret_err = GRPC_ERROR_NONE; if (GRPC_TRACE_FLAG_ENABLED(grpc_polling_trace)) { std::vector<std::string> log; log.push_back(absl::StrFormat( @@ -1260,7 +1260,7 @@ static bool is_any_background_poller_thread(void) { return false; } static void shutdown_background_closure(void) {} static bool add_closure_to_background_poller(grpc_closure* /*closure*/, - grpc_error* /*error*/) { + grpc_error_handle /*error*/) { return false; } diff --git a/grpc/src/core/lib/iomgr/ev_epollex_linux.cc b/grpc/src/core/lib/iomgr/ev_epollex_linux.cc index acd095a4..72d7da76 100644 --- a/grpc/src/core/lib/iomgr/ev_epollex_linux.cc +++ b/grpc/src/core/lib/iomgr/ev_epollex_linux.cc @@ -134,7 +134,7 @@ static std::string pollable_desc(pollable* p) { /// added static pollable* g_empty_pollable; -static grpc_error* pollable_create(pollable_type type, pollable** p); +static grpc_error_handle pollable_create(pollable_type type, pollable** p); static pollable* pollable_ref(pollable* p, const grpc_core::DebugLocation& dbg_loc, const char* reason) { @@ -314,7 +314,7 @@ struct grpc_pollset_set { * Common helpers */ -static bool append_error(grpc_error** composite, grpc_error* error, +static bool append_error(grpc_error_handle* composite, grpc_error_handle error, const char* desc) { if (error == GRPC_ERROR_NONE) return true; if (*composite == GRPC_ERROR_NONE) { @@ -372,7 +372,7 @@ static void ref_by(grpc_fd* fd, int n) { } /* Uninitialize and add to the freelist */ -static void fd_destroy(void* arg, grpc_error* /*error*/) { +static void fd_destroy(void* arg, grpc_error_handle /*error*/) { grpc_fd* fd = static_cast<grpc_fd*>(arg); fd->destroy(); @@ -509,7 +509,7 @@ static bool fd_is_shutdown(grpc_fd* fd) { } /* Might be called multiple times */ -static void fd_shutdown(grpc_fd* fd, grpc_error* why) { +static void fd_shutdown(grpc_fd* fd, grpc_error_handle why) { if (fd->read_closure.SetShutdown(GRPC_ERROR_REF(why))) { if (shutdown(fd->fd, SHUT_RDWR)) { if (errno != ENOTCONN) { @@ -537,7 +537,7 @@ static void fd_notify_on_error(grpc_fd* fd, grpc_closure* closure) { static bool fd_has_pollset(grpc_fd* fd, grpc_pollset* pollset) { const int epfd = pollset->active_pollable->epfd; - grpc_core::MutexLock lock(&fd->pollable_mu); + grpc_core::MutexLockForGprMu lock(&fd->pollable_mu); for (size_t i = 0; i < fd->pollset_fds.size(); ++i) { if (fd->pollset_fds[i] == epfd) { return true; @@ -548,7 +548,7 @@ static bool fd_has_pollset(grpc_fd* fd, grpc_pollset* pollset) { static void fd_add_pollset(grpc_fd* fd, grpc_pollset* pollset) { const int epfd = pollset->active_pollable->epfd; - grpc_core::MutexLock lock(&fd->pollable_mu); + grpc_core::MutexLockForGprMu lock(&fd->pollable_mu); fd->pollset_fds.push_back(epfd); } @@ -556,7 +556,7 @@ static void fd_add_pollset(grpc_fd* fd, grpc_pollset* pollset) { * Pollable Definitions */ -static grpc_error* pollable_create(pollable_type type, pollable** p) { +static grpc_error_handle pollable_create(pollable_type type, pollable** p) { *p = nullptr; int epfd = epoll_create1(EPOLL_CLOEXEC); @@ -565,7 +565,7 @@ static grpc_error* pollable_create(pollable_type type, pollable** p) { } GRPC_FD_TRACE("Pollable_create: created epfd: %d (type: %d)", epfd, type); *p = static_cast<pollable*>(gpr_malloc(sizeof(**p))); - grpc_error* err = grpc_wakeup_fd_init(&(*p)->wakeup); + grpc_error_handle err = grpc_wakeup_fd_init(&(*p)->wakeup); if (err != GRPC_ERROR_NONE) { GRPC_FD_TRACE( "Pollable_create: closed epfd: %d (type: %d). wakeupfd_init error", @@ -609,8 +609,8 @@ static grpc_error* pollable_create(pollable_type type, pollable** p) { return GRPC_ERROR_NONE; } -static grpc_error* pollable_add_fd(pollable* p, grpc_fd* fd) { - grpc_error* error = GRPC_ERROR_NONE; +static grpc_error_handle pollable_add_fd(pollable* p, grpc_fd* fd) { + grpc_error_handle error = GRPC_ERROR_NONE; static const char* err_desc = "pollable_add_fd"; const int epfd = p->epfd; if (GRPC_TRACE_FLAG_ENABLED(grpc_polling_trace)) { @@ -647,7 +647,7 @@ GPR_TLS_DECL(g_current_thread_pollset); GPR_TLS_DECL(g_current_thread_worker); /* Global state management */ -static grpc_error* pollset_global_init(void) { +static grpc_error_handle pollset_global_init(void) { gpr_tls_init(&g_current_thread_pollset); gpr_tls_init(&g_current_thread_worker); return pollable_create(PO_EMPTY, &g_empty_pollable); @@ -681,10 +681,10 @@ static void pollset_maybe_finish_shutdown(grpc_pollset* pollset) { /* pollset->mu must be held before calling this function, * pollset->active_pollable->mu & specific_worker->pollable_obj->mu must not be * held */ -static grpc_error* kick_one_worker(grpc_pollset_worker* specific_worker) { +static grpc_error_handle kick_one_worker(grpc_pollset_worker* specific_worker) { GPR_TIMER_SCOPE("kick_one_worker", 0); pollable* p = specific_worker->pollable_obj; - grpc_core::MutexLock lock(&p->mu); + grpc_core::MutexLockForGprMu lock(&p->mu); GPR_ASSERT(specific_worker != nullptr); if (specific_worker->kicked) { if (GRPC_TRACE_FLAG_ENABLED(grpc_polling_trace)) { @@ -708,7 +708,7 @@ static grpc_error* kick_one_worker(grpc_pollset_worker* specific_worker) { gpr_log(GPR_INFO, "PS:%p kicked_specific_via_wakeup_fd", p); } specific_worker->kicked = true; - grpc_error* error = grpc_wakeup_fd_wakeup(&p->wakeup); + grpc_error_handle error = grpc_wakeup_fd_wakeup(&p->wakeup); return error; } if (specific_worker->initialized_cv) { @@ -725,8 +725,8 @@ static grpc_error* kick_one_worker(grpc_pollset_worker* specific_worker) { return GRPC_ERROR_NONE; } -static grpc_error* pollset_kick(grpc_pollset* pollset, - grpc_pollset_worker* specific_worker) { +static grpc_error_handle pollset_kick(grpc_pollset* pollset, + grpc_pollset_worker* specific_worker) { GPR_TIMER_SCOPE("pollset_kick", 0); GRPC_STATS_INC_POLLSET_KICK(); if (GRPC_TRACE_FLAG_ENABLED(grpc_polling_trace)) { @@ -777,9 +777,9 @@ static grpc_error* pollset_kick(grpc_pollset* pollset, } } -static grpc_error* pollset_kick_all(grpc_pollset* pollset) { +static grpc_error_handle pollset_kick_all(grpc_pollset* pollset) { GPR_TIMER_SCOPE("pollset_kick_all", 0); - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; const char* err_desc = "pollset_kick_all"; grpc_pollset_worker* w = pollset->root_worker; if (w != nullptr) { @@ -828,9 +828,9 @@ static void fd_has_errors(grpc_fd* fd) { fd->error_closure.SetReady(); } * * Note that if a pollable object is already attached to the fd, it may be of * either PO_FD or PO_MULTI type */ -static grpc_error* get_fd_pollable(grpc_fd* fd, pollable** p) { +static grpc_error_handle get_fd_pollable(grpc_fd* fd, pollable** p) { gpr_mu_lock(&fd->pollable_mu); - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; static const char* err_desc = "get_fd_pollable"; if (fd->pollable_obj == nullptr) { if (append_error(&error, pollable_create(PO_FD, &fd->pollable_obj), @@ -863,8 +863,9 @@ static void pollset_shutdown(grpc_pollset* pollset, grpc_closure* closure) { pollset_maybe_finish_shutdown(pollset); } -static grpc_error* pollable_process_events(grpc_pollset* pollset, - pollable* pollable_obj, bool drain) { +static grpc_error_handle pollable_process_events(grpc_pollset* pollset, + pollable* pollable_obj, + bool drain) { GPR_TIMER_SCOPE("pollable_process_events", 0); static const char* err_desc = "pollset_process_events"; // Use a simple heuristic to determine how many fd events to process @@ -877,7 +878,7 @@ static grpc_error* pollable_process_events(grpc_pollset* pollset, if (handle_count == 0) { handle_count = 1; } - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; for (int i = 0; (drain || i < handle_count) && pollable_obj->event_cursor != pollable_obj->event_count; i++) { @@ -932,7 +933,7 @@ static void pollset_destroy(grpc_pollset* pollset) { gpr_mu_destroy(&pollset->mu); } -static grpc_error* pollable_epoll(pollable* p, grpc_millis deadline) { +static grpc_error_handle pollable_epoll(pollable* p, grpc_millis deadline) { GPR_TIMER_SCOPE("pollable_epoll", 0); int timeout = poll_deadline_to_millis_timeout(deadline); @@ -1103,9 +1104,9 @@ static long sys_gettid(void) { return syscall(__NR_gettid); } The function pollset_work() may temporarily release the lock (pollset->po.mu) during the course of its execution but it will always re-acquire the lock and ensure that it is held by the time the function returns */ -static grpc_error* pollset_work(grpc_pollset* pollset, - grpc_pollset_worker** worker_hdl, - grpc_millis deadline) { +static grpc_error_handle pollset_work(grpc_pollset* pollset, + grpc_pollset_worker** worker_hdl, + grpc_millis deadline) { GPR_TIMER_SCOPE("pollset_work", 0); #ifdef GRPC_EPOLLEX_CREATE_WORKERS_ON_HEAP grpc_pollset_worker* worker = @@ -1126,7 +1127,7 @@ static grpc_error* pollset_work(grpc_pollset* pollset, deadline, pollset->kicked_without_poller, pollset->active_pollable); } static const char* err_desc = "pollset_work"; - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; if (pollset->kicked_without_poller) { pollset->kicked_without_poller = false; } else { @@ -1155,10 +1156,10 @@ static grpc_error* pollset_work(grpc_pollset* pollset, return error; } -static grpc_error* pollset_transition_pollable_from_empty_to_fd_locked( +static grpc_error_handle pollset_transition_pollable_from_empty_to_fd_locked( grpc_pollset* pollset, grpc_fd* fd) { static const char* err_desc = "pollset_transition_pollable_from_empty_to_fd"; - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; if (GRPC_TRACE_FLAG_ENABLED(grpc_polling_trace)) { gpr_log(GPR_INFO, "PS:%p add fd %p (%d); transition pollable from empty to fd", @@ -1171,10 +1172,10 @@ static grpc_error* pollset_transition_pollable_from_empty_to_fd_locked( return error; } -static grpc_error* pollset_transition_pollable_from_fd_to_multi_locked( +static grpc_error_handle pollset_transition_pollable_from_fd_to_multi_locked( grpc_pollset* pollset, grpc_fd* and_add_fd) { static const char* err_desc = "pollset_transition_pollable_from_fd_to_multi"; - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; if (GRPC_TRACE_FLAG_ENABLED(grpc_polling_trace)) { gpr_log( GPR_INFO, @@ -1200,8 +1201,9 @@ static grpc_error* pollset_transition_pollable_from_fd_to_multi_locked( } /* expects pollsets locked, flag whether fd is locked or not */ -static grpc_error* pollset_add_fd_locked(grpc_pollset* pollset, grpc_fd* fd) { - grpc_error* error = GRPC_ERROR_NONE; +static grpc_error_handle pollset_add_fd_locked(grpc_pollset* pollset, + grpc_fd* fd) { + grpc_error_handle error = GRPC_ERROR_NONE; pollable* po_at_start = POLLABLE_REF(pollset->active_pollable, "pollset_add_fd"); switch (pollset->active_pollable->type) { @@ -1236,9 +1238,9 @@ static grpc_error* pollset_add_fd_locked(grpc_pollset* pollset, grpc_fd* fd) { return error; } -static grpc_error* pollset_as_multipollable_locked(grpc_pollset* pollset, - pollable** pollable_obj) { - grpc_error* error = GRPC_ERROR_NONE; +static grpc_error_handle pollset_as_multipollable_locked( + grpc_pollset* pollset, pollable** pollable_obj) { + grpc_error_handle error = GRPC_ERROR_NONE; pollable* po_at_start = POLLABLE_REF(pollset->active_pollable, "pollset_as_multipollable"); switch (pollset->active_pollable->type) { @@ -1296,8 +1298,8 @@ static void pollset_add_fd(grpc_pollset* pollset, grpc_fd* fd) { return; } - grpc_core::MutexLock lock(&pollset->mu); - grpc_error* error = pollset_add_fd_locked(pollset, fd); + grpc_core::MutexLockForGprMu lock(&pollset->mu); + grpc_error_handle error = pollset_add_fd_locked(pollset, fd); // If we are in PO_MULTI mode, we should update the pollsets of the FD. if (gpr_atm_no_barrier_load(&pollset->active_pollable_type) == PO_MULTI) { @@ -1354,7 +1356,7 @@ static void pollset_set_add_fd(grpc_pollset_set* pss, grpc_fd* fd) { if (GRPC_TRACE_FLAG_ENABLED(grpc_polling_trace)) { gpr_log(GPR_INFO, "PSS:%p: add fd %p (%d)", pss, fd, fd->fd); } - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; static const char* err_desc = "pollset_set_add_fd"; pss = pss_lock_adam(pss); for (size_t i = 0; i < pss->pollset_count; i++) { @@ -1421,13 +1423,14 @@ static void pollset_set_del_pollset(grpc_pollset_set* pss, grpc_pollset* ps) { // add all fds to pollables, and output a new array of unorphaned out_fds // assumes pollsets are multipollable -static grpc_error* add_fds_to_pollsets(grpc_fd** fds, size_t fd_count, - grpc_pollset** pollsets, - size_t pollset_count, - const char* err_desc, grpc_fd** out_fds, - size_t* out_fd_count) { +static grpc_error_handle add_fds_to_pollsets(grpc_fd** fds, size_t fd_count, + grpc_pollset** pollsets, + size_t pollset_count, + const char* err_desc, + grpc_fd** out_fds, + size_t* out_fd_count) { GPR_TIMER_SCOPE("add_fds_to_pollsets", 0); - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; for (size_t i = 0; i < fd_count; i++) { gpr_mu_lock(&fds[i]->orphan_mu); if ((gpr_atm_no_barrier_load(&fds[i]->refst) & 1) == 0) { @@ -1451,7 +1454,7 @@ static void pollset_set_add_pollset(grpc_pollset_set* pss, grpc_pollset* ps) { if (GRPC_TRACE_FLAG_ENABLED(grpc_polling_trace)) { gpr_log(GPR_INFO, "PSS:%p: add pollset %p", pss, ps); } - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; static const char* err_desc = "pollset_set_add_pollset"; pollable* pollable_obj = nullptr; gpr_mu_lock(&ps->mu); @@ -1488,7 +1491,7 @@ static void pollset_set_add_pollset_set(grpc_pollset_set* a, if (GRPC_TRACE_FLAG_ENABLED(grpc_polling_trace)) { gpr_log(GPR_INFO, "PSS: merge (%p, %p)", a, b); } - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; static const char* err_desc = "pollset_set_add_fd"; for (;;) { if (a == b) { @@ -1573,7 +1576,7 @@ static bool is_any_background_poller_thread(void) { return false; } static void shutdown_background_closure(void) {} static bool add_closure_to_background_poller(grpc_closure* /*closure*/, - grpc_error* /*error*/) { + grpc_error_handle /*error*/) { return false; } diff --git a/grpc/src/core/lib/iomgr/ev_poll_posix.cc b/grpc/src/core/lib/iomgr/ev_poll_posix.cc index e58d1d39..fa4242f3 100644 --- a/grpc/src/core/lib/iomgr/ev_poll_posix.cc +++ b/grpc/src/core/lib/iomgr/ev_poll_posix.cc @@ -89,7 +89,7 @@ struct grpc_fd { int closed; int released; gpr_atm pollhup; - grpc_error* shutdown_error; + grpc_error_handle shutdown_error; /* The watcher list. @@ -230,9 +230,9 @@ static int poll_deadline_to_millis_timeout(grpc_millis deadline); #define GRPC_POLLSET_REEVALUATE_POLLING_ON_WAKEUP 2 /* As per pollset_kick, with an extended set of flags (defined above) -- mostly for fd_posix's use. */ -static grpc_error* pollset_kick_ext(grpc_pollset* p, - grpc_pollset_worker* specific_worker, - uint32_t flags) GRPC_MUST_USE_RESULT; +static grpc_error_handle pollset_kick_ext(grpc_pollset* p, + grpc_pollset_worker* specific_worker, + uint32_t flags) GRPC_MUST_USE_RESULT; /* Return 1 if the pollset has active threads in pollset_work (pollset must * be locked) */ @@ -394,11 +394,12 @@ static bool fd_is_orphaned(grpc_fd* fd) { return (gpr_atm_acq_load(&fd->refst) & 1) == 0; } -static grpc_error* pollset_kick_locked(grpc_fd_watcher* watcher) { +static grpc_error_handle pollset_kick_locked(grpc_fd_watcher* watcher) { gpr_mu_lock(&watcher->pollset->mu); GPR_ASSERT(watcher->worker); - grpc_error* err = pollset_kick_ext(watcher->pollset, watcher->worker, - GRPC_POLLSET_REEVALUATE_POLLING_ON_WAKEUP); + grpc_error_handle err = + pollset_kick_ext(watcher->pollset, watcher->worker, + GRPC_POLLSET_REEVALUATE_POLLING_ON_WAKEUP); gpr_mu_unlock(&watcher->pollset->mu); return err; } @@ -484,7 +485,7 @@ static void fd_ref(grpc_fd* fd) { ref_by(fd, 2); } static void fd_unref(grpc_fd* fd) { unref_by(fd, 2); } #endif -static grpc_error* fd_shutdown_error(grpc_fd* fd) { +static grpc_error_handle fd_shutdown_error(grpc_fd* fd) { if (!fd->shutdown) { return GRPC_ERROR_NONE; } else { @@ -537,7 +538,7 @@ static int set_ready_locked(grpc_fd* fd, grpc_closure** st) { } } -static void fd_shutdown(grpc_fd* fd, grpc_error* why) { +static void fd_shutdown(grpc_fd* fd, grpc_error_handle why) { gpr_mu_lock(&fd->mu); /* only shutdown once */ if (!fd->shutdown) { @@ -747,7 +748,8 @@ static void push_front_worker(grpc_pollset* p, grpc_pollset_worker* worker) { worker->prev->next = worker->next->prev = worker; } -static void kick_append_error(grpc_error** composite, grpc_error* error) { +static void kick_append_error(grpc_error_handle* composite, + grpc_error_handle error) { if (error == GRPC_ERROR_NONE) return; if (*composite == GRPC_ERROR_NONE) { *composite = GRPC_ERROR_CREATE_FROM_STATIC_STRING("Kick Failure"); @@ -755,11 +757,11 @@ static void kick_append_error(grpc_error** composite, grpc_error* error) { *composite = grpc_error_add_child(*composite, error); } -static grpc_error* pollset_kick_ext(grpc_pollset* p, - grpc_pollset_worker* specific_worker, - uint32_t flags) { +static grpc_error_handle pollset_kick_ext(grpc_pollset* p, + grpc_pollset_worker* specific_worker, + uint32_t flags) { GPR_TIMER_SCOPE("pollset_kick_ext", 0); - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; GRPC_STATS_INC_POLLSET_KICK(); /* pollset->mu already held */ @@ -826,14 +828,14 @@ static grpc_error* pollset_kick_ext(grpc_pollset* p, return error; } -static grpc_error* pollset_kick(grpc_pollset* p, - grpc_pollset_worker* specific_worker) { +static grpc_error_handle pollset_kick(grpc_pollset* p, + grpc_pollset_worker* specific_worker) { return pollset_kick_ext(p, specific_worker, 0); } /* global state management */ -static grpc_error* pollset_global_init(void) { +static grpc_error_handle pollset_global_init(void) { gpr_tls_init(&g_current_thread_poller); gpr_tls_init(&g_current_thread_worker); return GRPC_ERROR_NONE; @@ -904,7 +906,8 @@ static void finish_shutdown(grpc_pollset* pollset) { GRPC_ERROR_NONE); } -static void work_combine_error(grpc_error** composite, grpc_error* error) { +static void work_combine_error(grpc_error_handle* composite, + grpc_error_handle error) { if (error == GRPC_ERROR_NONE) return; if (*composite == GRPC_ERROR_NONE) { *composite = GRPC_ERROR_CREATE_FROM_STATIC_STRING("pollset_work"); @@ -912,13 +915,13 @@ static void work_combine_error(grpc_error** composite, grpc_error* error) { *composite = grpc_error_add_child(*composite, error); } -static grpc_error* pollset_work(grpc_pollset* pollset, - grpc_pollset_worker** worker_hdl, - grpc_millis deadline) { +static grpc_error_handle pollset_work(grpc_pollset* pollset, + grpc_pollset_worker** worker_hdl, + grpc_millis deadline) { GPR_TIMER_SCOPE("pollset_work", 0); grpc_pollset_worker worker; if (worker_hdl) *worker_hdl = &worker; - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; /* Avoid malloc for small number of elements. */ enum { inline_elements = 96 }; @@ -1336,7 +1339,7 @@ static bool is_any_background_poller_thread(void) { return false; } static void shutdown_background_closure(void) {} static bool add_closure_to_background_poller(grpc_closure* /*closure*/, - grpc_error* /*error*/) { + grpc_error_handle /*error*/) { return false; } diff --git a/grpc/src/core/lib/iomgr/ev_posix.cc b/grpc/src/core/lib/iomgr/ev_posix.cc index 3d32359b..dfb250f4 100644 --- a/grpc/src/core/lib/iomgr/ev_posix.cc +++ b/grpc/src/core/lib/iomgr/ev_posix.cc @@ -89,7 +89,7 @@ namespace { grpc_poll_function_type real_poll_function; -int dummy_poll(struct pollfd fds[], nfds_t nfds, int timeout) { +int phony_poll(struct pollfd fds[], nfds_t nfds, int timeout) { if (timeout == 0) { return real_poll_function(fds, nfds, 0); } else { @@ -103,10 +103,10 @@ const grpc_event_engine_vtable* init_non_polling(bool explicit_request) { if (!explicit_request) { return nullptr; } - // return the simplest engine as a dummy but also override the poller + // return the simplest engine as a phony but also override the poller auto ret = grpc_init_poll_posix(explicit_request); real_poll_function = grpc_poll_function; - grpc_poll_function = dummy_poll; + grpc_poll_function = phony_poll; return ret; } @@ -270,7 +270,7 @@ void grpc_fd_orphan(grpc_fd* fd, grpc_closure* on_done, int* release_fd, g_event_engine->fd_orphan(fd, on_done, release_fd, reason); } -void grpc_fd_shutdown(grpc_fd* fd, grpc_error* why) { +void grpc_fd_shutdown(grpc_fd* fd, grpc_error_handle why) { GRPC_POLLING_API_TRACE("fd_shutdown(%d)", grpc_fd_wrapped_fd(fd)); GRPC_FD_TRACE("fd_shutdown(%d)", grpc_fd_wrapped_fd(fd)); g_event_engine->fd_shutdown(fd, why); @@ -315,19 +315,20 @@ static void pollset_destroy(grpc_pollset* pollset) { g_event_engine->pollset_destroy(pollset); } -static grpc_error* pollset_work(grpc_pollset* pollset, - grpc_pollset_worker** worker, - grpc_millis deadline) { +static grpc_error_handle pollset_work(grpc_pollset* pollset, + grpc_pollset_worker** worker, + grpc_millis deadline) { GRPC_POLLING_API_TRACE("pollset_work(%p, %" PRId64 ") begin", pollset, deadline); - grpc_error* err = g_event_engine->pollset_work(pollset, worker, deadline); + grpc_error_handle err = + g_event_engine->pollset_work(pollset, worker, deadline); GRPC_POLLING_API_TRACE("pollset_work(%p, %" PRId64 ") end", pollset, deadline); return err; } -static grpc_error* pollset_kick(grpc_pollset* pollset, - grpc_pollset_worker* specific_worker) { +static grpc_error_handle pollset_kick(grpc_pollset* pollset, + grpc_pollset_worker* specific_worker) { GRPC_POLLING_API_TRACE("pollset_kick(%p, %p)", pollset, specific_worker); return g_event_engine->pollset_kick(pollset, specific_worker); } @@ -406,7 +407,7 @@ bool grpc_is_any_background_poller_thread(void) { } bool grpc_add_closure_to_background_poller(grpc_closure* closure, - grpc_error* error) { + grpc_error_handle error) { return g_event_engine->add_closure_to_background_poller(closure, error); } diff --git a/grpc/src/core/lib/iomgr/ev_posix.h b/grpc/src/core/lib/iomgr/ev_posix.h index 84edabce..479921ae 100644 --- a/grpc/src/core/lib/iomgr/ev_posix.h +++ b/grpc/src/core/lib/iomgr/ev_posix.h @@ -52,7 +52,7 @@ typedef struct grpc_event_engine_vtable { int (*fd_wrapped_fd)(grpc_fd* fd); void (*fd_orphan)(grpc_fd* fd, grpc_closure* on_done, int* release_fd, const char* reason); - void (*fd_shutdown)(grpc_fd* fd, grpc_error* why); + void (*fd_shutdown)(grpc_fd* fd, grpc_error_handle why); void (*fd_notify_on_read)(grpc_fd* fd, grpc_closure* closure); void (*fd_notify_on_write)(grpc_fd* fd, grpc_closure* closure); void (*fd_notify_on_error)(grpc_fd* fd, grpc_closure* closure); @@ -64,11 +64,11 @@ typedef struct grpc_event_engine_vtable { void (*pollset_init)(grpc_pollset* pollset, gpr_mu** mu); void (*pollset_shutdown)(grpc_pollset* pollset, grpc_closure* closure); void (*pollset_destroy)(grpc_pollset* pollset); - grpc_error* (*pollset_work)(grpc_pollset* pollset, - grpc_pollset_worker** worker, - grpc_millis deadline); - grpc_error* (*pollset_kick)(grpc_pollset* pollset, - grpc_pollset_worker* specific_worker); + grpc_error_handle (*pollset_work)(grpc_pollset* pollset, + grpc_pollset_worker** worker, + grpc_millis deadline); + grpc_error_handle (*pollset_kick)(grpc_pollset* pollset, + grpc_pollset_worker* specific_worker); void (*pollset_add_fd)(grpc_pollset* pollset, struct grpc_fd* fd); grpc_pollset_set* (*pollset_set_create)(void); @@ -88,7 +88,7 @@ typedef struct grpc_event_engine_vtable { void (*shutdown_background_closure)(void); void (*shutdown_engine)(void); bool (*add_closure_to_background_poller)(grpc_closure* closure, - grpc_error* error); + grpc_error_handle error); } grpc_event_engine_vtable; /* register a new event engine factory */ @@ -139,7 +139,7 @@ void grpc_fd_orphan(grpc_fd* fd, grpc_closure* on_done, int* release_fd, bool grpc_fd_is_shutdown(grpc_fd* fd); /* Cause any current and future callbacks to fail. */ -void grpc_fd_shutdown(grpc_fd* fd, grpc_error* why); +void grpc_fd_shutdown(grpc_fd* fd, grpc_error_handle why); /* Register read interest, causing read_cb to be called once when fd becomes readable, on deadline specified by deadline, or on shutdown triggered by @@ -195,7 +195,7 @@ bool grpc_is_any_background_poller_thread(); * that the closure may or may not run yet when this function returns, and the * closure should not be blocking or long-running. */ bool grpc_add_closure_to_background_poller(grpc_closure* closure, - grpc_error* error); + grpc_error_handle error); /* Shut down all the closures registered in the background poller. */ void grpc_shutdown_background_closure(); diff --git a/grpc/src/core/lib/iomgr/exec_ctx.cc b/grpc/src/core/lib/iomgr/exec_ctx.cc index 18d0aae4..54ab9fda 100644 --- a/grpc/src/core/lib/iomgr/exec_ctx.cc +++ b/grpc/src/core/lib/iomgr/exec_ctx.cc @@ -27,7 +27,7 @@ #include "src/core/lib/iomgr/combiner.h" #include "src/core/lib/profiling/timers.h" -static void exec_ctx_run(grpc_closure* closure, grpc_error* error) { +static void exec_ctx_run(grpc_closure* closure, grpc_error_handle error) { #ifndef NDEBUG closure->scheduled = false; if (grpc_trace_closure.enabled()) { @@ -46,7 +46,7 @@ static void exec_ctx_run(grpc_closure* closure, grpc_error* error) { GRPC_ERROR_UNREF(error); } -static void exec_ctx_sched(grpc_closure* closure, grpc_error* error) { +static void exec_ctx_sched(grpc_closure* closure, grpc_error_handle error) { grpc_closure_list_append(grpc_core::ExecCtx::Get()->closure_list(), closure, error); } @@ -58,7 +58,9 @@ static grpc_millis timespan_to_millis_round_down(gpr_timespec ts) { double x = GPR_MS_PER_SEC * static_cast<double>(ts.tv_sec) + static_cast<double>(ts.tv_nsec) / GPR_NS_PER_MS; if (x < 0) return 0; - if (x > GRPC_MILLIS_INF_FUTURE) return GRPC_MILLIS_INF_FUTURE; + if (x > static_cast<double>(GRPC_MILLIS_INF_FUTURE)) { + return GRPC_MILLIS_INF_FUTURE; + } return static_cast<grpc_millis>(x); } @@ -72,7 +74,9 @@ static grpc_millis timespan_to_millis_round_up(gpr_timespec ts) { static_cast<double>(GPR_NS_PER_SEC - 1) / static_cast<double>(GPR_NS_PER_SEC); if (x < 0) return 0; - if (x > GRPC_MILLIS_INF_FUTURE) return GRPC_MILLIS_INF_FUTURE; + if (x > static_cast<double>(GRPC_MILLIS_INF_FUTURE)) { + return GRPC_MILLIS_INF_FUTURE; + } return static_cast<grpc_millis>(x); } @@ -148,7 +152,7 @@ bool ExecCtx::Flush() { closure_list_.head = closure_list_.tail = nullptr; while (c != nullptr) { grpc_closure* next = c->next_data.next; - grpc_error* error = c->error_data.error; + grpc_error_handle error = c->error_data.error; did_something = true; exec_ctx_run(c, error); c = next; @@ -170,7 +174,7 @@ grpc_millis ExecCtx::Now() { } void ExecCtx::Run(const DebugLocation& location, grpc_closure* closure, - grpc_error* error) { + grpc_error_handle error) { (void)location; if (closure == nullptr) { GRPC_ERROR_UNREF(error); diff --git a/grpc/src/core/lib/iomgr/exec_ctx.h b/grpc/src/core/lib/iomgr/exec_ctx.h index c993133e..9cb52575 100644 --- a/grpc/src/core/lib/iomgr/exec_ctx.h +++ b/grpc/src/core/lib/iomgr/exec_ctx.h @@ -228,7 +228,7 @@ class ExecCtx { } static void Run(const DebugLocation& location, grpc_closure* closure, - grpc_error* error); + grpc_error_handle error); static void RunList(const DebugLocation& location, grpc_closure_list* list); diff --git a/grpc/src/core/lib/iomgr/executor.cc b/grpc/src/core/lib/iomgr/executor.cc index b1d21bc9..3d8d757b 100644 --- a/grpc/src/core/lib/iomgr/executor.cc +++ b/grpc/src/core/lib/iomgr/executor.cc @@ -57,27 +57,27 @@ GPR_TLS_DECL(g_this_thread_state); Executor* executors[static_cast<size_t>(ExecutorType::NUM_EXECUTORS)]; -void default_enqueue_short(grpc_closure* closure, grpc_error* error) { +void default_enqueue_short(grpc_closure* closure, grpc_error_handle error) { executors[static_cast<size_t>(ExecutorType::DEFAULT)]->Enqueue( closure, error, true /* is_short */); } -void default_enqueue_long(grpc_closure* closure, grpc_error* error) { +void default_enqueue_long(grpc_closure* closure, grpc_error_handle error) { executors[static_cast<size_t>(ExecutorType::DEFAULT)]->Enqueue( closure, error, false /* is_short */); } -void resolver_enqueue_short(grpc_closure* closure, grpc_error* error) { +void resolver_enqueue_short(grpc_closure* closure, grpc_error_handle error) { executors[static_cast<size_t>(ExecutorType::RESOLVER)]->Enqueue( closure, error, true /* is_short */); } -void resolver_enqueue_long(grpc_closure* closure, grpc_error* error) { +void resolver_enqueue_long(grpc_closure* closure, grpc_error_handle error) { executors[static_cast<size_t>(ExecutorType::RESOLVER)]->Enqueue( closure, error, false /* is_short */); } -using EnqueueFunc = void (*)(grpc_closure* closure, grpc_error* error); +using EnqueueFunc = void (*)(grpc_closure* closure, grpc_error_handle error); const EnqueueFunc executor_enqueue_fns_[static_cast<size_t>(ExecutorType::NUM_EXECUTORS)] @@ -115,7 +115,7 @@ size_t Executor::RunClosures(const char* executor_name, grpc_closure* c = list.head; while (c != nullptr) { grpc_closure* next = c->next_data.next; - grpc_error* error = c->error_data.error; + grpc_error_handle error = c->error_data.error; #ifndef NDEBUG EXECUTOR_TRACE("(%s) run %p [created by %s:%d]", executor_name, c, c->file_created, c->line_created); @@ -251,7 +251,7 @@ void Executor::ThreadMain(void* arg) { gpr_tls_set(&g_this_thread_state, reinterpret_cast<intptr_t>(nullptr)); } -void Executor::Enqueue(grpc_closure* closure, grpc_error* error, +void Executor::Enqueue(grpc_closure* closure, grpc_error_handle error, bool is_short) { bool retry_push; if (is_short) { @@ -404,7 +404,7 @@ void Executor::InitAll() { EXECUTOR_TRACE0("Executor::InitAll() done"); } -void Executor::Run(grpc_closure* closure, grpc_error* error, +void Executor::Run(grpc_closure* closure, grpc_error_handle error, ExecutorType executor_type, ExecutorJobType job_type) { executor_enqueue_fns_[static_cast<size_t>(executor_type)] [static_cast<size_t>(job_type)](closure, error); diff --git a/grpc/src/core/lib/iomgr/executor.h b/grpc/src/core/lib/iomgr/executor.h index 7a5d16b9..37e5c1e5 100644 --- a/grpc/src/core/lib/iomgr/executor.h +++ b/grpc/src/core/lib/iomgr/executor.h @@ -70,7 +70,7 @@ class Executor { /** Enqueue the closure onto the executor. is_short is true if the closure is * a short job (i.e expected to not block and complete quickly) */ - void Enqueue(grpc_closure* closure, grpc_error* error, bool is_short); + void Enqueue(grpc_closure* closure, grpc_error_handle error, bool is_short); // TODO(sreek): Currently we have two executors (available globally): The // default executor and the resolver executor. @@ -83,7 +83,7 @@ class Executor { // Initialize ALL the executors static void InitAll(); - static void Run(grpc_closure* closure, grpc_error* error, + static void Run(grpc_closure* closure, grpc_error_handle error, ExecutorType executor_type = ExecutorType::DEFAULT, ExecutorJobType job_type = ExecutorJobType::SHORT); diff --git a/grpc/src/core/lib/iomgr/iomgr.cc b/grpc/src/core/lib/iomgr/iomgr.cc index 02646db4..1210bd70 100644 --- a/grpc/src/core/lib/iomgr/iomgr.cc +++ b/grpc/src/core/lib/iomgr/iomgr.cc @@ -169,7 +169,7 @@ bool grpc_iomgr_is_any_background_poller_thread() { } bool grpc_iomgr_add_closure_to_background_poller(grpc_closure* closure, - grpc_error* error) { + grpc_error_handle error) { return grpc_iomgr_platform_add_closure_to_background_poller(closure, error); } diff --git a/grpc/src/core/lib/iomgr/iomgr.h b/grpc/src/core/lib/iomgr/iomgr.h index e02f15e5..9af0557e 100644 --- a/grpc/src/core/lib/iomgr/iomgr.h +++ b/grpc/src/core/lib/iomgr/iomgr.h @@ -52,7 +52,7 @@ bool grpc_iomgr_is_any_background_poller_thread(); * that the closure may or may not run yet when this function returns, and the * closure should not be blocking or long-running. */ bool grpc_iomgr_add_closure_to_background_poller(grpc_closure* closure, - grpc_error* error); + grpc_error_handle error); /* Exposed only for testing */ size_t grpc_iomgr_count_objects_for_testing(); diff --git a/grpc/src/core/lib/iomgr/iomgr_custom.cc b/grpc/src/core/lib/iomgr/iomgr_custom.cc index 684044a5..9a9f06a5 100644 --- a/grpc/src/core/lib/iomgr/iomgr_custom.cc +++ b/grpc/src/core/lib/iomgr/iomgr_custom.cc @@ -45,7 +45,7 @@ static bool iomgr_platform_is_any_background_poller_thread(void) { return false; } static bool iomgr_platform_add_closure_to_background_poller( - grpc_closure* /*closure*/, grpc_error* /*error*/) { + grpc_closure* /*closure*/, grpc_error_handle /*error*/) { return false; } diff --git a/grpc/src/core/lib/iomgr/iomgr_internal.cc b/grpc/src/core/lib/iomgr/iomgr_internal.cc index 896d9fce..e5ce8ab3 100644 --- a/grpc/src/core/lib/iomgr/iomgr_internal.cc +++ b/grpc/src/core/lib/iomgr/iomgr_internal.cc @@ -50,8 +50,8 @@ bool grpc_iomgr_platform_is_any_background_poller_thread() { return iomgr_platform_vtable->is_any_background_poller_thread(); } -bool grpc_iomgr_platform_add_closure_to_background_poller(grpc_closure* closure, - grpc_error* error) { +bool grpc_iomgr_platform_add_closure_to_background_poller( + grpc_closure* closure, grpc_error_handle error) { return iomgr_platform_vtable->add_closure_to_background_poller(closure, error); } diff --git a/grpc/src/core/lib/iomgr/iomgr_internal.h b/grpc/src/core/lib/iomgr/iomgr_internal.h index 17607f98..01cd2483 100644 --- a/grpc/src/core/lib/iomgr/iomgr_internal.h +++ b/grpc/src/core/lib/iomgr/iomgr_internal.h @@ -38,7 +38,7 @@ typedef struct grpc_iomgr_platform_vtable { void (*shutdown_background_closure)(void); bool (*is_any_background_poller_thread)(void); bool (*add_closure_to_background_poller)(grpc_closure* closure, - grpc_error* error); + grpc_error_handle error); } grpc_iomgr_platform_vtable; void grpc_iomgr_register_object(grpc_iomgr_object* obj, const char* name); @@ -65,8 +65,8 @@ bool grpc_iomgr_platform_is_any_background_poller_thread(void); /** Return true if the closure is registered into the background poller. Note * that the closure may or may not run yet when this function returns, and the * closure should not be blocking or long-running. */ -bool grpc_iomgr_platform_add_closure_to_background_poller(grpc_closure* closure, - grpc_error* error); +bool grpc_iomgr_platform_add_closure_to_background_poller( + grpc_closure* closure, grpc_error_handle error); bool grpc_iomgr_abort_on_leaks(void); diff --git a/grpc/src/core/lib/iomgr/iomgr_posix.cc b/grpc/src/core/lib/iomgr/iomgr_posix.cc index de22d20a..0407e305 100644 --- a/grpc/src/core/lib/iomgr/iomgr_posix.cc +++ b/grpc/src/core/lib/iomgr/iomgr_posix.cc @@ -25,7 +25,6 @@ #include "src/core/lib/debug/trace.h" #include "src/core/lib/iomgr/ev_posix.h" #include "src/core/lib/iomgr/iomgr_internal.h" -#include "src/core/lib/iomgr/iomgr_posix.h" #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/tcp_client.h" #include "src/core/lib/iomgr/tcp_posix.h" @@ -60,7 +59,7 @@ static bool iomgr_platform_is_any_background_poller_thread(void) { } static bool iomgr_platform_add_closure_to_background_poller( - grpc_closure* closure, grpc_error* error) { + grpc_closure* closure, grpc_error_handle error) { return grpc_add_closure_to_background_poller(closure, error); } diff --git a/grpc/src/core/lib/iomgr/iomgr_posix.h b/grpc/src/core/lib/iomgr/iomgr_posix.h deleted file mode 100644 index 54ec46e1..00000000 --- a/grpc/src/core/lib/iomgr/iomgr_posix.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * - * Copyright 2015 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_IOMGR_IOMGR_POSIX_H -#define GRPC_CORE_LIB_IOMGR_IOMGR_POSIX_H - -#include <grpc/support/port_platform.h> - -#include "src/core/lib/iomgr/iomgr_internal.h" - -#endif /* GRPC_CORE_LIB_IOMGR_IOMGR_POSIX_H */ diff --git a/grpc/src/core/lib/iomgr/iomgr_posix_cfstream.cc b/grpc/src/core/lib/iomgr/iomgr_posix_cfstream.cc index 30c44edb..78b29851 100644 --- a/grpc/src/core/lib/iomgr/iomgr_posix_cfstream.cc +++ b/grpc/src/core/lib/iomgr/iomgr_posix_cfstream.cc @@ -40,7 +40,6 @@ #include "src/core/lib/iomgr/ev_apple.h" #include "src/core/lib/iomgr/ev_posix.h" #include "src/core/lib/iomgr/iomgr_internal.h" -#include "src/core/lib/iomgr/iomgr_posix.h" #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/tcp_client.h" #include "src/core/lib/iomgr/tcp_posix.h" @@ -73,7 +72,7 @@ static bool apple_iomgr_platform_is_any_background_poller_thread(void) { } static bool apple_iomgr_platform_add_closure_to_background_poller( - grpc_closure* closure, grpc_error* error) { + grpc_closure* closure, grpc_error_handle error) { return false; } @@ -106,7 +105,7 @@ static bool iomgr_platform_is_any_background_poller_thread(void) { } static bool iomgr_platform_add_closure_to_background_poller( - grpc_closure* closure, grpc_error* error) { + grpc_closure* closure, grpc_error_handle error) { return grpc_add_closure_to_background_poller(closure, error); } diff --git a/grpc/src/core/lib/iomgr/iomgr_windows.cc b/grpc/src/core/lib/iomgr/iomgr_windows.cc index 728d4040..df1207ae 100644 --- a/grpc/src/core/lib/iomgr/iomgr_windows.cc +++ b/grpc/src/core/lib/iomgr/iomgr_windows.cc @@ -79,7 +79,7 @@ static bool iomgr_platform_is_any_background_poller_thread(void) { } static bool iomgr_platform_add_closure_to_background_poller( - grpc_closure* closure, grpc_error* error) { + grpc_closure* closure, grpc_error_handle error) { return false; } diff --git a/grpc/src/core/lib/iomgr/load_file.cc b/grpc/src/core/lib/iomgr/load_file.cc index 4bed6275..a1878229 100644 --- a/grpc/src/core/lib/iomgr/load_file.cc +++ b/grpc/src/core/lib/iomgr/load_file.cc @@ -30,14 +30,14 @@ #include "src/core/lib/gpr/string.h" #include "src/core/lib/iomgr/block_annotate.h" -grpc_error* grpc_load_file(const char* filename, int add_null_terminator, - grpc_slice* output) { +grpc_error_handle grpc_load_file(const char* filename, int add_null_terminator, + grpc_slice* output) { unsigned char* contents = nullptr; size_t contents_size = 0; grpc_slice result = grpc_empty_slice(); FILE* file; size_t bytes_read = 0; - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; GRPC_SCHEDULING_START_BLOCKING_REGION; file = fopen(filename, "rb"); @@ -67,7 +67,7 @@ end: *output = result; if (file != nullptr) fclose(file); if (error != GRPC_ERROR_NONE) { - grpc_error* error_out = + grpc_error_handle error_out = grpc_error_set_str(GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Failed to load file", &error, 1), GRPC_ERROR_STR_FILENAME, diff --git a/grpc/src/core/lib/iomgr/load_file.h b/grpc/src/core/lib/iomgr/load_file.h index d7f8175a..a0206e21 100644 --- a/grpc/src/core/lib/iomgr/load_file.h +++ b/grpc/src/core/lib/iomgr/load_file.h @@ -29,7 +29,7 @@ /* Loads the content of a file into a slice. add_null_terminator will add a NULL terminator if non-zero. */ -grpc_error* grpc_load_file(const char* filename, int add_null_terminator, - grpc_slice* output); +grpc_error_handle grpc_load_file(const char* filename, int add_null_terminator, + grpc_slice* output); #endif /* GRPC_CORE_LIB_IOMGR_LOAD_FILE_H */ diff --git a/grpc/src/core/lib/iomgr/lockfree_event.cc b/grpc/src/core/lib/iomgr/lockfree_event.cc index b3fd8e0b..fa21406c 100644 --- a/grpc/src/core/lib/iomgr/lockfree_event.cc +++ b/grpc/src/core/lib/iomgr/lockfree_event.cc @@ -77,7 +77,7 @@ void LockfreeEvent::DestroyEvent() { do { curr = gpr_atm_no_barrier_load(&state_); if (curr & kShutdownBit) { - GRPC_ERROR_UNREF((grpc_error*)(curr & ~kShutdownBit)); + GRPC_ERROR_UNREF((grpc_error_handle)(curr & ~kShutdownBit)); } else { GPR_ASSERT(curr == kClosureNotReady || curr == kClosureReady); } @@ -139,8 +139,8 @@ void LockfreeEvent::NotifyOn(grpc_closure* closure) { contains a pointer to the shutdown-error). If the fd is shutdown, schedule the closure with the shutdown error */ if ((curr & kShutdownBit) > 0) { - grpc_error* shutdown_err = - reinterpret_cast<grpc_error*>(curr & ~kShutdownBit); + grpc_error_handle shutdown_err = + reinterpret_cast<grpc_error_handle>(curr & ~kShutdownBit); ExecCtx::Run(DEBUG_LOCATION, closure, GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "FD Shutdown", &shutdown_err, 1)); @@ -159,7 +159,7 @@ void LockfreeEvent::NotifyOn(grpc_closure* closure) { GPR_UNREACHABLE_CODE(return ); } -bool LockfreeEvent::SetShutdown(grpc_error* shutdown_error) { +bool LockfreeEvent::SetShutdown(grpc_error_handle shutdown_error) { gpr_atm new_state = reinterpret_cast<gpr_atm>(shutdown_error) | kShutdownBit; while (true) { @@ -167,7 +167,7 @@ bool LockfreeEvent::SetShutdown(grpc_error* shutdown_error) { if (GRPC_TRACE_FLAG_ENABLED(grpc_polling_trace)) { gpr_log(GPR_DEBUG, "LockfreeEvent::SetShutdown: %p curr=%" PRIxPTR " err=%s", - &state_, curr, grpc_error_string(shutdown_error)); + &state_, curr, grpc_error_std_string(shutdown_error).c_str()); } switch (curr) { case kClosureReady: diff --git a/grpc/src/core/lib/iomgr/lockfree_event.h b/grpc/src/core/lib/iomgr/lockfree_event.h index f7e85540..944f364b 100644 --- a/grpc/src/core/lib/iomgr/lockfree_event.h +++ b/grpc/src/core/lib/iomgr/lockfree_event.h @@ -56,7 +56,7 @@ class LockfreeEvent { // Sets the shutdown state. If a closure had been provided by NotifyOn and has // not yet been scheduled, it will be scheduled with \a shutdown_error. - bool SetShutdown(grpc_error* shutdown_error); + bool SetShutdown(grpc_error_handle shutdown_error); // Signals that the event has been received. void SetReady(); diff --git a/grpc/src/core/lib/iomgr/poller/eventmanager_interface.h b/grpc/src/core/lib/iomgr/poller/eventmanager_interface.h deleted file mode 100644 index b4fbaeb7..00000000 --- a/grpc/src/core/lib/iomgr/poller/eventmanager_interface.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * - * Copyright 2019 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_IOMGR_POLLER_EVENTMANAGER_INTERFACE_H -#define GRPC_CORE_LIB_IOMGR_POLLER_EVENTMANAGER_INTERFACE_H - -namespace grpc { -namespace experimental { - -class BaseEventManagerInterface { - public: - virtual ~BaseEventManagerInterface() {} -}; - -class EpollEventManagerInterface : public BaseEventManagerInterface {}; - -} // namespace experimental -} // namespace grpc - -#endif /* GRPC_CORE_LIB_IOMGR_POLLER_EVENTMANAGER_INTERFACE_H */ diff --git a/grpc/src/core/lib/iomgr/poller/eventmanager_libuv.cc b/grpc/src/core/lib/iomgr/poller/eventmanager_libuv.cc deleted file mode 100644 index c34430ae..00000000 --- a/grpc/src/core/lib/iomgr/poller/eventmanager_libuv.cc +++ /dev/null @@ -1,88 +0,0 @@ -/* - * - * Copyright 2019 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/lib/iomgr/poller/eventmanager_libuv.h" - -#include <grpc/support/time.h> - -grpc::experimental::LibuvEventManager::Options::Options() : num_workers_(-1) {} -grpc::experimental::LibuvEventManager::Options::Options(int num_workers) - : num_workers_(num_workers) {} - -grpc::experimental::LibuvEventManager::LibuvEventManager(const Options& options) - : options_(options) { - int num_workers = options_.num_workers(); - // Number of workers can't be 0 if we do not accept thread donation. - // TODO(guantaol): replaces the hard-coded number with a flag. - if (num_workers <= 0) num_workers = 32; - - for (int i = 0; i < num_workers; i++) { - workers_.emplace_back( - options_.thread_name_prefix().c_str(), - [](void* em) { static_cast<LibuvEventManager*>(em)->RunWorkerLoop(); }, - this); - workers_.back().Start(); - } -} - -grpc::experimental::LibuvEventManager::~LibuvEventManager() { - Shutdown(); - for (auto& th : workers_) { - th.Join(); - } -} - -void grpc::experimental::LibuvEventManager::RunWorkerLoop() { - while (true) { - // TODO(guantaol): extend the worker loop with real work. - if (ShouldStop()) return; - gpr_sleep_until(gpr_time_add(gpr_now(GPR_CLOCK_MONOTONIC), - gpr_time_from_micros(10, GPR_TIMESPAN))); - } -} - -bool grpc::experimental::LibuvEventManager::ShouldStop() { - return should_stop_.Load(grpc_core::MemoryOrder::ACQUIRE) != 0; -} - -void grpc::experimental::LibuvEventManager::Shutdown() { - if (should_stop_.Load(grpc_core::MemoryOrder::ACQUIRE)) { - return; // Already shut down. - } - - { - grpc_core::MutexLock lock(&shutdown_mu_); - while (shutdown_refcount_.Load(grpc_core::MemoryOrder::ACQUIRE) > 0) { - shutdown_cv_.Wait(&shutdown_mu_); - } - } - should_stop_.Store(true, grpc_core::MemoryOrder::RELEASE); -} - -void grpc::experimental::LibuvEventManager::ShutdownRef() { - shutdown_refcount_.FetchAdd(1, grpc_core::MemoryOrder::RELAXED); -} - -void grpc::experimental::LibuvEventManager::ShutdownUnref() { - if (shutdown_refcount_.FetchSub(1, grpc_core::MemoryOrder::ACQ_REL) == 1) { - grpc_core::MutexLock lock(&shutdown_mu_); - shutdown_cv_.Signal(); - } -} diff --git a/grpc/src/core/lib/iomgr/poller/eventmanager_libuv.h b/grpc/src/core/lib/iomgr/poller/eventmanager_libuv.h deleted file mode 100644 index 0bd0ecc4..00000000 --- a/grpc/src/core/lib/iomgr/poller/eventmanager_libuv.h +++ /dev/null @@ -1,88 +0,0 @@ -/* - * - * Copyright 2019 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_IOMGR_POLLER_EVENTMANAGER_LIBUV_H -#define GRPC_CORE_LIB_IOMGR_POLLER_EVENTMANAGER_LIBUV_H - -#include <grpc/support/port_platform.h> - -#include <string> -#include <vector> - -#include "src/core/lib/gprpp/atomic.h" -#include "src/core/lib/gprpp/sync.h" -#include "src/core/lib/gprpp/thd.h" - -namespace grpc { -namespace experimental { - -class LibuvEventManager { - public: - class Options { - public: - Options(); - explicit Options(int num_workers); - - int num_workers() const { return num_workers_; } - void set_num_workers(int num) { num_workers_ = num; } - - const std::string& thread_name_prefix() const { - return thread_name_prefix_; - } - void set_thread_name_prefix(const std::string& name) { - thread_name_prefix_ = name; - } - - private: - // Number of worker threads to create at startup. If less than 0, uses the - // default value of 32. - int num_workers_; - // Name prefix used for worker. - std::string thread_name_prefix_; - }; - - explicit LibuvEventManager(const Options& options); - virtual ~LibuvEventManager(); - - void Shutdown(); - void ShutdownRef(); - void ShutdownUnref(); - - private: - // Function run by the worker threads. - void RunWorkerLoop(); - - // Whether the EventManager has been shut down. - bool ShouldStop(); - - const Options options_; - // Whether the EventManager workers should be stopped. - grpc_core::Atomic<bool> should_stop_{false}; - // A refcount preventing the EventManager from shutdown. - grpc_core::Atomic<int> shutdown_refcount_{0}; - // Worker threads of the EventManager. - std::vector<grpc_core::Thread> workers_; - // Mutex and condition variable used for shutdown. - grpc_core::Mutex shutdown_mu_; - grpc_core::CondVar shutdown_cv_; -}; - -} // namespace experimental -} // namespace grpc - -#endif /* GRPC_CORE_LIB_IOMGR_POLLER_EVENTMANAGER_LIBUV_H */ diff --git a/grpc/src/core/lib/iomgr/pollset.cc b/grpc/src/core/lib/iomgr/pollset.cc index ebfef1db..ba2a58d8 100644 --- a/grpc/src/core/lib/iomgr/pollset.cc +++ b/grpc/src/core/lib/iomgr/pollset.cc @@ -42,14 +42,14 @@ void grpc_pollset_destroy(grpc_pollset* pollset) { grpc_pollset_impl->destroy(pollset); } -grpc_error* grpc_pollset_work(grpc_pollset* pollset, - grpc_pollset_worker** worker, - grpc_millis deadline) { +grpc_error_handle grpc_pollset_work(grpc_pollset* pollset, + grpc_pollset_worker** worker, + grpc_millis deadline) { return grpc_pollset_impl->work(pollset, worker, deadline); } -grpc_error* grpc_pollset_kick(grpc_pollset* pollset, - grpc_pollset_worker* specific_worker) { +grpc_error_handle grpc_pollset_kick(grpc_pollset* pollset, + grpc_pollset_worker* specific_worker) { return grpc_pollset_impl->kick(pollset, specific_worker); } diff --git a/grpc/src/core/lib/iomgr/pollset.h b/grpc/src/core/lib/iomgr/pollset.h index 28472b36..7c87a827 100644 --- a/grpc/src/core/lib/iomgr/pollset.h +++ b/grpc/src/core/lib/iomgr/pollset.h @@ -44,10 +44,10 @@ typedef struct grpc_pollset_vtable { void (*init)(grpc_pollset* pollset, gpr_mu** mu); void (*shutdown)(grpc_pollset* pollset, grpc_closure* closure); void (*destroy)(grpc_pollset* pollset); - grpc_error* (*work)(grpc_pollset* pollset, grpc_pollset_worker** worker, - grpc_millis deadline); - grpc_error* (*kick)(grpc_pollset* pollset, - grpc_pollset_worker* specific_worker); + grpc_error_handle (*work)(grpc_pollset* pollset, grpc_pollset_worker** worker, + grpc_millis deadline); + grpc_error_handle (*kick)(grpc_pollset* pollset, + grpc_pollset_worker* specific_worker); size_t (*pollset_size)(void); } grpc_pollset_vtable; @@ -86,14 +86,14 @@ void grpc_pollset_destroy(grpc_pollset* pollset); May call grpc_closure_list_run on grpc_closure_list, without holding the pollset lock */ -grpc_error* grpc_pollset_work(grpc_pollset* pollset, - grpc_pollset_worker** worker, - grpc_millis deadline) GRPC_MUST_USE_RESULT; +grpc_error_handle grpc_pollset_work(grpc_pollset* pollset, + grpc_pollset_worker** worker, + grpc_millis deadline) GRPC_MUST_USE_RESULT; /* Break one polling thread out of polling work for this pollset. If specific_worker is non-NULL, then kick that worker. */ -grpc_error* grpc_pollset_kick(grpc_pollset* pollset, - grpc_pollset_worker* specific_worker) +grpc_error_handle grpc_pollset_kick(grpc_pollset* pollset, + grpc_pollset_worker* specific_worker) GRPC_MUST_USE_RESULT; #endif /* GRPC_CORE_LIB_IOMGR_POLLSET_H */ diff --git a/grpc/src/core/lib/iomgr/pollset_custom.cc b/grpc/src/core/lib/iomgr/pollset_custom.cc index 98c8e64e..62c4b397 100644 --- a/grpc/src/core/lib/iomgr/pollset_custom.cc +++ b/grpc/src/core/lib/iomgr/pollset_custom.cc @@ -63,9 +63,9 @@ static void pollset_destroy(grpc_pollset* pollset) { gpr_mu_destroy(&pollset->mu); } -static grpc_error* pollset_work(grpc_pollset* pollset, - grpc_pollset_worker** /*worker_hdl*/, - grpc_millis deadline) { +static grpc_error_handle pollset_work(grpc_pollset* pollset, + grpc_pollset_worker** /*worker_hdl*/, + grpc_millis deadline) { GRPC_CUSTOM_IOMGR_ASSERT_SAME_THREAD(); gpr_mu_unlock(&pollset->mu); grpc_millis now = grpc_core::ExecCtx::Get()->Now(); @@ -87,8 +87,8 @@ static grpc_error* pollset_work(grpc_pollset* pollset, return GRPC_ERROR_NONE; } -static grpc_error* pollset_kick(grpc_pollset* /*pollset*/, - grpc_pollset_worker* /*specific_worker*/) { +static grpc_error_handle pollset_kick( + grpc_pollset* /*pollset*/, grpc_pollset_worker* /*specific_worker*/) { GRPC_CUSTOM_IOMGR_ASSERT_SAME_THREAD(); poller_vtable->kick(); return GRPC_ERROR_NONE; diff --git a/grpc/src/core/lib/iomgr/pollset_windows.cc b/grpc/src/core/lib/iomgr/pollset_windows.cc index 184c330c..f8758a3f 100644 --- a/grpc/src/core/lib/iomgr/pollset_windows.cc +++ b/grpc/src/core/lib/iomgr/pollset_windows.cc @@ -106,9 +106,9 @@ static void pollset_shutdown(grpc_pollset* pollset, grpc_closure* closure) { static void pollset_destroy(grpc_pollset* pollset) {} -static grpc_error* pollset_work(grpc_pollset* pollset, - grpc_pollset_worker** worker_hdl, - grpc_millis deadline) { +static grpc_error_handle pollset_work(grpc_pollset* pollset, + grpc_pollset_worker** worker_hdl, + grpc_millis deadline) { grpc_pollset_worker worker; if (worker_hdl) *worker_hdl = &worker; @@ -183,8 +183,8 @@ done: return GRPC_ERROR_NONE; } -static grpc_error* pollset_kick(grpc_pollset* p, - grpc_pollset_worker* specific_worker) { +static grpc_error_handle pollset_kick(grpc_pollset* p, + grpc_pollset_worker* specific_worker) { bool should_kick_global = false; if (specific_worker != NULL) { if (specific_worker == GRPC_POLLSET_KICK_BROADCAST) { diff --git a/grpc/src/core/lib/iomgr/port.h b/grpc/src/core/lib/iomgr/port.h index 2a8d67b2..8d3cd98b 100644 --- a/grpc/src/core/lib/iomgr/port.h +++ b/grpc/src/core/lib/iomgr/port.h @@ -192,7 +192,7 @@ defined(GRPC_CUSTOM_SOCKET) + defined(GRPC_CFSTREAM) != \ 1 #error \ - "Must define exactly one of GRPC_POSIX_SOCKET, GRPC_WINSOCK_SOCKET, GRPC_CUSTOM_SOCKET" + "Must define exactly one of GRPC_POSIX_SOCKET, GRPC_WINSOCK_SOCKET, GRPC_CUSTOM_SOCKET, GRPC_CFSTREAM" #endif #ifdef GRPC_POSIX_SOCKET diff --git a/grpc/src/core/lib/iomgr/python_util.h b/grpc/src/core/lib/iomgr/python_util.h index 05d72a58..10c335b1 100644 --- a/grpc/src/core/lib/iomgr/python_util.h +++ b/grpc/src/core/lib/iomgr/python_util.h @@ -29,7 +29,7 @@ // They are easier to define here (rather than in Cython) // because Cython doesn't handle #defines well. -inline grpc_error* grpc_socket_error(char* error) { +inline grpc_error_handle grpc_socket_error(char* error) { return grpc_error_set_int(GRPC_ERROR_CREATE_FROM_COPIED_STRING(error), GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_UNAVAILABLE); diff --git a/grpc/src/core/lib/iomgr/resolve_address.cc b/grpc/src/core/lib/iomgr/resolve_address.cc index 7479836d..83c6aacf 100644 --- a/grpc/src/core/lib/iomgr/resolve_address.cc +++ b/grpc/src/core/lib/iomgr/resolve_address.cc @@ -42,9 +42,9 @@ void grpc_resolved_addresses_destroy(grpc_resolved_addresses* addresses) { gpr_free(addresses); } -grpc_error* grpc_blocking_resolve_address(const char* name, - const char* default_port, - grpc_resolved_addresses** addresses) { +grpc_error_handle grpc_blocking_resolve_address( + const char* name, const char* default_port, + grpc_resolved_addresses** addresses) { return grpc_resolve_address_impl->blocking_resolve_address(name, default_port, addresses); } diff --git a/grpc/src/core/lib/iomgr/resolve_address.h b/grpc/src/core/lib/iomgr/resolve_address.h index 025a141b..112d0ac5 100644 --- a/grpc/src/core/lib/iomgr/resolve_address.h +++ b/grpc/src/core/lib/iomgr/resolve_address.h @@ -54,9 +54,9 @@ typedef struct grpc_address_resolver_vtable { grpc_pollset_set* interested_parties, grpc_closure* on_done, grpc_resolved_addresses** addresses); - grpc_error* (*blocking_resolve_address)(const char* name, - const char* default_port, - grpc_resolved_addresses** addresses); + grpc_error_handle (*blocking_resolve_address)( + const char* name, const char* default_port, + grpc_resolved_addresses** addresses); } grpc_address_resolver_vtable; void grpc_set_resolver_impl(grpc_address_resolver_vtable* vtable); @@ -74,8 +74,8 @@ void grpc_resolved_addresses_destroy(grpc_resolved_addresses* addresses); /* Resolve addr in a blocking fashion. On success, result must be freed with grpc_resolved_addresses_destroy. */ -grpc_error* grpc_blocking_resolve_address(const char* name, - const char* default_port, - grpc_resolved_addresses** addresses); +grpc_error_handle grpc_blocking_resolve_address( + const char* name, const char* default_port, + grpc_resolved_addresses** addresses); #endif /* GRPC_CORE_LIB_IOMGR_RESOLVE_ADDRESS_H */ diff --git a/grpc/src/core/lib/iomgr/resolve_address_custom.cc b/grpc/src/core/lib/iomgr/resolve_address_custom.cc index 5ddd4523..f89eab05 100644 --- a/grpc/src/core/lib/iomgr/resolve_address_custom.cc +++ b/grpc/src/core/lib/iomgr/resolve_address_custom.cc @@ -29,12 +29,12 @@ #include <grpc/support/alloc.h> #include <grpc/support/log.h> +#include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/useful.h" #include "src/core/lib/gprpp/host_port.h" #include "src/core/lib/iomgr/iomgr_custom.h" #include "src/core/lib/iomgr/port.h" -#include "src/core/lib/iomgr/sockaddr_utils.h" struct grpc_custom_resolver { grpc_closure* on_done = nullptr; @@ -53,7 +53,7 @@ static int retry_named_port_failure(grpc_custom_resolver* r, if (r->port == svc[i][0]) { r->port = svc[i][1]; if (res) { - grpc_error* error = resolve_address_vtable->resolve( + grpc_error_handle error = resolve_address_vtable->resolve( r->host.c_str(), r->port.c_str(), res); if (error != GRPC_ERROR_NONE) { GRPC_ERROR_UNREF(error); @@ -71,7 +71,7 @@ static int retry_named_port_failure(grpc_custom_resolver* r, void grpc_custom_resolve_callback(grpc_custom_resolver* r, grpc_resolved_addresses* result, - grpc_error* error) { + grpc_error_handle error) { GRPC_CUSTOM_IOMGR_ASSERT_SAME_THREAD(); grpc_core::ApplicationCallbackExecCtx callback_exec_ctx; grpc_core::ExecCtx exec_ctx; @@ -86,9 +86,10 @@ void grpc_custom_resolve_callback(grpc_custom_resolver* r, delete r; } -static grpc_error* try_split_host_port(const char* name, - const char* default_port, - std::string* host, std::string* port) { +static grpc_error_handle try_split_host_port(const char* name, + const char* default_port, + std::string* host, + std::string* port) { /* parse name, splitting it into host and port parts */ grpc_core::SplitHostPort(name, host, port); if (host->empty()) { @@ -106,13 +107,13 @@ static grpc_error* try_split_host_port(const char* name, return GRPC_ERROR_NONE; } -static grpc_error* blocking_resolve_address_impl( +static grpc_error_handle blocking_resolve_address_impl( const char* name, const char* default_port, grpc_resolved_addresses** addresses) { GRPC_CUSTOM_IOMGR_ASSERT_SAME_THREAD(); grpc_custom_resolver resolver; - grpc_error* err = + grpc_error_handle err = try_split_host_port(name, default_port, &resolver.host, &resolver.port); if (err != GRPC_ERROR_NONE) { return err; @@ -144,7 +145,7 @@ static void resolve_address_impl(const char* name, const char* default_port, GRPC_CUSTOM_IOMGR_ASSERT_SAME_THREAD(); std::string host; std::string port; - grpc_error* err = try_split_host_port(name, default_port, &host, &port); + grpc_error_handle err = try_split_host_port(name, default_port, &host, &port); if (err != GRPC_ERROR_NONE) { grpc_core::ExecCtx::Run(DEBUG_LOCATION, on_done, err); return; diff --git a/grpc/src/core/lib/iomgr/resolve_address_custom.h b/grpc/src/core/lib/iomgr/resolve_address_custom.h index f5f68ca3..5f674dd0 100644 --- a/grpc/src/core/lib/iomgr/resolve_address_custom.h +++ b/grpc/src/core/lib/iomgr/resolve_address_custom.h @@ -29,15 +29,15 @@ typedef struct grpc_custom_resolver grpc_custom_resolver; typedef struct grpc_custom_resolver_vtable { - grpc_error* (*resolve)(const char* host, const char* port, - grpc_resolved_addresses** res); + grpc_error_handle (*resolve)(const char* host, const char* port, + grpc_resolved_addresses** res); void (*resolve_async)(grpc_custom_resolver* resolver, const char* host, const char* port); } grpc_custom_resolver_vtable; void grpc_custom_resolve_callback(grpc_custom_resolver* resolver, grpc_resolved_addresses* result, - grpc_error* error); + grpc_error_handle error); /* Internal APIs */ void grpc_custom_resolver_init(grpc_custom_resolver_vtable* impl); diff --git a/grpc/src/core/lib/iomgr/resolve_address_posix.cc b/grpc/src/core/lib/iomgr/resolve_address_posix.cc index 122dbe60..d0d1e0cd 100644 --- a/grpc/src/core/lib/iomgr/resolve_address_posix.cc +++ b/grpc/src/core/lib/iomgr/resolve_address_posix.cc @@ -42,7 +42,7 @@ #include "src/core/lib/iomgr/iomgr_internal.h" #include "src/core/lib/iomgr/unix_sockets_posix.h" -static grpc_error* posix_blocking_resolve_address( +static grpc_error_handle posix_blocking_resolve_address( const char* name, const char* default_port, grpc_resolved_addresses** addresses) { grpc_core::ExecCtx exec_ctx; @@ -50,7 +50,7 @@ static grpc_error* posix_blocking_resolve_address( struct addrinfo *result = nullptr, *resp; int s; size_t i; - grpc_error* err; + grpc_error_handle err; std::string host; std::string port; @@ -145,7 +145,7 @@ struct request { }; /* Callback to be passed to grpc Executor to asynch-ify * grpc_blocking_resolve_address */ -static void do_request_thread(void* rp, grpc_error* /*error*/) { +static void do_request_thread(void* rp, grpc_error_handle /*error*/) { request* r = static_cast<request*>(rp); grpc_core::ExecCtx::Run( DEBUG_LOCATION, r->on_done, diff --git a/grpc/src/core/lib/iomgr/resolve_address_windows.cc b/grpc/src/core/lib/iomgr/resolve_address_windows.cc index 5d2d365d..926237bc 100644 --- a/grpc/src/core/lib/iomgr/resolve_address_windows.cc +++ b/grpc/src/core/lib/iomgr/resolve_address_windows.cc @@ -39,13 +39,13 @@ #include <grpc/support/string_util.h> #include <grpc/support/time.h> +#include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/gpr/string.h" #include "src/core/lib/gprpp/host_port.h" #include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/block_annotate.h" #include "src/core/lib/iomgr/executor.h" #include "src/core/lib/iomgr/iomgr_internal.h" -#include "src/core/lib/iomgr/sockaddr_utils.h" struct request { char* name; @@ -54,7 +54,7 @@ struct request { grpc_closure* on_done; grpc_resolved_addresses** addresses; }; -static grpc_error* windows_blocking_resolve_address( +static grpc_error_handle windows_blocking_resolve_address( const char* name, const char* default_port, grpc_resolved_addresses** addresses) { grpc_core::ExecCtx exec_ctx; @@ -62,7 +62,7 @@ static grpc_error* windows_blocking_resolve_address( struct addrinfo *result = NULL, *resp; int s; size_t i; - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; /* parse name, splitting it into host and port parts */ std::string host; @@ -121,7 +121,7 @@ done: /* Callback to be passed to grpc_executor to asynch-ify * grpc_blocking_resolve_address */ -static void do_request_thread(void* rp, grpc_error* error) { +static void do_request_thread(void* rp, grpc_error_handle error) { request* r = (request*)rp; if (error == GRPC_ERROR_NONE) { error = diff --git a/grpc/src/core/lib/iomgr/resource_quota.cc b/grpc/src/core/lib/iomgr/resource_quota.cc index 464cccdc..a4f4107d 100644 --- a/grpc/src/core/lib/iomgr/resource_quota.cc +++ b/grpc/src/core/lib/iomgr/resource_quota.cc @@ -132,7 +132,7 @@ struct grpc_resource_quota { scaled to the range [0..RESOURCE_USAGE_ESTIMATION_MAX] */ gpr_atm memory_usage_estimation; - /* Master combiner lock: all activity on a quota executes under this combiner + /* Main combiner lock: all activity on a quota executes under this combiner * (so no mutex is needed for this data structure) */ grpc_core::Combiner* combiner; /* Size of the resource quota */ @@ -276,7 +276,7 @@ static bool rq_reclaim_from_per_user_free_pool( grpc_resource_quota* resource_quota); static bool rq_reclaim(grpc_resource_quota* resource_quota, bool destructive); -static void rq_step(void* rq, grpc_error* /*error*/) { +static void rq_step(void* rq, grpc_error_handle /*error*/) { grpc_resource_quota* resource_quota = static_cast<grpc_resource_quota*>(rq); resource_quota->step_scheduled = false; do { @@ -484,7 +484,7 @@ static grpc_slice ru_slice_create(grpc_resource_user* resource_user, * the combiner */ -static void ru_allocate(void* ru, grpc_error* /*error*/) { +static void ru_allocate(void* ru, grpc_error_handle /*error*/) { grpc_resource_user* resource_user = static_cast<grpc_resource_user*>(ru); if (rulist_empty(resource_user->resource_quota, GRPC_RULIST_AWAITING_ALLOCATION)) { @@ -493,7 +493,7 @@ static void ru_allocate(void* ru, grpc_error* /*error*/) { rulist_add_tail(resource_user, GRPC_RULIST_AWAITING_ALLOCATION); } -static void ru_add_to_free_pool(void* ru, grpc_error* /*error*/) { +static void ru_add_to_free_pool(void* ru, grpc_error_handle /*error*/) { grpc_resource_user* resource_user = static_cast<grpc_resource_user*>(ru); if (!rulist_empty(resource_user->resource_quota, GRPC_RULIST_AWAITING_ALLOCATION) && @@ -518,7 +518,7 @@ static bool ru_post_reclaimer(grpc_resource_user* resource_user, return true; } -static void ru_post_benign_reclaimer(void* ru, grpc_error* /*error*/) { +static void ru_post_benign_reclaimer(void* ru, grpc_error_handle /*error*/) { grpc_resource_user* resource_user = static_cast<grpc_resource_user*>(ru); if (!ru_post_reclaimer(resource_user, false)) return; if (!rulist_empty(resource_user->resource_quota, @@ -532,7 +532,8 @@ static void ru_post_benign_reclaimer(void* ru, grpc_error* /*error*/) { rulist_add_tail(resource_user, GRPC_RULIST_RECLAIMER_BENIGN); } -static void ru_post_destructive_reclaimer(void* ru, grpc_error* /*error*/) { +static void ru_post_destructive_reclaimer(void* ru, + grpc_error_handle /*error*/) { grpc_resource_user* resource_user = static_cast<grpc_resource_user*>(ru); if (!ru_post_reclaimer(resource_user, true)) return; if (!rulist_empty(resource_user->resource_quota, @@ -548,7 +549,7 @@ static void ru_post_destructive_reclaimer(void* ru, grpc_error* /*error*/) { rulist_add_tail(resource_user, GRPC_RULIST_RECLAIMER_DESTRUCTIVE); } -static void ru_shutdown(void* ru, grpc_error* /*error*/) { +static void ru_shutdown(void* ru, grpc_error_handle /*error*/) { if (GRPC_TRACE_FLAG_ENABLED(grpc_resource_quota_trace)) { gpr_log(GPR_INFO, "RU shutdown %p", ru); } @@ -568,7 +569,7 @@ static void ru_shutdown(void* ru, grpc_error* /*error*/) { gpr_mu_unlock(&resource_user->mu); } -static void ru_destroy(void* ru, grpc_error* /*error*/) { +static void ru_destroy(void* ru, grpc_error_handle /*error*/) { grpc_resource_user* resource_user = static_cast<grpc_resource_user*>(ru); GPR_ASSERT(gpr_atm_no_barrier_load(&resource_user->refs) == 0); // Free all the remaining thread quota @@ -601,7 +602,7 @@ static void ru_alloc_slices( } } -static void ru_allocated_slices(void* arg, grpc_error* error) { +static void ru_allocated_slices(void* arg, grpc_error_handle error) { grpc_resource_user_slice_allocator* slice_allocator = static_cast<grpc_resource_user_slice_allocator*>(arg); if (error == GRPC_ERROR_NONE) ru_alloc_slices(slice_allocator); @@ -619,7 +620,7 @@ struct rq_resize_args { grpc_resource_quota* resource_quota; grpc_closure closure; }; -static void rq_resize(void* args, grpc_error* /*error*/) { +static void rq_resize(void* args, grpc_error_handle /*error*/) { rq_resize_args* a = static_cast<rq_resize_args*>(args); int64_t delta = a->size - a->resource_quota->size; a->resource_quota->size += delta; @@ -630,7 +631,7 @@ static void rq_resize(void* args, grpc_error* /*error*/) { gpr_free(a); } -static void rq_reclamation_done(void* rq, grpc_error* /*error*/) { +static void rq_reclamation_done(void* rq, grpc_error_handle /*error*/) { grpc_resource_quota* resource_quota = static_cast<grpc_resource_quota*>(rq); resource_quota->reclaiming = false; rq_step_sched(resource_quota); diff --git a/grpc/src/core/lib/iomgr/socket_utils_common_posix.cc b/grpc/src/core/lib/iomgr/socket_utils_common_posix.cc index fa7f893f..e8c9ee19 100644 --- a/grpc/src/core/lib/iomgr/socket_utils_common_posix.cc +++ b/grpc/src/core/lib/iomgr/socket_utils_common_posix.cc @@ -47,13 +47,13 @@ #include <grpc/support/log.h> #include <grpc/support/sync.h> +#include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gpr/string.h" #include "src/core/lib/iomgr/sockaddr.h" -#include "src/core/lib/iomgr/sockaddr_utils.h" /* set a socket to use zerocopy */ -grpc_error* grpc_set_socket_zerocopy(int fd) { +grpc_error_handle grpc_set_socket_zerocopy(int fd) { #ifdef GRPC_LINUX_ERRQUEUE const int enable = 1; auto err = setsockopt(fd, SOL_SOCKET, SO_ZEROCOPY, &enable, sizeof(enable)); @@ -62,12 +62,13 @@ grpc_error* grpc_set_socket_zerocopy(int fd) { } return GRPC_ERROR_NONE; #else + (void)fd; return GRPC_OS_ERROR(ENOSYS, "setsockopt(SO_ZEROCOPY)"); #endif } /* set a socket to non blocking mode */ -grpc_error* grpc_set_socket_nonblocking(int fd, int non_blocking) { +grpc_error_handle grpc_set_socket_nonblocking(int fd, int non_blocking) { int oldflags = fcntl(fd, F_GETFL, 0); if (oldflags < 0) { return GRPC_OS_ERROR(errno, "fcntl"); @@ -86,7 +87,7 @@ grpc_error* grpc_set_socket_nonblocking(int fd, int non_blocking) { return GRPC_ERROR_NONE; } -grpc_error* grpc_set_socket_no_sigpipe_if_possible(int fd) { +grpc_error_handle grpc_set_socket_no_sigpipe_if_possible(int fd) { #ifdef GRPC_HAVE_SO_NOSIGPIPE int val = 1; int newval; @@ -107,7 +108,7 @@ grpc_error* grpc_set_socket_no_sigpipe_if_possible(int fd) { return GRPC_ERROR_NONE; } -grpc_error* grpc_set_socket_ip_pktinfo_if_possible(int fd) { +grpc_error_handle grpc_set_socket_ip_pktinfo_if_possible(int fd) { // Use conditionally-important parameter to avoid warning (void)fd; #ifdef GRPC_HAVE_IP_PKTINFO @@ -120,7 +121,7 @@ grpc_error* grpc_set_socket_ip_pktinfo_if_possible(int fd) { return GRPC_ERROR_NONE; } -grpc_error* grpc_set_socket_ipv6_recvpktinfo_if_possible(int fd) { +grpc_error_handle grpc_set_socket_ipv6_recvpktinfo_if_possible(int fd) { // Use conditionally-important parameter to avoid warning (void)fd; #ifdef GRPC_HAVE_IPV6_RECVPKTINFO @@ -133,14 +134,14 @@ grpc_error* grpc_set_socket_ipv6_recvpktinfo_if_possible(int fd) { return GRPC_ERROR_NONE; } -grpc_error* grpc_set_socket_sndbuf(int fd, int buffer_size_bytes) { +grpc_error_handle grpc_set_socket_sndbuf(int fd, int buffer_size_bytes) { return 0 == setsockopt(fd, SOL_SOCKET, SO_SNDBUF, &buffer_size_bytes, sizeof(buffer_size_bytes)) ? GRPC_ERROR_NONE : GRPC_OS_ERROR(errno, "setsockopt(SO_SNDBUF)"); } -grpc_error* grpc_set_socket_rcvbuf(int fd, int buffer_size_bytes) { +grpc_error_handle grpc_set_socket_rcvbuf(int fd, int buffer_size_bytes) { return 0 == setsockopt(fd, SOL_SOCKET, SO_RCVBUF, &buffer_size_bytes, sizeof(buffer_size_bytes)) ? GRPC_ERROR_NONE @@ -148,7 +149,7 @@ grpc_error* grpc_set_socket_rcvbuf(int fd, int buffer_size_bytes) { } /* set a socket to close on exec */ -grpc_error* grpc_set_socket_cloexec(int fd, int close_on_exec) { +grpc_error_handle grpc_set_socket_cloexec(int fd, int close_on_exec) { int oldflags = fcntl(fd, F_GETFD, 0); if (oldflags < 0) { return GRPC_OS_ERROR(errno, "fcntl"); @@ -168,7 +169,7 @@ grpc_error* grpc_set_socket_cloexec(int fd, int close_on_exec) { } /* set a socket to reuse old addresses */ -grpc_error* grpc_set_socket_reuse_addr(int fd, int reuse) { +grpc_error_handle grpc_set_socket_reuse_addr(int fd, int reuse) { int val = (reuse != 0); int newval; socklen_t intlen = sizeof(newval); @@ -186,7 +187,7 @@ grpc_error* grpc_set_socket_reuse_addr(int fd, int reuse) { } /* set a socket to reuse old addresses */ -grpc_error* grpc_set_socket_reuse_port(int fd, int reuse) { +grpc_error_handle grpc_set_socket_reuse_port(int fd, int reuse) { #ifndef SO_REUSEPORT return GRPC_ERROR_CREATE_FROM_STATIC_STRING( "SO_REUSEPORT unavailable on compiling system"); @@ -231,7 +232,7 @@ bool grpc_is_socket_reuse_port_supported() { } /* disable nagle */ -grpc_error* grpc_set_socket_low_latency(int fd, int low_latency) { +grpc_error_handle grpc_set_socket_low_latency(int fd, int low_latency) { int val = (low_latency != 0); int newval; socklen_t intlen = sizeof(newval); @@ -296,7 +297,7 @@ void config_default_tcp_user_timeout(bool enable, int timeout, bool is_client) { } /* Set TCP_USER_TIMEOUT */ -grpc_error* grpc_set_socket_tcp_user_timeout( +grpc_error_handle grpc_set_socket_tcp_user_timeout( int fd, const grpc_channel_args* channel_args, bool is_client) { // Use conditionally-important parameter to avoid warning (void)fd; @@ -387,7 +388,8 @@ grpc_error* grpc_set_socket_tcp_user_timeout( } /* set a socket using a grpc_socket_mutator */ -grpc_error* grpc_set_socket_with_mutator(int fd, grpc_socket_mutator* mutator) { +grpc_error_handle grpc_set_socket_with_mutator(int fd, + grpc_socket_mutator* mutator) { GPR_ASSERT(mutator); if (!grpc_socket_mutator_mutate_fd(mutator, fd)) { return GRPC_ERROR_CREATE_FROM_STATIC_STRING("grpc_socket_mutator failed."); @@ -395,8 +397,8 @@ grpc_error* grpc_set_socket_with_mutator(int fd, grpc_socket_mutator* mutator) { return GRPC_ERROR_NONE; } -grpc_error* grpc_apply_socket_mutator_in_args(int fd, - const grpc_channel_args* args) { +grpc_error_handle grpc_apply_socket_mutator_in_args( + int fd, const grpc_channel_args* args) { const grpc_arg* socket_mutator_arg = grpc_channel_args_find(args, GRPC_ARG_SOCKET_MUTATOR); if (socket_mutator_arg == nullptr) { @@ -436,16 +438,17 @@ int grpc_ipv6_loopback_available(void) { return g_ipv6_loopback_available; } -static grpc_error* error_for_fd(int fd, const grpc_resolved_address* addr) { +static grpc_error_handle error_for_fd(int fd, + const grpc_resolved_address* addr) { if (fd >= 0) return GRPC_ERROR_NONE; std::string addr_str = grpc_sockaddr_to_string(addr, false); - grpc_error* err = grpc_error_set_str( + grpc_error_handle err = grpc_error_set_str( GRPC_OS_ERROR(errno, "socket"), GRPC_ERROR_STR_TARGET_ADDRESS, grpc_slice_from_copied_string(addr_str.c_str())); return err; } -grpc_error* grpc_create_dualstack_socket( +grpc_error_handle grpc_create_dualstack_socket( const grpc_resolved_address* resolved_addr, int type, int protocol, grpc_dualstack_mode* dsmode, int* newfd) { return grpc_create_dualstack_socket_using_factory( @@ -459,7 +462,7 @@ static int create_socket(grpc_socket_factory* factory, int domain, int type, : socket(domain, type, protocol); } -grpc_error* grpc_create_dualstack_socket_using_factory( +grpc_error_handle grpc_create_dualstack_socket_using_factory( grpc_socket_factory* factory, const grpc_resolved_address* resolved_addr, int type, int protocol, grpc_dualstack_mode* dsmode, int* newfd) { const grpc_sockaddr* addr = diff --git a/grpc/src/core/lib/iomgr/socket_utils_posix.h b/grpc/src/core/lib/iomgr/socket_utils_posix.h index b4dc909d..13c22bc0 100644 --- a/grpc/src/core/lib/iomgr/socket_utils_posix.h +++ b/grpc/src/core/lib/iomgr/socket_utils_posix.h @@ -45,31 +45,31 @@ int grpc_accept4(int sockfd, grpc_resolved_address* resolved_addr, int nonblock, int cloexec); /* set a socket to use zerocopy */ -grpc_error* grpc_set_socket_zerocopy(int fd); +grpc_error_handle grpc_set_socket_zerocopy(int fd); /* set a socket to non blocking mode */ -grpc_error* grpc_set_socket_nonblocking(int fd, int non_blocking); +grpc_error_handle grpc_set_socket_nonblocking(int fd, int non_blocking); /* set a socket to close on exec */ -grpc_error* grpc_set_socket_cloexec(int fd, int close_on_exec); +grpc_error_handle grpc_set_socket_cloexec(int fd, int close_on_exec); /* set a socket to reuse old addresses */ -grpc_error* grpc_set_socket_reuse_addr(int fd, int reuse); +grpc_error_handle grpc_set_socket_reuse_addr(int fd, int reuse); /* return true if SO_REUSEPORT is supported */ bool grpc_is_socket_reuse_port_supported(); /* disable nagle */ -grpc_error* grpc_set_socket_low_latency(int fd, int low_latency); +grpc_error_handle grpc_set_socket_low_latency(int fd, int low_latency); /* set SO_REUSEPORT */ -grpc_error* grpc_set_socket_reuse_port(int fd, int reuse); +grpc_error_handle grpc_set_socket_reuse_port(int fd, int reuse); /* Configure the default values for TCP_USER_TIMEOUT */ void config_default_tcp_user_timeout(bool enable, int timeout, bool is_client); /* Set TCP_USER_TIMEOUT */ -grpc_error* grpc_set_socket_tcp_user_timeout( +grpc_error_handle grpc_set_socket_tcp_user_timeout( int fd, const grpc_channel_args* channel_args, bool is_client); /* Returns true if this system can create AF_INET6 sockets bound to ::1. @@ -84,28 +84,29 @@ int grpc_ipv6_loopback_available(void); /* Tries to set SO_NOSIGPIPE if available on this platform. If SO_NO_SIGPIPE is not available, returns 1. */ -grpc_error* grpc_set_socket_no_sigpipe_if_possible(int fd); +grpc_error_handle grpc_set_socket_no_sigpipe_if_possible(int fd); /* Tries to set IP_PKTINFO if available on this platform. If IP_PKTINFO is not available, returns 1. */ -grpc_error* grpc_set_socket_ip_pktinfo_if_possible(int fd); +grpc_error_handle grpc_set_socket_ip_pktinfo_if_possible(int fd); /* Tries to set IPV6_RECVPKTINFO if available on this platform. If IPV6_RECVPKTINFO is not available, returns 1. */ -grpc_error* grpc_set_socket_ipv6_recvpktinfo_if_possible(int fd); +grpc_error_handle grpc_set_socket_ipv6_recvpktinfo_if_possible(int fd); /* Tries to set the socket's send buffer to given size. */ -grpc_error* grpc_set_socket_sndbuf(int fd, int buffer_size_bytes); +grpc_error_handle grpc_set_socket_sndbuf(int fd, int buffer_size_bytes); /* Tries to set the socket's receive buffer to given size. */ -grpc_error* grpc_set_socket_rcvbuf(int fd, int buffer_size_bytes); +grpc_error_handle grpc_set_socket_rcvbuf(int fd, int buffer_size_bytes); /* Tries to set the socket using a grpc_socket_mutator */ -grpc_error* grpc_set_socket_with_mutator(int fd, grpc_socket_mutator* mutator); +grpc_error_handle grpc_set_socket_with_mutator(int fd, + grpc_socket_mutator* mutator); /* Extracts the first socket mutator from args if any and applies on the fd. */ -grpc_error* grpc_apply_socket_mutator_in_args(int fd, - const grpc_channel_args* args); +grpc_error_handle grpc_apply_socket_mutator_in_args( + int fd, const grpc_channel_args* args); /* An enum to keep track of IPv4/IPv6 socket modes. @@ -149,14 +150,13 @@ int grpc_set_socket_dualstack(int fd); IPv4, so that bind() or connect() see the correct family. Also, it's important to distinguish between DUALSTACK and IPV6 when listening on the [::] wildcard address. */ -grpc_error* grpc_create_dualstack_socket(const grpc_resolved_address* addr, - int type, int protocol, - grpc_dualstack_mode* dsmode, - int* newfd); +grpc_error_handle grpc_create_dualstack_socket( + const grpc_resolved_address* addr, int type, int protocol, + grpc_dualstack_mode* dsmode, int* newfd); /* Same as grpc_create_dualstack_socket(), but use the given socket factory (if non-null) to create the socket, rather than calling socket() directly. */ -grpc_error* grpc_create_dualstack_socket_using_factory( +grpc_error_handle grpc_create_dualstack_socket_using_factory( grpc_socket_factory* factory, const grpc_resolved_address* addr, int type, int protocol, grpc_dualstack_mode* dsmode, int* newfd); diff --git a/grpc/src/core/lib/iomgr/tcp_client_cfstream.cc b/grpc/src/core/lib/iomgr/tcp_client_cfstream.cc index d0be97ae..5c0a95e5 100644 --- a/grpc/src/core/lib/iomgr/tcp_client_cfstream.cc +++ b/grpc/src/core/lib/iomgr/tcp_client_cfstream.cc @@ -33,6 +33,7 @@ #include <netinet/in.h> +#include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/host_port.h" #include "src/core/lib/iomgr/cfstream_handle.h" @@ -40,7 +41,6 @@ #include "src/core/lib/iomgr/endpoint_cfstream.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/error_cfstream.h" -#include "src/core/lib/iomgr/sockaddr_utils.h" #include "src/core/lib/iomgr/tcp_client.h" #include "src/core/lib/iomgr/timer.h" @@ -78,7 +78,7 @@ static void CFStreamConnectCleanup(CFStreamConnect* connect) { delete connect; } -static void OnAlarm(void* arg, grpc_error* error) { +static void OnAlarm(void* arg, grpc_error_handle error) { CFStreamConnect* connect = static_cast<CFStreamConnect*>(arg); if (grpc_tcp_trace.enabled()) { gpr_log(GPR_DEBUG, "CLIENT_CONNECT :%p OnAlarm, error:%p", connect, error); @@ -93,13 +93,13 @@ static void OnAlarm(void* arg, grpc_error* error) { if (done) { CFStreamConnectCleanup(connect); } else { - grpc_error* error = + grpc_error_handle error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("connect() timed out"); grpc_core::ExecCtx::Run(DEBUG_LOCATION, closure, error); } } -static void OnOpen(void* arg, grpc_error* error) { +static void OnOpen(void* arg, grpc_error_handle error) { CFStreamConnect* connect = static_cast<CFStreamConnect*>(arg); if (grpc_tcp_trace.enabled()) { gpr_log(GPR_DEBUG, "CLIENT_CONNECT :%p OnOpen, error:%p", connect, error); diff --git a/grpc/src/core/lib/iomgr/tcp_client_custom.cc b/grpc/src/core/lib/iomgr/tcp_client_custom.cc index 046380c3..d54a5f03 100644 --- a/grpc/src/core/lib/iomgr/tcp_client_custom.cc +++ b/grpc/src/core/lib/iomgr/tcp_client_custom.cc @@ -25,9 +25,9 @@ #include <grpc/support/alloc.h> #include <grpc/support/log.h> +#include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/iomgr_custom.h" -#include "src/core/lib/iomgr/sockaddr_utils.h" #include "src/core/lib/iomgr/tcp_client.h" #include "src/core/lib/iomgr/tcp_custom.h" #include "src/core/lib/iomgr/timer.h" @@ -59,14 +59,13 @@ static void custom_tcp_connect_cleanup(grpc_custom_tcp_connect* connect) { static void custom_close_callback(grpc_custom_socket* /*socket*/) {} -static void on_alarm(void* acp, grpc_error* error) { +static void on_alarm(void* acp, grpc_error_handle error) { int done; grpc_custom_socket* socket = static_cast<grpc_custom_socket*>(acp); grpc_custom_tcp_connect* connect = socket->connector; if (GRPC_TRACE_FLAG_ENABLED(grpc_tcp_trace)) { - const char* str = grpc_error_string(error); gpr_log(GPR_INFO, "CLIENT_CONNECT: %s: on_alarm: error=%s", - connect->addr_name.c_str(), str); + connect->addr_name.c_str(), grpc_error_std_string(error).c_str()); } if (error == GRPC_ERROR_NONE) { /* error == NONE implies that the timer ran out, and wasn't cancelled. If @@ -81,7 +80,7 @@ static void on_alarm(void* acp, grpc_error* error) { } static void custom_connect_callback_internal(grpc_custom_socket* socket, - grpc_error* error) { + grpc_error_handle error) { grpc_custom_tcp_connect* connect = socket->connector; int done; grpc_closure* closure = connect->closure; @@ -99,7 +98,7 @@ static void custom_connect_callback_internal(grpc_custom_socket* socket, } static void custom_connect_callback(grpc_custom_socket* socket, - grpc_error* error) { + grpc_error_handle error) { grpc_core::ApplicationCallbackExecCtx callback_exec_ctx; if (grpc_core::ExecCtx::Get() == nullptr) { /* If we are being run on a thread which does not have an exec_ctx created diff --git a/grpc/src/core/lib/iomgr/tcp_client_posix.cc b/grpc/src/core/lib/iomgr/tcp_client_posix.cc index fb4149b3..741cc6af 100644 --- a/grpc/src/core/lib/iomgr/tcp_client_posix.cc +++ b/grpc/src/core/lib/iomgr/tcp_client_posix.cc @@ -35,12 +35,12 @@ #include <grpc/support/log.h> #include <grpc/support/time.h> +#include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gpr/string.h" #include "src/core/lib/iomgr/ev_posix.h" -#include "src/core/lib/iomgr/iomgr_posix.h" +#include "src/core/lib/iomgr/iomgr_internal.h" #include "src/core/lib/iomgr/sockaddr.h" -#include "src/core/lib/iomgr/sockaddr_utils.h" #include "src/core/lib/iomgr/socket_mutator.h" #include "src/core/lib/iomgr/socket_utils_posix.h" #include "src/core/lib/iomgr/tcp_posix.h" @@ -64,9 +64,10 @@ struct async_connect { grpc_channel_args* channel_args; }; -static grpc_error* prepare_socket(const grpc_resolved_address* addr, int fd, - const grpc_channel_args* channel_args) { - grpc_error* err = GRPC_ERROR_NONE; +static grpc_error_handle prepare_socket(const grpc_resolved_address* addr, + int fd, + const grpc_channel_args* channel_args) { + grpc_error_handle err = GRPC_ERROR_NONE; GPR_ASSERT(fd >= 0); @@ -99,13 +100,12 @@ done: return err; } -static void tc_on_alarm(void* acp, grpc_error* error) { +static void tc_on_alarm(void* acp, grpc_error_handle error) { int done; async_connect* ac = static_cast<async_connect*>(acp); if (GRPC_TRACE_FLAG_ENABLED(grpc_tcp_trace)) { - const char* str = grpc_error_string(error); gpr_log(GPR_INFO, "CLIENT_CONNECT: %s: on_alarm: error=%s", - ac->addr_str.c_str(), str); + ac->addr_str.c_str(), grpc_error_std_string(error).c_str()); } gpr_mu_lock(&ac->mu); if (ac->fd != nullptr) { @@ -126,7 +126,7 @@ grpc_endpoint* grpc_tcp_client_create_from_fd( return grpc_tcp_create(fd, channel_args, addr_str); } -static void on_writable(void* acp, grpc_error* error) { +static void on_writable(void* acp, grpc_error_handle error) { async_connect* ac = static_cast<async_connect*>(acp); int so_error = 0; socklen_t so_error_size; @@ -139,9 +139,8 @@ static void on_writable(void* acp, grpc_error* error) { GRPC_ERROR_REF(error); if (GRPC_TRACE_FLAG_ENABLED(grpc_tcp_trace)) { - const char* str = grpc_error_string(error); gpr_log(GPR_INFO, "CLIENT_CONNECT: %s: on_writable: error=%s", - ac->addr_str.c_str(), str); + ac->addr_str.c_str(), grpc_error_std_string(error).c_str()); } gpr_mu_lock(&ac->mu); @@ -242,12 +241,11 @@ finish: grpc_core::ExecCtx::Run(DEBUG_LOCATION, closure, error); } -grpc_error* grpc_tcp_client_prepare_fd(const grpc_channel_args* channel_args, - const grpc_resolved_address* addr, - grpc_resolved_address* mapped_addr, - int* fd) { +grpc_error_handle grpc_tcp_client_prepare_fd( + const grpc_channel_args* channel_args, const grpc_resolved_address* addr, + grpc_resolved_address* mapped_addr, int* fd) { grpc_dualstack_mode dsmode; - grpc_error* error; + grpc_error_handle error; *fd = -1; /* Use dualstack sockets where available. Set mapped to v6 or v4 mapped to v6. */ @@ -293,7 +291,7 @@ void grpc_tcp_client_create_from_prepared_fd( return; } if (errno != EWOULDBLOCK && errno != EINPROGRESS) { - grpc_error* error = GRPC_OS_ERROR(errno, "connect"); + grpc_error_handle error = GRPC_OS_ERROR(errno, "connect"); error = grpc_error_set_str( error, GRPC_ERROR_STR_TARGET_ADDRESS, grpc_slice_from_cpp_string(grpc_sockaddr_to_uri(addr))); @@ -335,7 +333,7 @@ static void tcp_connect(grpc_closure* closure, grpc_endpoint** ep, grpc_millis deadline) { grpc_resolved_address mapped_addr; int fd = -1; - grpc_error* error; + grpc_error_handle error; *ep = nullptr; if ((error = grpc_tcp_client_prepare_fd(channel_args, addr, &mapped_addr, &fd)) != GRPC_ERROR_NONE) { diff --git a/grpc/src/core/lib/iomgr/tcp_client_posix.h b/grpc/src/core/lib/iomgr/tcp_client_posix.h index 6f61866f..2467f374 100644 --- a/grpc/src/core/lib/iomgr/tcp_client_posix.h +++ b/grpc/src/core/lib/iomgr/tcp_client_posix.h @@ -45,10 +45,9 @@ grpc_endpoint* grpc_tcp_client_create_from_fd( fd: out parameter. The new FD Returns: error, if any. Out parameters are not set on error */ -grpc_error* grpc_tcp_client_prepare_fd(const grpc_channel_args* channel_args, - const grpc_resolved_address* addr, - grpc_resolved_address* mapped_addr, - int* fd); +grpc_error_handle grpc_tcp_client_prepare_fd( + const grpc_channel_args* channel_args, const grpc_resolved_address* addr, + grpc_resolved_address* mapped_addr, int* fd); /* Connect a configured TCP client fd. diff --git a/grpc/src/core/lib/iomgr/tcp_client_windows.cc b/grpc/src/core/lib/iomgr/tcp_client_windows.cc index 061e7039..ef260cad 100644 --- a/grpc/src/core/lib/iomgr/tcp_client_windows.cc +++ b/grpc/src/core/lib/iomgr/tcp_client_windows.cc @@ -31,10 +31,10 @@ #include <grpc/support/log.h> #include <grpc/support/log_windows.h> +#include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/iocp_windows.h" #include "src/core/lib/iomgr/sockaddr.h" -#include "src/core/lib/iomgr/sockaddr_utils.h" #include "src/core/lib/iomgr/socket_windows.h" #include "src/core/lib/iomgr/tcp_client.h" #include "src/core/lib/iomgr/tcp_windows.h" @@ -66,7 +66,7 @@ static void async_connect_unlock_and_cleanup(async_connect* ac, if (socket != NULL) grpc_winsocket_destroy(socket); } -static void on_alarm(void* acp, grpc_error* error) { +static void on_alarm(void* acp, grpc_error_handle error) { async_connect* ac = (async_connect*)acp; gpr_mu_lock(&ac->mu); grpc_winsocket* socket = ac->socket; @@ -77,7 +77,7 @@ static void on_alarm(void* acp, grpc_error* error) { async_connect_unlock_and_cleanup(ac, socket); } -static void on_connect(void* acp, grpc_error* error) { +static void on_connect(void* acp, grpc_error_handle error) { async_connect* ac = (async_connect*)acp; grpc_endpoint** ep = ac->endpoint; GPR_ASSERT(*ep == NULL); @@ -137,7 +137,7 @@ static void tcp_connect(grpc_closure* on_done, grpc_endpoint** endpoint, GUID guid = WSAID_CONNECTEX; DWORD ioctl_num_bytes; grpc_winsocket_callback_info* info; - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; async_connect* ac = NULL; *endpoint = NULL; @@ -213,7 +213,7 @@ static void tcp_connect(grpc_closure* on_done, grpc_endpoint** endpoint, failure: GPR_ASSERT(error != GRPC_ERROR_NONE); std::string target_uri = grpc_sockaddr_to_uri(addr); - grpc_error* final_error = + grpc_error_handle final_error = grpc_error_set_str(GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Failed to connect", &error, 1), GRPC_ERROR_STR_TARGET_ADDRESS, diff --git a/grpc/src/core/lib/iomgr/tcp_custom.cc b/grpc/src/core/lib/iomgr/tcp_custom.cc index 0f45c75c..c526a957 100644 --- a/grpc/src/core/lib/iomgr/tcp_custom.cc +++ b/grpc/src/core/lib/iomgr/tcp_custom.cc @@ -29,10 +29,10 @@ #include <grpc/support/log.h> #include <grpc/support/string_util.h> +#include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/iomgr_custom.h" #include "src/core/lib/iomgr/resource_quota.h" -#include "src/core/lib/iomgr/sockaddr_utils.h" #include "src/core/lib/iomgr/tcp_client.h" #include "src/core/lib/iomgr/tcp_custom.h" #include "src/core/lib/iomgr/tcp_server.h" @@ -122,15 +122,13 @@ static void tcp_unref(custom_tcp_endpoint* tcp) { static void tcp_ref(custom_tcp_endpoint* tcp) { gpr_ref(&tcp->refcount); } #endif -static void call_read_cb(custom_tcp_endpoint* tcp, grpc_error* error) { +static void call_read_cb(custom_tcp_endpoint* tcp, grpc_error_handle error) { grpc_closure* cb = tcp->read_cb; if (GRPC_TRACE_FLAG_ENABLED(grpc_tcp_trace)) { gpr_log(GPR_INFO, "TCP:%p call_cb %p %p:%p", tcp->socket, cb, cb->cb, cb->cb_arg); size_t i; - const char* str = grpc_error_string(error); - gpr_log(GPR_INFO, "read: error=%s", str); - + gpr_log(GPR_INFO, "read: error=%s", grpc_error_std_string(error).c_str()); for (i = 0; i < tcp->read_slices->count; i++) { char* dump = grpc_dump_slice(tcp->read_slices->slices[i], GPR_DUMP_HEX | GPR_DUMP_ASCII); @@ -146,7 +144,7 @@ static void call_read_cb(custom_tcp_endpoint* tcp, grpc_error* error) { } static void custom_read_callback(grpc_custom_socket* socket, size_t nread, - grpc_error* error) { + grpc_error_handle error) { grpc_core::ApplicationCallbackExecCtx callback_exec_ctx; grpc_core::ExecCtx exec_ctx; grpc_slice_buffer garbage; @@ -171,11 +169,11 @@ static void custom_read_callback(grpc_custom_socket* socket, size_t nread, call_read_cb(tcp, error); } -static void tcp_read_allocation_done(void* tcpp, grpc_error* error) { +static void tcp_read_allocation_done(void* tcpp, grpc_error_handle error) { custom_tcp_endpoint* tcp = static_cast<custom_tcp_endpoint*>(tcpp); if (GRPC_TRACE_FLAG_ENABLED(grpc_tcp_trace)) { gpr_log(GPR_INFO, "TCP:%p read_allocation_done: %s", tcp->socket, - grpc_error_string(error)); + grpc_error_std_string(error).c_str()); } if (error == GRPC_ERROR_NONE) { /* Before calling read, we allocate a buffer with exactly one slice @@ -191,8 +189,8 @@ static void tcp_read_allocation_done(void* tcpp, grpc_error* error) { call_read_cb(tcp, GRPC_ERROR_REF(error)); } if (GRPC_TRACE_FLAG_ENABLED(grpc_tcp_trace)) { - const char* str = grpc_error_string(error); - gpr_log(GPR_INFO, "Initiating read on %p: error=%s", tcp->socket, str); + gpr_log(GPR_INFO, "Initiating read on %p: error=%s", tcp->socket, + grpc_error_std_string(error).c_str()); } } @@ -213,7 +211,7 @@ static void endpoint_read(grpc_endpoint* ep, grpc_slice_buffer* read_slices, } static void custom_write_callback(grpc_custom_socket* socket, - grpc_error* error) { + grpc_error_handle error) { grpc_core::ApplicationCallbackExecCtx callback_exec_ctx; grpc_core::ExecCtx exec_ctx; custom_tcp_endpoint* tcp = @@ -221,8 +219,8 @@ static void custom_write_callback(grpc_custom_socket* socket, grpc_closure* cb = tcp->write_cb; tcp->write_cb = nullptr; if (GRPC_TRACE_FLAG_ENABLED(grpc_tcp_trace)) { - const char* str = grpc_error_string(error); - gpr_log(GPR_INFO, "write complete on %p: error=%s", tcp->socket, str); + gpr_log(GPR_INFO, "write complete on %p: error=%s", tcp->socket, + grpc_error_std_string(error).c_str()); } TCP_UNREF(tcp, "write"); grpc_core::ExecCtx::Run(DEBUG_LOCATION, cb, error); @@ -287,12 +285,12 @@ static void endpoint_delete_from_pollset_set(grpc_endpoint* ep, (void)pollset; } -static void endpoint_shutdown(grpc_endpoint* ep, grpc_error* why) { +static void endpoint_shutdown(grpc_endpoint* ep, grpc_error_handle why) { custom_tcp_endpoint* tcp = reinterpret_cast<custom_tcp_endpoint*>(ep); if (!tcp->shutting_down) { if (GRPC_TRACE_FLAG_ENABLED(grpc_tcp_trace)) { - const char* str = grpc_error_string(why); - gpr_log(GPR_INFO, "TCP %p shutdown why=%s", tcp->socket, str); + gpr_log(GPR_INFO, "TCP %p shutdown why=%s", tcp->socket, + grpc_error_std_string(why).c_str()); } tcp->shutting_down = true; // grpc_core::ExecCtx::Run(DEBUG_LOCATION,tcp->read_cb, diff --git a/grpc/src/core/lib/iomgr/tcp_custom.h b/grpc/src/core/lib/iomgr/tcp_custom.h index d32ed2b4..b342efba 100644 --- a/grpc/src/core/lib/iomgr/tcp_custom.h +++ b/grpc/src/core/lib/iomgr/tcp_custom.h @@ -40,18 +40,19 @@ typedef struct grpc_custom_socket { } grpc_custom_socket; typedef void (*grpc_custom_connect_callback)(grpc_custom_socket* socket, - grpc_error* error); + grpc_error_handle error); typedef void (*grpc_custom_write_callback)(grpc_custom_socket* socket, - grpc_error* error); + grpc_error_handle error); typedef void (*grpc_custom_read_callback)(grpc_custom_socket* socket, - size_t nread, grpc_error* error); + size_t nread, + grpc_error_handle error); typedef void (*grpc_custom_accept_callback)(grpc_custom_socket* socket, grpc_custom_socket* client, - grpc_error* error); + grpc_error_handle error); typedef void (*grpc_custom_close_callback)(grpc_custom_socket* socket); typedef struct grpc_socket_vtable { - grpc_error* (*init)(grpc_custom_socket* socket, int domain); + grpc_error_handle (*init)(grpc_custom_socket* socket, int domain); void (*connect)(grpc_custom_socket* socket, const grpc_sockaddr* addr, size_t len, grpc_custom_connect_callback cb); void (*destroy)(grpc_custom_socket* socket); @@ -61,13 +62,13 @@ typedef struct grpc_socket_vtable { grpc_custom_write_callback cb); void (*read)(grpc_custom_socket* socket, char* buffer, size_t length, grpc_custom_read_callback cb); - grpc_error* (*getpeername)(grpc_custom_socket* socket, - const grpc_sockaddr* addr, int* len); - grpc_error* (*getsockname)(grpc_custom_socket* socket, - const grpc_sockaddr* addr, int* len); - grpc_error* (*bind)(grpc_custom_socket* socket, const grpc_sockaddr* addr, - size_t len, int flags); - grpc_error* (*listen)(grpc_custom_socket* socket); + grpc_error_handle (*getpeername)(grpc_custom_socket* socket, + const grpc_sockaddr* addr, int* len); + grpc_error_handle (*getsockname)(grpc_custom_socket* socket, + const grpc_sockaddr* addr, int* len); + grpc_error_handle (*bind)(grpc_custom_socket* socket, + const grpc_sockaddr* addr, size_t len, int flags); + grpc_error_handle (*listen)(grpc_custom_socket* socket); void (*accept)(grpc_custom_socket* socket, grpc_custom_socket* client, grpc_custom_accept_callback cb); } grpc_socket_vtable; diff --git a/grpc/src/core/lib/iomgr/tcp_posix.cc b/grpc/src/core/lib/iomgr/tcp_posix.cc index 7813e044..1f28b773 100644 --- a/grpc/src/core/lib/iomgr/tcp_posix.cc +++ b/grpc/src/core/lib/iomgr/tcp_posix.cc @@ -45,6 +45,7 @@ #include <grpc/support/sync.h> #include <grpc/support/time.h> +#include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/stats.h" #include "src/core/lib/debug/trace.h" @@ -54,7 +55,6 @@ #include "src/core/lib/iomgr/buffer_list.h" #include "src/core/lib/iomgr/ev_posix.h" #include "src/core/lib/iomgr/executor.h" -#include "src/core/lib/iomgr/sockaddr_utils.h" #include "src/core/lib/iomgr/socket_utils_posix.h" #include "src/core/lib/profiling/timers.h" #include "src/core/lib/slice/slice_internal.h" @@ -435,12 +435,12 @@ static void ZerocopyDisableAndWaitForRemaining(grpc_tcp* tcp); static gpr_atm g_uncovered_notifications_pending; static gpr_atm g_backup_poller; /* backup_poller* */ -static void tcp_handle_read(void* arg /* grpc_tcp */, grpc_error* error); -static void tcp_handle_write(void* arg /* grpc_tcp */, grpc_error* error); +static void tcp_handle_read(void* arg /* grpc_tcp */, grpc_error_handle error); +static void tcp_handle_write(void* arg /* grpc_tcp */, grpc_error_handle error); static void tcp_drop_uncovered_then_handle_write(void* arg /* grpc_tcp */, - grpc_error* error); + grpc_error_handle error); -static void done_poller(void* bp, grpc_error* /*error_ignored*/) { +static void done_poller(void* bp, grpc_error_handle /*error_ignored*/) { backup_poller* p = static_cast<backup_poller*>(bp); if (GRPC_TRACE_FLAG_ENABLED(grpc_tcp_trace)) { gpr_log(GPR_INFO, "BACKUP_POLLER:%p destroy", p); @@ -449,7 +449,7 @@ static void done_poller(void* bp, grpc_error* /*error_ignored*/) { gpr_free(p); } -static void run_poller(void* bp, grpc_error* /*error_ignored*/) { +static void run_poller(void* bp, grpc_error_handle /*error_ignored*/) { backup_poller* p = static_cast<backup_poller*>(bp); if (GRPC_TRACE_FLAG_ENABLED(grpc_tcp_trace)) { gpr_log(GPR_INFO, "BACKUP_POLLER:%p run", p); @@ -560,9 +560,11 @@ static void notify_on_write(grpc_tcp* tcp) { grpc_fd_notify_on_write(tcp->em_fd, &tcp->write_done_closure); } -static void tcp_drop_uncovered_then_handle_write(void* arg, grpc_error* error) { +static void tcp_drop_uncovered_then_handle_write(void* arg, + grpc_error_handle error) { if (GRPC_TRACE_FLAG_ENABLED(grpc_tcp_trace)) { - gpr_log(GPR_INFO, "TCP:%p got_write: %s", arg, grpc_error_string(error)); + gpr_log(GPR_INFO, "TCP:%p got_write: %s", arg, + grpc_error_std_string(error).c_str()); } drop_uncovered(static_cast<grpc_tcp*>(arg)); tcp_handle_write(arg, error); @@ -604,7 +606,8 @@ static size_t get_target_read_size(grpc_tcp* tcp) { return sz; } -static grpc_error* tcp_annotate_error(grpc_error* src_error, grpc_tcp* tcp) { +static grpc_error_handle tcp_annotate_error(grpc_error_handle src_error, + grpc_tcp* tcp) { return grpc_error_set_str( grpc_error_set_int( grpc_error_set_int(src_error, GRPC_ERROR_INT_FD, tcp->fd), @@ -615,10 +618,10 @@ static grpc_error* tcp_annotate_error(grpc_error* src_error, grpc_tcp* tcp) { grpc_slice_from_copied_string(tcp->peer_string.c_str())); } -static void tcp_handle_read(void* arg /* grpc_tcp */, grpc_error* error); -static void tcp_handle_write(void* arg /* grpc_tcp */, grpc_error* error); +static void tcp_handle_read(void* arg /* grpc_tcp */, grpc_error_handle error); +static void tcp_handle_write(void* arg /* grpc_tcp */, grpc_error_handle error); -static void tcp_shutdown(grpc_endpoint* ep, grpc_error* why) { +static void tcp_shutdown(grpc_endpoint* ep, grpc_error_handle why) { grpc_tcp* tcp = reinterpret_cast<grpc_tcp*>(ep); ZerocopyDisableAndWaitForRemaining(tcp); grpc_fd_shutdown(tcp->em_fd, why); @@ -678,16 +681,14 @@ static void tcp_destroy(grpc_endpoint* ep) { TCP_UNREF(tcp, "destroy"); } -static void call_read_cb(grpc_tcp* tcp, grpc_error* error) { +static void call_read_cb(grpc_tcp* tcp, grpc_error_handle error) { grpc_closure* cb = tcp->read_cb; if (GRPC_TRACE_FLAG_ENABLED(grpc_tcp_trace)) { gpr_log(GPR_INFO, "TCP:%p call_cb %p %p:%p", tcp, cb, cb->cb, cb->cb_arg); size_t i; - const char* str = grpc_error_string(error); gpr_log(GPR_INFO, "READ %p (peer=%s) error=%s", tcp, - tcp->peer_string.c_str(), str); - + tcp->peer_string.c_str(), grpc_error_std_string(error).c_str()); if (gpr_should_log(GPR_LOG_SEVERITY_DEBUG)) { for (i = 0; i < tcp->incoming_buffer->count; i++) { char* dump = grpc_dump_slice(tcp->incoming_buffer->slices[i], @@ -850,11 +851,11 @@ static void tcp_do_read(grpc_tcp* tcp) { TCP_UNREF(tcp, "read"); } -static void tcp_read_allocation_done(void* tcpp, grpc_error* error) { +static void tcp_read_allocation_done(void* tcpp, grpc_error_handle error) { grpc_tcp* tcp = static_cast<grpc_tcp*>(tcpp); if (GRPC_TRACE_FLAG_ENABLED(grpc_tcp_trace)) { gpr_log(GPR_INFO, "TCP:%p read_allocation_done: %s", tcp, - grpc_error_string(error)); + grpc_error_std_string(error).c_str()); } if (GPR_UNLIKELY(error != GRPC_ERROR_NONE)) { grpc_slice_buffer_reset_and_unref_internal(tcp->incoming_buffer); @@ -887,10 +888,11 @@ static void tcp_continue_read(grpc_tcp* tcp) { tcp_do_read(tcp); } -static void tcp_handle_read(void* arg /* grpc_tcp */, grpc_error* error) { +static void tcp_handle_read(void* arg /* grpc_tcp */, grpc_error_handle error) { grpc_tcp* tcp = static_cast<grpc_tcp*>(arg); if (GRPC_TRACE_FLAG_ENABLED(grpc_tcp_trace)) { - gpr_log(GPR_INFO, "TCP:%p got_read: %s", tcp, grpc_error_string(error)); + gpr_log(GPR_INFO, "TCP:%p got_read: %s", tcp, + grpc_error_std_string(error).c_str()); } if (GPR_UNLIKELY(error != GRPC_ERROR_NONE)) { @@ -958,7 +960,7 @@ static bool tcp_write_with_timestamps(grpc_tcp* tcp, struct msghdr* msg, int additional_flags = 0); /** The callback function to be invoked when we get an error on the socket. */ -static void tcp_handle_error(void* arg /* grpc_tcp */, grpc_error* error); +static void tcp_handle_error(void* arg /* grpc_tcp */, grpc_error_handle error); static TcpZerocopySendRecord* tcp_get_send_zerocopy_record( grpc_tcp* tcp, grpc_slice_buffer* buf); @@ -1213,10 +1215,12 @@ static bool process_errors(grpc_tcp* tcp) { } } -static void tcp_handle_error(void* arg /* grpc_tcp */, grpc_error* error) { +static void tcp_handle_error(void* arg /* grpc_tcp */, + grpc_error_handle error) { grpc_tcp* tcp = static_cast<grpc_tcp*>(arg); if (GRPC_TRACE_FLAG_ENABLED(grpc_tcp_trace)) { - gpr_log(GPR_INFO, "TCP:%p got_error: %s", tcp, grpc_error_string(error)); + gpr_log(GPR_INFO, "TCP:%p got_error: %s", tcp, + grpc_error_std_string(error).c_str()); } if (error != GRPC_ERROR_NONE || @@ -1241,11 +1245,11 @@ static void tcp_handle_error(void* arg /* grpc_tcp */, grpc_error* error) { #else /* GRPC_LINUX_ERRQUEUE */ static TcpZerocopySendRecord* tcp_get_send_zerocopy_record( - grpc_tcp* tcp, grpc_slice_buffer* buf) { + grpc_tcp* /*tcp*/, grpc_slice_buffer* /*buf*/) { return nullptr; } -static void ZerocopyDisableAndWaitForRemaining(grpc_tcp* tcp) {} +static void ZerocopyDisableAndWaitForRemaining(grpc_tcp* /*tcp*/) {} static bool tcp_write_with_timestamps(grpc_tcp* /*tcp*/, struct msghdr* /*msg*/, size_t /*sending_length*/, @@ -1257,7 +1261,7 @@ static bool tcp_write_with_timestamps(grpc_tcp* /*tcp*/, struct msghdr* /*msg*/, } static void tcp_handle_error(void* /*arg*/ /* grpc_tcp */, - grpc_error* /*error*/) { + grpc_error_handle /*error*/) { gpr_log(GPR_ERROR, "Error handling is not supported for this platform"); GPR_ASSERT(0); } @@ -1323,7 +1327,7 @@ void TcpZerocopySendRecord::UpdateOffsetForBytesSent(size_t sending_length, // returns true if done, false if pending; if returning true, *error is set static bool do_tcp_flush_zerocopy(grpc_tcp* tcp, TcpZerocopySendRecord* record, - grpc_error** error) { + grpc_error_handle* error) { struct msghdr msg; struct iovec iov[MAX_WRITE_IOVEC]; msg_iovlen_type iov_size; @@ -1391,15 +1395,15 @@ static bool do_tcp_flush_zerocopy(grpc_tcp* tcp, TcpZerocopySendRecord* record, static void UnrefMaybePutZerocopySendRecord(grpc_tcp* tcp, TcpZerocopySendRecord* record, - uint32_t seq, - const char* /* tag */) { + uint32_t /*seq*/, + const char* /*tag*/) { if (record->Unref()) { tcp->tcp_zerocopy_send_ctx.PutSendRecord(record); } } static bool tcp_flush_zerocopy(grpc_tcp* tcp, TcpZerocopySendRecord* record, - grpc_error** error) { + grpc_error_handle* error) { bool done = do_tcp_flush_zerocopy(tcp, record, error); if (done) { // Either we encountered an error, or we successfully sent all the bytes. @@ -1409,7 +1413,7 @@ static bool tcp_flush_zerocopy(grpc_tcp* tcp, TcpZerocopySendRecord* record, return done; } -static bool tcp_flush(grpc_tcp* tcp, grpc_error** error) { +static bool tcp_flush(grpc_tcp* tcp, grpc_error_handle* error) { struct msghdr msg; struct iovec iov[MAX_WRITE_IOVEC]; msg_iovlen_type iov_size; @@ -1516,7 +1520,8 @@ static bool tcp_flush(grpc_tcp* tcp, grpc_error** error) { } } -static void tcp_handle_write(void* arg /* grpc_tcp */, grpc_error* error) { +static void tcp_handle_write(void* arg /* grpc_tcp */, + grpc_error_handle error) { grpc_tcp* tcp = static_cast<grpc_tcp*>(arg); grpc_closure* cb; @@ -1549,8 +1554,7 @@ static void tcp_handle_write(void* arg /* grpc_tcp */, grpc_error* error) { tcp->write_cb = nullptr; tcp->current_zerocopy_send = nullptr; if (GRPC_TRACE_FLAG_ENABLED(grpc_tcp_trace)) { - const char* str = grpc_error_string(error); - gpr_log(GPR_INFO, "write: %s", str); + gpr_log(GPR_INFO, "write: %s", grpc_error_std_string(error).c_str()); } // No need to take a ref on error since tcp_flush provides a ref. grpc_core::Closure::Run(DEBUG_LOCATION, cb, error); @@ -1562,7 +1566,7 @@ static void tcp_write(grpc_endpoint* ep, grpc_slice_buffer* buf, grpc_closure* cb, void* arg) { GPR_TIMER_SCOPE("tcp_write", 0); grpc_tcp* tcp = reinterpret_cast<grpc_tcp*>(ep); - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; TcpZerocopySendRecord* zerocopy_send_record = nullptr; if (GRPC_TRACE_FLAG_ENABLED(grpc_tcp_trace)) { @@ -1618,8 +1622,7 @@ static void tcp_write(grpc_endpoint* ep, grpc_slice_buffer* buf, notify_on_write(tcp); } else { if (GRPC_TRACE_FLAG_ENABLED(grpc_tcp_trace)) { - const char* str = grpc_error_string(error); - gpr_log(GPR_INFO, "write: %s", str); + gpr_log(GPR_INFO, "write: %s", grpc_error_std_string(error).c_str()); } grpc_core::Closure::Run(DEBUG_LOCATION, cb, error); } @@ -1639,7 +1642,6 @@ static void tcp_add_to_pollset_set(grpc_endpoint* ep, static void tcp_delete_from_pollset_set(grpc_endpoint* ep, grpc_pollset_set* pollset_set) { grpc_tcp* tcp = reinterpret_cast<grpc_tcp*>(ep); - ZerocopyDisableAndWaitForRemaining(tcp); grpc_pollset_set_del_fd(pollset_set, tcp->em_fd); } @@ -1673,10 +1675,7 @@ static bool tcp_can_track_err(grpc_endpoint* ep) { if (getsockname(tcp->fd, &addr, &len) < 0) { return false; } - if (addr.sa_family == AF_INET || addr.sa_family == AF_INET6) { - return true; - } - return false; + return addr.sa_family == AF_INET || addr.sa_family == AF_INET6; } static const grpc_endpoint_vtable vtable = {tcp_read, diff --git a/grpc/src/core/lib/iomgr/tcp_server.cc b/grpc/src/core/lib/iomgr/tcp_server.cc index 046fd497..8d6fefbb 100644 --- a/grpc/src/core/lib/iomgr/tcp_server.cc +++ b/grpc/src/core/lib/iomgr/tcp_server.cc @@ -22,9 +22,9 @@ grpc_tcp_server_vtable* grpc_tcp_server_impl; -grpc_error* grpc_tcp_server_create(grpc_closure* shutdown_complete, - const grpc_channel_args* args, - grpc_tcp_server** server) { +grpc_error_handle grpc_tcp_server_create(grpc_closure* shutdown_complete, + const grpc_channel_args* args, + grpc_tcp_server** server) { return grpc_tcp_server_impl->create(shutdown_complete, args, server); } @@ -34,9 +34,9 @@ void grpc_tcp_server_start(grpc_tcp_server* server, grpc_tcp_server_impl->start(server, pollsets, on_accept_cb, cb_arg); } -grpc_error* grpc_tcp_server_add_port(grpc_tcp_server* s, - const grpc_resolved_address* addr, - int* out_port) { +grpc_error_handle grpc_tcp_server_add_port(grpc_tcp_server* s, + const grpc_resolved_address* addr, + int* out_port) { return grpc_tcp_server_impl->add_port(s, addr, out_port); } diff --git a/grpc/src/core/lib/iomgr/tcp_server.h b/grpc/src/core/lib/iomgr/tcp_server.h index 6ba3513d..50ac4e74 100644 --- a/grpc/src/core/lib/iomgr/tcp_server.h +++ b/grpc/src/core/lib/iomgr/tcp_server.h @@ -63,14 +63,15 @@ class TcpServerFdHandler { } // namespace grpc_core typedef struct grpc_tcp_server_vtable { - grpc_error* (*create)(grpc_closure* shutdown_complete, - const grpc_channel_args* args, - grpc_tcp_server** server); + grpc_error_handle (*create)(grpc_closure* shutdown_complete, + const grpc_channel_args* args, + grpc_tcp_server** server); void (*start)(grpc_tcp_server* server, const std::vector<grpc_pollset*>* pollsets, grpc_tcp_server_cb on_accept_cb, void* cb_arg); - grpc_error* (*add_port)(grpc_tcp_server* s, const grpc_resolved_address* addr, - int* out_port); + grpc_error_handle (*add_port)(grpc_tcp_server* s, + const grpc_resolved_address* addr, + int* out_port); grpc_core::TcpServerFdHandler* (*create_fd_handler)(grpc_tcp_server* s); unsigned (*port_fd_count)(grpc_tcp_server* s, unsigned port_index); int (*port_fd)(grpc_tcp_server* s, unsigned port_index, unsigned fd_index); @@ -84,9 +85,9 @@ typedef struct grpc_tcp_server_vtable { /* Create a server, initially not bound to any ports. The caller owns one ref. If shutdown_complete is not NULL, it will be used by grpc_tcp_server_unref() when the ref count reaches zero. */ -grpc_error* grpc_tcp_server_create(grpc_closure* shutdown_complete, - const grpc_channel_args* args, - grpc_tcp_server** server); +grpc_error_handle grpc_tcp_server_create(grpc_closure* shutdown_complete, + const grpc_channel_args* args, + grpc_tcp_server** server); /* Start listening to bound ports */ void grpc_tcp_server_start(grpc_tcp_server* server, @@ -102,9 +103,9 @@ void grpc_tcp_server_start(grpc_tcp_server* server, but not dualstack sockets. */ /* TODO(ctiller): deprecate this, and make grpc_tcp_server_add_ports to handle all of the multiple socket port matching logic in one place */ -grpc_error* grpc_tcp_server_add_port(grpc_tcp_server* s, - const grpc_resolved_address* addr, - int* out_port); +grpc_error_handle grpc_tcp_server_add_port(grpc_tcp_server* s, + const grpc_resolved_address* addr, + int* out_port); /* Create and return a TcpServerFdHandler so that it can be used by upper layer to hand over an externally connected fd to the grpc server. */ diff --git a/grpc/src/core/lib/iomgr/tcp_server_custom.cc b/grpc/src/core/lib/iomgr/tcp_server_custom.cc index 18d74945..fff75453 100644 --- a/grpc/src/core/lib/iomgr/tcp_server_custom.cc +++ b/grpc/src/core/lib/iomgr/tcp_server_custom.cc @@ -28,12 +28,12 @@ #include <grpc/support/alloc.h> #include <grpc/support/log.h> +#include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/iomgr_custom.h" #include "src/core/lib/iomgr/sockaddr.h" -#include "src/core/lib/iomgr/sockaddr_utils.h" #include "src/core/lib/iomgr/tcp_custom.h" #include "src/core/lib/iomgr/tcp_server.h" @@ -80,9 +80,9 @@ struct grpc_tcp_server { grpc_resource_quota* resource_quota; }; -static grpc_error* tcp_server_create(grpc_closure* shutdown_complete, - const grpc_channel_args* args, - grpc_tcp_server** server) { +static grpc_error_handle tcp_server_create(grpc_closure* shutdown_complete, + const grpc_channel_args* args, + grpc_tcp_server** server) { grpc_tcp_server* s = static_cast<grpc_tcp_server*>(gpr_malloc(sizeof(grpc_tcp_server))); // Let the implementation decide if so_reuseport can be enabled or not. @@ -218,7 +218,7 @@ static void finish_accept(grpc_tcp_listener* sp, grpc_custom_socket* socket) { grpc_endpoint* ep = nullptr; grpc_resolved_address peer_name; std::string peer_name_string; - grpc_error* err; + grpc_error_handle err; memset(&peer_name, 0, sizeof(grpc_resolved_address)); peer_name.len = GRPC_MAX_SOCKADDR_SIZE; @@ -246,17 +246,18 @@ static void finish_accept(grpc_tcp_listener* sp, grpc_custom_socket* socket) { static void custom_accept_callback(grpc_custom_socket* socket, grpc_custom_socket* client, - grpc_error* error); + grpc_error_handle error); static void custom_accept_callback(grpc_custom_socket* socket, grpc_custom_socket* client, - grpc_error* error) { + grpc_error_handle error) { grpc_core::ApplicationCallbackExecCtx callback_exec_ctx; grpc_core::ExecCtx exec_ctx; grpc_tcp_listener* sp = socket->listener; if (error != GRPC_ERROR_NONE) { if (!sp->closed) { - gpr_log(GPR_ERROR, "Accept failed: %s", grpc_error_string(error)); + gpr_log(GPR_ERROR, "Accept failed: %s", + grpc_error_std_string(error).c_str()); } gpr_free(client); GRPC_ERROR_UNREF(error); @@ -275,14 +276,14 @@ static void custom_accept_callback(grpc_custom_socket* socket, } } -static grpc_error* add_socket_to_server(grpc_tcp_server* s, - grpc_custom_socket* socket, - const grpc_resolved_address* addr, - unsigned port_index, - grpc_tcp_listener** listener) { +static grpc_error_handle add_socket_to_server(grpc_tcp_server* s, + grpc_custom_socket* socket, + const grpc_resolved_address* addr, + unsigned port_index, + grpc_tcp_listener** listener) { grpc_tcp_listener* sp = nullptr; int port = -1; - grpc_error* error; + grpc_error_handle error; grpc_resolved_address sockname_temp; // NOTE(lidiz) The last argument is "flags" which is unused by other @@ -335,9 +336,9 @@ static grpc_error* add_socket_to_server(grpc_tcp_server* s, return GRPC_ERROR_NONE; } -static grpc_error* tcp_server_add_port(grpc_tcp_server* s, - const grpc_resolved_address* addr, - int* port) { +static grpc_error_handle tcp_server_add_port(grpc_tcp_server* s, + const grpc_resolved_address* addr, + int* port) { // This function is mostly copied from tcp_server_windows.c grpc_tcp_listener* sp = nullptr; grpc_custom_socket* socket; @@ -346,7 +347,7 @@ static grpc_error* tcp_server_add_port(grpc_tcp_server* s, grpc_resolved_address* allocated_addr = nullptr; grpc_resolved_address sockname_temp; unsigned port_index = 0; - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; int family; GRPC_CUSTOM_IOMGR_ASSERT_SAME_THREAD(); @@ -392,7 +393,7 @@ static grpc_error* tcp_server_add_port(grpc_tcp_server* s, if (GRPC_TRACE_FLAG_ENABLED(grpc_tcp_trace)) { gpr_log(GPR_INFO, "SERVER %p add_port %s error=%s", s, grpc_sockaddr_to_string(addr, false).c_str(), - grpc_error_string(error)); + grpc_error_std_string(error).c_str()); } family = grpc_sockaddr_get_family(addr); @@ -410,8 +411,9 @@ static grpc_error* tcp_server_add_port(grpc_tcp_server* s, gpr_free(allocated_addr); if (error != GRPC_ERROR_NONE) { - grpc_error* error_out = GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( - "Failed to add port to server", &error, 1); + grpc_error_handle error_out = + GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( + "Failed to add port to server", &error, 1); GRPC_ERROR_UNREF(error); error = error_out; *port = -1; diff --git a/grpc/src/core/lib/iomgr/tcp_server_posix.cc b/grpc/src/core/lib/iomgr/tcp_server_posix.cc index d6e13e81..5662aec7 100644 --- a/grpc/src/core/lib/iomgr/tcp_server_posix.cc +++ b/grpc/src/core/lib/iomgr/tcp_server_posix.cc @@ -47,22 +47,22 @@ #include <grpc/support/sync.h> #include <grpc/support/time.h> +#include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gpr/string.h" #include "src/core/lib/gprpp/memory.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/sockaddr.h" -#include "src/core/lib/iomgr/sockaddr_utils.h" #include "src/core/lib/iomgr/socket_utils_posix.h" #include "src/core/lib/iomgr/tcp_posix.h" #include "src/core/lib/iomgr/tcp_server.h" #include "src/core/lib/iomgr/tcp_server_utils_posix.h" #include "src/core/lib/iomgr/unix_sockets_posix.h" -static grpc_error* tcp_server_create(grpc_closure* shutdown_complete, - const grpc_channel_args* args, - grpc_tcp_server** server) { +static grpc_error_handle tcp_server_create(grpc_closure* shutdown_complete, + const grpc_channel_args* args, + grpc_tcp_server** server) { grpc_tcp_server* s = static_cast<grpc_tcp_server*>(gpr_zalloc(sizeof(grpc_tcp_server))); s->so_reuseport = grpc_is_socket_reuse_port_supported(); @@ -129,7 +129,7 @@ static void finish_shutdown(grpc_tcp_server* s) { gpr_free(s); } -static void destroyed_port(void* server, grpc_error* /*error*/) { +static void destroyed_port(void* server, grpc_error_handle /*error*/) { grpc_tcp_server* s = static_cast<grpc_tcp_server*>(server); gpr_mu_lock(&s->mu); s->destroyed_ports++; @@ -188,7 +188,7 @@ static void tcp_server_destroy(grpc_tcp_server* s) { } /* event manager callback when reads are ready */ -static void on_read(void* arg, grpc_error* err) { +static void on_read(void* arg, grpc_error_handle err) { grpc_tcp_listener* sp = static_cast<grpc_tcp_listener*>(arg); grpc_pollset* read_notifier_pollset; if (err != GRPC_ERROR_NONE) { @@ -281,18 +281,18 @@ error: } /* Treat :: or 0.0.0.0 as a family-agnostic wildcard. */ -static grpc_error* add_wildcard_addrs_to_server(grpc_tcp_server* s, - unsigned port_index, - int requested_port, - int* out_port) { +static grpc_error_handle add_wildcard_addrs_to_server(grpc_tcp_server* s, + unsigned port_index, + int requested_port, + int* out_port) { grpc_resolved_address wild4; grpc_resolved_address wild6; unsigned fd_index = 0; grpc_dualstack_mode dsmode; grpc_tcp_listener* sp = nullptr; grpc_tcp_listener* sp2 = nullptr; - grpc_error* v6_err = GRPC_ERROR_NONE; - grpc_error* v4_err = GRPC_ERROR_NONE; + grpc_error_handle v6_err = GRPC_ERROR_NONE; + grpc_error_handle v4_err = GRPC_ERROR_NONE; *out_port = -1; if (grpc_tcp_server_have_ifaddrs() && s->expand_wildcard_addrs) { @@ -325,19 +325,19 @@ static grpc_error* add_wildcard_addrs_to_server(grpc_tcp_server* s, gpr_log(GPR_INFO, "Failed to add :: listener, " "the environment may not support IPv6: %s", - grpc_error_string(v6_err)); + grpc_error_std_string(v6_err).c_str()); GRPC_ERROR_UNREF(v6_err); } if (v4_err != GRPC_ERROR_NONE) { gpr_log(GPR_INFO, "Failed to add 0.0.0.0 listener, " "the environment may not support IPv4: %s", - grpc_error_string(v4_err)); + grpc_error_std_string(v4_err).c_str()); GRPC_ERROR_UNREF(v4_err); } return GRPC_ERROR_NONE; } else { - grpc_error* root_err = GRPC_ERROR_CREATE_FROM_STATIC_STRING( + grpc_error_handle root_err = GRPC_ERROR_CREATE_FROM_STATIC_STRING( "Failed to add any wildcard listeners"); GPR_ASSERT(v6_err != GRPC_ERROR_NONE && v4_err != GRPC_ERROR_NONE); root_err = grpc_error_add_child(root_err, v6_err); @@ -346,10 +346,11 @@ static grpc_error* add_wildcard_addrs_to_server(grpc_tcp_server* s, } } -static grpc_error* clone_port(grpc_tcp_listener* listener, unsigned count) { +static grpc_error_handle clone_port(grpc_tcp_listener* listener, + unsigned count) { grpc_tcp_listener* sp = nullptr; std::string addr_str; - grpc_error* err; + grpc_error_handle err; for (grpc_tcp_listener* l = listener->next; l && l->is_sibling; l = l->next) { l->fd_index += count; @@ -395,16 +396,16 @@ static grpc_error* clone_port(grpc_tcp_listener* listener, unsigned count) { return GRPC_ERROR_NONE; } -static grpc_error* tcp_server_add_port(grpc_tcp_server* s, - const grpc_resolved_address* addr, - int* out_port) { +static grpc_error_handle tcp_server_add_port(grpc_tcp_server* s, + const grpc_resolved_address* addr, + int* out_port) { grpc_tcp_listener* sp; grpc_resolved_address sockname_temp; grpc_resolved_address addr6_v4mapped; int requested_port = grpc_sockaddr_get_port(addr); unsigned port_index = 0; grpc_dualstack_mode dsmode; - grpc_error* err; + grpc_error_handle err; *out_port = -1; if (s->tail != nullptr) { port_index = s->tail->port_index + 1; diff --git a/grpc/src/core/lib/iomgr/tcp_server_utils_posix.h b/grpc/src/core/lib/iomgr/tcp_server_utils_posix.h index 6b8a5f9f..ed4587a3 100644 --- a/grpc/src/core/lib/iomgr/tcp_server_utils_posix.h +++ b/grpc/src/core/lib/iomgr/tcp_server_utils_posix.h @@ -98,26 +98,27 @@ struct grpc_tcp_server { /* If successful, add a listener to \a s for \a addr, set \a dsmode for the socket, and return the \a listener. */ -grpc_error* grpc_tcp_server_add_addr(grpc_tcp_server* s, - const grpc_resolved_address* addr, - unsigned port_index, unsigned fd_index, - grpc_dualstack_mode* dsmode, - grpc_tcp_listener** listener); +grpc_error_handle grpc_tcp_server_add_addr(grpc_tcp_server* s, + const grpc_resolved_address* addr, + unsigned port_index, + unsigned fd_index, + grpc_dualstack_mode* dsmode, + grpc_tcp_listener** listener); /* Get all addresses assigned to network interfaces on the machine and create a listener for each. requested_port is the port to use for every listener, or 0 to select one random port that will be used for every listener. Set *out_port to the port selected. Return GRPC_ERROR_NONE only if all listeners were added. */ -grpc_error* grpc_tcp_server_add_all_local_addrs(grpc_tcp_server* s, - unsigned port_index, - int requested_port, - int* out_port); +grpc_error_handle grpc_tcp_server_add_all_local_addrs(grpc_tcp_server* s, + unsigned port_index, + int requested_port, + int* out_port); /* Prepare a recently-created socket for listening. */ -grpc_error* grpc_tcp_server_prepare_socket(grpc_tcp_server*, int fd, - const grpc_resolved_address* addr, - bool so_reuseport, int* port); +grpc_error_handle grpc_tcp_server_prepare_socket( + grpc_tcp_server*, int fd, const grpc_resolved_address* addr, + bool so_reuseport, int* port); /* Ruturn true if the platform supports ifaddrs */ bool grpc_tcp_server_have_ifaddrs(void); diff --git a/grpc/src/core/lib/iomgr/tcp_server_utils_posix_common.cc b/grpc/src/core/lib/iomgr/tcp_server_utils_posix_common.cc index bd7ff9b3..6fdf0701 100644 --- a/grpc/src/core/lib/iomgr/tcp_server_utils_posix_common.cc +++ b/grpc/src/core/lib/iomgr/tcp_server_utils_posix_common.cc @@ -37,9 +37,9 @@ #include <grpc/support/log.h> #include <grpc/support/sync.h> +#include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/sockaddr.h" -#include "src/core/lib/iomgr/sockaddr_utils.h" #include "src/core/lib/iomgr/unix_sockets_posix.h" #define MIN_SAFE_ACCEPT_QUEUE_SIZE 100 @@ -80,14 +80,15 @@ static int get_max_accept_queue_size(void) { return s_max_accept_queue_size; } -static grpc_error* add_socket_to_server(grpc_tcp_server* s, int fd, - const grpc_resolved_address* addr, - unsigned port_index, unsigned fd_index, - grpc_tcp_listener** listener) { +static grpc_error_handle add_socket_to_server(grpc_tcp_server* s, int fd, + const grpc_resolved_address* addr, + unsigned port_index, + unsigned fd_index, + grpc_tcp_listener** listener) { grpc_tcp_listener* sp = nullptr; int port = -1; - grpc_error* err = + grpc_error_handle err = grpc_tcp_server_prepare_socket(s, fd, addr, s->so_reuseport, &port); if (err == GRPC_ERROR_NONE) { GPR_ASSERT(port > 0); @@ -123,14 +124,15 @@ static grpc_error* add_socket_to_server(grpc_tcp_server* s, int fd, /* If successful, add a listener to s for addr, set *dsmode for the socket, and return the *listener. */ -grpc_error* grpc_tcp_server_add_addr(grpc_tcp_server* s, - const grpc_resolved_address* addr, - unsigned port_index, unsigned fd_index, - grpc_dualstack_mode* dsmode, - grpc_tcp_listener** listener) { +grpc_error_handle grpc_tcp_server_add_addr(grpc_tcp_server* s, + const grpc_resolved_address* addr, + unsigned port_index, + unsigned fd_index, + grpc_dualstack_mode* dsmode, + grpc_tcp_listener** listener) { grpc_resolved_address addr4_copy; int fd; - grpc_error* err = + grpc_error_handle err = grpc_create_dualstack_socket(addr, SOCK_STREAM, 0, dsmode, &fd); if (err != GRPC_ERROR_NONE) { return err; @@ -143,11 +145,11 @@ grpc_error* grpc_tcp_server_add_addr(grpc_tcp_server* s, } /* Prepare a recently-created socket for listening. */ -grpc_error* grpc_tcp_server_prepare_socket(grpc_tcp_server* s, int fd, - const grpc_resolved_address* addr, - bool so_reuseport, int* port) { +grpc_error_handle grpc_tcp_server_prepare_socket( + grpc_tcp_server* s, int fd, const grpc_resolved_address* addr, + bool so_reuseport, int* port) { grpc_resolved_address sockname_temp; - grpc_error* err = GRPC_ERROR_NONE; + grpc_error_handle err = GRPC_ERROR_NONE; GPR_ASSERT(fd >= 0); @@ -210,7 +212,7 @@ error: if (fd >= 0) { close(fd); } - grpc_error* ret = + grpc_error_handle ret = grpc_error_set_int(GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Unable to configure socket", &err, 1), GRPC_ERROR_INT_FD, fd); diff --git a/grpc/src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc b/grpc/src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc index d591f789..a7e8f840 100644 --- a/grpc/src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc +++ b/grpc/src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc @@ -36,9 +36,9 @@ #include <grpc/support/alloc.h> #include <grpc/support/log.h> +#include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/sockaddr.h" -#include "src/core/lib/iomgr/sockaddr_utils.h" /* Return the listener in s with address addr or NULL. */ static grpc_tcp_listener* find_listener_with_addr(grpc_tcp_server* s, @@ -58,12 +58,12 @@ static grpc_tcp_listener* find_listener_with_addr(grpc_tcp_server* s, } /* Bind to "::" to get a port number not used by any address. */ -static grpc_error* get_unused_port(int* port) { +static grpc_error_handle get_unused_port(int* port) { grpc_resolved_address wild; grpc_sockaddr_make_wildcard6(0, &wild); grpc_dualstack_mode dsmode; int fd; - grpc_error* err = + grpc_error_handle err = grpc_create_dualstack_socket(&wild, SOCK_STREAM, 0, &dsmode, &fd); if (err != GRPC_ERROR_NONE) { return err; @@ -89,15 +89,15 @@ static grpc_error* get_unused_port(int* port) { : GRPC_ERROR_NONE; } -grpc_error* grpc_tcp_server_add_all_local_addrs(grpc_tcp_server* s, - unsigned port_index, - int requested_port, - int* out_port) { +grpc_error_handle grpc_tcp_server_add_all_local_addrs(grpc_tcp_server* s, + unsigned port_index, + int requested_port, + int* out_port) { struct ifaddrs* ifa = nullptr; struct ifaddrs* ifa_it; unsigned fd_index = 0; grpc_tcp_listener* sp = nullptr; - grpc_error* err = GRPC_ERROR_NONE; + grpc_error_handle err = GRPC_ERROR_NONE; if (requested_port == 0) { /* Note: There could be a race where some local addrs can listen on the selected port and some can't. The sane way to handle this would be to @@ -146,7 +146,7 @@ grpc_error* grpc_tcp_server_add_all_local_addrs(grpc_tcp_server* s, } if ((err = grpc_tcp_server_add_addr(s, &addr, port_index, fd_index, &dsmode, &new_sp)) != GRPC_ERROR_NONE) { - grpc_error* root_err = GRPC_ERROR_CREATE_FROM_COPIED_STRING( + grpc_error_handle root_err = GRPC_ERROR_CREATE_FROM_COPIED_STRING( absl::StrCat("Failed to add listener: ", addr_str).c_str()); err = grpc_error_add_child(root_err, err); break; diff --git a/grpc/src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc b/grpc/src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc index 86ee14f2..a9354b00 100644 --- a/grpc/src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc +++ b/grpc/src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc @@ -24,10 +24,10 @@ #include "src/core/lib/iomgr/tcp_server_utils_posix.h" -grpc_error* grpc_tcp_server_add_all_local_addrs(grpc_tcp_server* s, - unsigned port_index, - int requested_port, - int* out_port) { +grpc_error_handle grpc_tcp_server_add_all_local_addrs(grpc_tcp_server* s, + unsigned port_index, + int requested_port, + int* out_port) { return GRPC_ERROR_CREATE_FROM_STATIC_STRING("no ifaddrs available"); } diff --git a/grpc/src/core/lib/iomgr/tcp_server_windows.cc b/grpc/src/core/lib/iomgr/tcp_server_windows.cc index c44c3a5c..614ea35e 100644 --- a/grpc/src/core/lib/iomgr/tcp_server_windows.cc +++ b/grpc/src/core/lib/iomgr/tcp_server_windows.cc @@ -38,11 +38,11 @@ #include <grpc/support/sync.h> #include <grpc/support/time.h> +#include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/iocp_windows.h" #include "src/core/lib/iomgr/pollset_windows.h" #include "src/core/lib/iomgr/resolve_address.h" -#include "src/core/lib/iomgr/sockaddr_utils.h" #include "src/core/lib/iomgr/socket_windows.h" #include "src/core/lib/iomgr/tcp_server.h" #include "src/core/lib/iomgr/tcp_windows.h" @@ -101,9 +101,9 @@ struct grpc_tcp_server { /* Public function. Allocates the proper data structures to hold a grpc_tcp_server. */ -static grpc_error* tcp_server_create(grpc_closure* shutdown_complete, - const grpc_channel_args* args, - grpc_tcp_server** server) { +static grpc_error_handle tcp_server_create(grpc_closure* shutdown_complete, + const grpc_channel_args* args, + grpc_tcp_server** server) { grpc_tcp_server* s = (grpc_tcp_server*)gpr_malloc(sizeof(grpc_tcp_server)); s->channel_args = grpc_channel_args_copy(args); gpr_ref_init(&s->refs, 1); @@ -120,7 +120,7 @@ static grpc_error* tcp_server_create(grpc_closure* shutdown_complete, return GRPC_ERROR_NONE; } -static void destroy_server(void* arg, grpc_error* error) { +static void destroy_server(void* arg, grpc_error_handle error) { grpc_tcp_server* s = (grpc_tcp_server*)arg; /* Now that the accepts have been aborted, we can destroy the sockets. @@ -191,11 +191,11 @@ static void tcp_server_unref(grpc_tcp_server* s) { } /* Prepare (bind) a recently-created socket for listening. */ -static grpc_error* prepare_socket(SOCKET sock, - const grpc_resolved_address* addr, - int* port) { +static grpc_error_handle prepare_socket(SOCKET sock, + const grpc_resolved_address* addr, + int* port) { grpc_resolved_address sockname_temp; - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; int sockname_temp_len; error = grpc_tcp_prepare_socket(sock); @@ -249,12 +249,12 @@ static void decrement_active_ports_and_notify_locked(grpc_tcp_listener* sp) { /* In order to do an async accept, we need to create a socket first which will be the one assigned to the new incoming connection. */ -static grpc_error* start_accept_locked(grpc_tcp_listener* port) { +static grpc_error_handle start_accept_locked(grpc_tcp_listener* port) { SOCKET sock = INVALID_SOCKET; BOOL success; DWORD addrlen = sizeof(grpc_sockaddr_in6) + 16; DWORD bytes_received = 0; - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; if (port->shutting_down) { return GRPC_ERROR_NONE; @@ -299,7 +299,7 @@ failure: } /* Event manager callback when reads are ready. */ -static void on_accept(void* arg, grpc_error* error) { +static void on_accept(void* arg, grpc_error_handle error) { grpc_tcp_listener* sp = (grpc_tcp_listener*)arg; SOCKET sock = sp->new_socket; grpc_winsocket_callback_info* info = &sp->socket->read_info; @@ -318,8 +318,8 @@ static void on_accept(void* arg, grpc_error* error) { this is necessary in the read/write case, it's useless for the accept case. We only need to adjust the pending callback count */ if (error != GRPC_ERROR_NONE) { - const char* msg = grpc_error_string(error); - gpr_log(GPR_INFO, "Skipping on_accept due to error: %s", msg); + gpr_log(GPR_INFO, "Skipping on_accept due to error: %s", + grpc_error_std_string(error).c_str()); gpr_mu_unlock(&sp->server->mu); return; @@ -388,17 +388,17 @@ static void on_accept(void* arg, grpc_error* error) { gpr_mu_unlock(&sp->server->mu); } -static grpc_error* add_socket_to_server(grpc_tcp_server* s, SOCKET sock, - const grpc_resolved_address* addr, - unsigned port_index, - grpc_tcp_listener** listener) { +static grpc_error_handle add_socket_to_server(grpc_tcp_server* s, SOCKET sock, + const grpc_resolved_address* addr, + unsigned port_index, + grpc_tcp_listener** listener) { grpc_tcp_listener* sp = NULL; int port = -1; int status; GUID guid = WSAID_ACCEPTEX; DWORD ioctl_num_bytes; LPFN_ACCEPTEX AcceptEx; - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; /* We need to grab the AcceptEx pointer for that port, as it may be interface-dependent. We'll cache it to avoid doing that again. */ @@ -446,9 +446,9 @@ static grpc_error* add_socket_to_server(grpc_tcp_server* s, SOCKET sock, return GRPC_ERROR_NONE; } -static grpc_error* tcp_server_add_port(grpc_tcp_server* s, - const grpc_resolved_address* addr, - int* port) { +static grpc_error_handle tcp_server_add_port(grpc_tcp_server* s, + const grpc_resolved_address* addr, + int* port) { grpc_tcp_listener* sp = NULL; SOCKET sock; grpc_resolved_address addr6_v4mapped; @@ -456,7 +456,7 @@ static grpc_error* tcp_server_add_port(grpc_tcp_server* s, grpc_resolved_address* allocated_addr = NULL; grpc_resolved_address sockname_temp; unsigned port_index = 0; - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; if (s->tail != NULL) { port_index = s->tail->port_index + 1; @@ -508,8 +508,9 @@ done: gpr_free(allocated_addr); if (error != GRPC_ERROR_NONE) { - grpc_error* error_out = GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( - "Failed to add port to server", &error, 1); + grpc_error_handle error_out = + GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( + "Failed to add port to server", &error, 1); GRPC_ERROR_UNREF(error); error = error_out; *port = -1; diff --git a/grpc/src/core/lib/iomgr/tcp_uv.cc b/grpc/src/core/lib/iomgr/tcp_uv.cc index 942b7d60..8f64d22b 100644 --- a/grpc/src/core/lib/iomgr/tcp_uv.cc +++ b/grpc/src/core/lib/iomgr/tcp_uv.cc @@ -55,7 +55,7 @@ typedef struct uv_socket_t { int pending_connections; grpc_custom_socket* accept_socket; - grpc_error* accept_error; + grpc_error_handle accept_error; grpc_custom_connect_callback connect_cb; grpc_custom_write_callback write_cb; @@ -65,11 +65,11 @@ typedef struct uv_socket_t { } uv_socket_t; -static grpc_error* tcp_error_create(const char* desc, int status) { +static grpc_error_handle tcp_error_create(const char* desc, int status) { if (status == 0) { return GRPC_ERROR_NONE; } - grpc_error* error = GRPC_ERROR_CREATE_FROM_STATIC_STRING(desc); + grpc_error_handle error = GRPC_ERROR_CREATE_FROM_STATIC_STRING(desc); /* All tcp errors are marked with UNAVAILABLE so that application may * choose to retry. */ error = grpc_error_set_int(error, GRPC_ERROR_INT_GRPC_STATUS, @@ -95,7 +95,7 @@ static void alloc_uv_buf(uv_handle_t* handle, size_t suggested_size, static void uv_read_callback(uv_stream_t* stream, ssize_t nread, const uv_buf_t* buf) { - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; if (nread == 0) { // Nothing happened. Wait for the next callback return; @@ -126,7 +126,7 @@ static void uv_socket_read(grpc_custom_socket* socket, char* buffer, size_t length, grpc_custom_read_callback read_cb) { uv_socket_t* uv_socket = (uv_socket_t*)socket->impl; int status; - grpc_error* error; + grpc_error_handle error; uv_socket->read_cb = read_cb; uv_socket->read_buf = buffer; uv_socket->read_len = length; @@ -184,7 +184,8 @@ static void uv_socket_close(grpc_custom_socket* socket, uv_close((uv_handle_t*)uv_socket->handle, uv_close_callback); } -static grpc_error* uv_socket_init_helper(uv_socket_t* uv_socket, int domain) { +static grpc_error_handle uv_socket_init_helper(uv_socket_t* uv_socket, + int domain) { uv_tcp_t* tcp = (uv_tcp_t*)gpr_malloc(sizeof(uv_tcp_t)); uv_socket->handle = tcp; int status = uv_tcp_init_ex(uv_default_loop(), tcp, (unsigned int)domain); @@ -212,9 +213,10 @@ static grpc_error* uv_socket_init_helper(uv_socket_t* uv_socket, int domain) { return GRPC_ERROR_NONE; } -static grpc_error* uv_socket_init(grpc_custom_socket* socket, int domain) { +static grpc_error_handle uv_socket_init(grpc_custom_socket* socket, + int domain) { uv_socket_t* uv_socket = (uv_socket_t*)gpr_malloc(sizeof(uv_socket_t)); - grpc_error* error = uv_socket_init_helper(uv_socket, domain); + grpc_error_handle error = uv_socket_init_helper(uv_socket, domain); if (error != GRPC_ERROR_NONE) { return error; } @@ -223,18 +225,18 @@ static grpc_error* uv_socket_init(grpc_custom_socket* socket, int domain) { return GRPC_ERROR_NONE; } -static grpc_error* uv_socket_getpeername(grpc_custom_socket* socket, - const grpc_sockaddr* addr, - int* addr_len) { +static grpc_error_handle uv_socket_getpeername(grpc_custom_socket* socket, + const grpc_sockaddr* addr, + int* addr_len) { uv_socket_t* uv_socket = (uv_socket_t*)socket->impl; int err = uv_tcp_getpeername(uv_socket->handle, (struct sockaddr*)IGNORE_CONST(addr), addr_len); return tcp_error_create("getpeername failed", err); } -static grpc_error* uv_socket_getsockname(grpc_custom_socket* socket, - const grpc_sockaddr* addr, - int* addr_len) { +static grpc_error_handle uv_socket_getsockname(grpc_custom_socket* socket, + const grpc_sockaddr* addr, + int* addr_len) { uv_socket_t* uv_socket = (uv_socket_t*)socket->impl; int err = uv_tcp_getsockname(uv_socket->handle, (struct sockaddr*)IGNORE_CONST(addr), addr_len); @@ -247,13 +249,13 @@ static void accept_new_connection(grpc_custom_socket* socket) { return; } grpc_custom_socket* new_socket = uv_socket->accept_socket; - grpc_error* error = uv_socket->accept_error; + grpc_error_handle error = uv_socket->accept_error; uv_socket->accept_socket = nullptr; uv_socket->accept_error = GRPC_ERROR_NONE; uv_socket->pending_connections -= 1; if (uv_socket->accept_error != GRPC_ERROR_NONE) { - uv_stream_t dummy_handle; - uv_accept((uv_stream_t*)uv_socket->handle, &dummy_handle); + uv_stream_t phony_handle; + uv_accept((uv_stream_t*)uv_socket->handle, &phony_handle); uv_socket->accept_cb(socket, new_socket, error); } else { uv_socket_t* uv_new_socket = (uv_socket_t*)gpr_malloc(sizeof(uv_socket_t)); @@ -293,16 +295,16 @@ void uv_socket_accept(grpc_custom_socket* socket, accept_new_connection(socket); } -static grpc_error* uv_socket_bind(grpc_custom_socket* socket, - const grpc_sockaddr* addr, size_t len, - int flags) { +static grpc_error_handle uv_socket_bind(grpc_custom_socket* socket, + const grpc_sockaddr* addr, size_t len, + int flags) { uv_socket_t* uv_socket = (uv_socket_t*)socket->impl; int status = uv_tcp_bind((uv_tcp_t*)uv_socket->handle, (struct sockaddr*)addr, 0); return tcp_error_create("Failed to bind to port", status); } -static grpc_error* uv_socket_listen(grpc_custom_socket* socket) { +static grpc_error_handle uv_socket_listen(grpc_custom_socket* socket) { uv_socket_t* uv_socket = (uv_socket_t*)socket->impl; int status = uv_listen((uv_stream_t*)uv_socket->handle, SOMAXCONN, uv_on_connect); @@ -312,7 +314,7 @@ static grpc_error* uv_socket_listen(grpc_custom_socket* socket) { static void uv_tc_on_connect(uv_connect_t* req, int status) { grpc_custom_socket* socket = (grpc_custom_socket*)req->data; uv_socket_t* uv_socket = (uv_socket_t*)socket->impl; - grpc_error* error; + grpc_error_handle error; if (status == UV_ECANCELED) { // This should only happen if the handle is already closed error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("Timeout occurred"); @@ -370,8 +372,8 @@ static void uv_resolve_callback(uv_getaddrinfo_t* req, int status, tcp_error_create("getaddrinfo failed", status)); } -static grpc_error* uv_resolve(const char* host, const char* port, - grpc_resolved_addresses** result) { +static grpc_error_handle uv_resolve(const char* host, const char* port, + grpc_resolved_addresses** result) { int status; uv_getaddrinfo_t req; struct addrinfo hints; @@ -403,7 +405,7 @@ static void uv_resolve_async(grpc_custom_resolver* r, const char* host, port, &hints); if (status != 0) { gpr_free(req); - grpc_error* error = tcp_error_create("getaddrinfo failed", status); + grpc_error_handle error = tcp_error_create("getaddrinfo failed", status); grpc_custom_resolve_callback(r, NULL, error); } } diff --git a/grpc/src/core/lib/iomgr/tcp_windows.cc b/grpc/src/core/lib/iomgr/tcp_windows.cc index d28a54cc..aa693cc1 100644 --- a/grpc/src/core/lib/iomgr/tcp_windows.cc +++ b/grpc/src/core/lib/iomgr/tcp_windows.cc @@ -32,10 +32,10 @@ #include <grpc/support/log_windows.h> #include <grpc/support/string_util.h> +#include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/gpr/useful.h" #include "src/core/lib/iomgr/iocp_windows.h" #include "src/core/lib/iomgr/sockaddr.h" -#include "src/core/lib/iomgr/sockaddr_utils.h" #include "src/core/lib/iomgr/socket_windows.h" #include "src/core/lib/iomgr/tcp_client.h" #include "src/core/lib/iomgr/tcp_windows.h" @@ -53,7 +53,7 @@ extern grpc_core::TraceFlag grpc_tcp_trace; -grpc_error* grpc_tcp_set_non_block(SOCKET sock) { +grpc_error_handle grpc_tcp_set_non_block(SOCKET sock) { int status; uint32_t param = 1; DWORD ret; @@ -64,7 +64,7 @@ grpc_error* grpc_tcp_set_non_block(SOCKET sock) { : GRPC_WSA_ERROR(WSAGetLastError(), "WSAIoctl(GRPC_FIONBIO)"); } -static grpc_error* set_dualstack(SOCKET sock) { +static grpc_error_handle set_dualstack(SOCKET sock) { int status; unsigned long param = 0; status = setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, (const char*)¶m, @@ -74,7 +74,7 @@ static grpc_error* set_dualstack(SOCKET sock) { : GRPC_WSA_ERROR(WSAGetLastError(), "setsockopt(IPV6_V6ONLY)"); } -static grpc_error* enable_socket_low_latency(SOCKET sock) { +static grpc_error_handle enable_socket_low_latency(SOCKET sock) { int status; BOOL param = TRUE; status = ::setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, @@ -86,8 +86,8 @@ static grpc_error* enable_socket_low_latency(SOCKET sock) { : GRPC_WSA_ERROR(status, "setsockopt(TCP_NODELAY)"); } -grpc_error* grpc_tcp_prepare_socket(SOCKET sock) { - grpc_error* err; +grpc_error_handle grpc_tcp_prepare_socket(SOCKET sock) { + grpc_error_handle err; err = grpc_tcp_set_non_block(sock); if (err != GRPC_ERROR_NONE) return err; err = set_dualstack(sock); @@ -123,7 +123,7 @@ typedef struct grpc_tcp { to protect ourselves when requesting a shutdown. */ gpr_mu mu; int shutting_down; - grpc_error* shutdown_error; + grpc_error_handle shutdown_error; std::string peer_string; std::string local_address; @@ -177,7 +177,7 @@ static void tcp_ref(grpc_tcp* tcp) { gpr_ref(&tcp->refcount); } #endif /* Asynchronous callback from the IOCP, or the background thread. */ -static void on_read(void* tcpp, grpc_error* error) { +static void on_read(void* tcpp, grpc_error_handle error) { grpc_tcp* tcp = (grpc_tcp*)tcpp; grpc_closure* cb = tcp->read_cb; grpc_winsocket* socket = tcp->socket; @@ -313,7 +313,7 @@ static void win_read(grpc_endpoint* ep, grpc_slice_buffer* read_slices, } /* Asynchronous callback from the IOCP, or the background thread. */ -static void on_write(void* tcpp, grpc_error* error) { +static void on_write(void* tcpp, grpc_error_handle error) { grpc_tcp* tcp = (grpc_tcp*)tcpp; grpc_winsocket* handle = tcp->socket; grpc_winsocket_callback_info* info = &handle->write_info; @@ -399,9 +399,9 @@ static void win_write(grpc_endpoint* ep, grpc_slice_buffer* slices, connection that has its send queue filled up. But if we don't, then we can avoid doing an async write operation at all. */ if (info->wsa_error != WSAEWOULDBLOCK) { - grpc_error* error = status == 0 - ? GRPC_ERROR_NONE - : GRPC_WSA_ERROR(info->wsa_error, "WSASend"); + grpc_error_handle error = status == 0 + ? GRPC_ERROR_NONE + : GRPC_WSA_ERROR(info->wsa_error, "WSASend"); grpc_core::ExecCtx::Run(DEBUG_LOCATION, cb, error); if (allocated) gpr_free(allocated); return; @@ -454,7 +454,7 @@ static void win_delete_from_pollset_set(grpc_endpoint* ep, we're not going to protect against these. However the IO Completion Port callback will happen from another thread, so we need to protect against concurrent access of the data structure in that regard. */ -static void win_shutdown(grpc_endpoint* ep, grpc_error* why) { +static void win_shutdown(grpc_endpoint* ep, grpc_error_handle why) { grpc_tcp* tcp = (grpc_tcp*)ep; gpr_mu_lock(&tcp->mu); /* At that point, what may happen is that we're already inside the IOCP diff --git a/grpc/src/core/lib/iomgr/tcp_windows.h b/grpc/src/core/lib/iomgr/tcp_windows.h index 04ef8102..de3dc550 100644 --- a/grpc/src/core/lib/iomgr/tcp_windows.h +++ b/grpc/src/core/lib/iomgr/tcp_windows.h @@ -44,9 +44,9 @@ grpc_endpoint* grpc_tcp_create(grpc_winsocket* socket, grpc_channel_args* channel_args, const char* peer_string); -grpc_error* grpc_tcp_prepare_socket(SOCKET sock); +grpc_error_handle grpc_tcp_prepare_socket(SOCKET sock); -grpc_error* grpc_tcp_set_non_block(SOCKET sock); +grpc_error_handle grpc_tcp_set_non_block(SOCKET sock); #endif diff --git a/grpc/src/core/lib/iomgr/timer_custom.cc b/grpc/src/core/lib/iomgr/timer_custom.cc index 867359a2..cb01b7ce 100644 --- a/grpc/src/core/lib/iomgr/timer_custom.cc +++ b/grpc/src/core/lib/iomgr/timer_custom.cc @@ -30,7 +30,8 @@ static grpc_custom_timer_vtable* custom_timer_impl; -void grpc_custom_timer_callback(grpc_custom_timer* t, grpc_error* /*error*/) { +void grpc_custom_timer_callback(grpc_custom_timer* t, + grpc_error_handle /*error*/) { GRPC_CUSTOM_IOMGR_ASSERT_SAME_THREAD(); grpc_core::ApplicationCallbackExecCtx callback_exec_ctx; grpc_core::ExecCtx exec_ctx; diff --git a/grpc/src/core/lib/iomgr/timer_custom.h b/grpc/src/core/lib/iomgr/timer_custom.h index bfea8baf..83c3e8dd 100644 --- a/grpc/src/core/lib/iomgr/timer_custom.h +++ b/grpc/src/core/lib/iomgr/timer_custom.h @@ -38,6 +38,6 @@ typedef struct grpc_custom_timer_vtable { void grpc_custom_timer_init(grpc_custom_timer_vtable* impl); -void grpc_custom_timer_callback(grpc_custom_timer* t, grpc_error* error); +void grpc_custom_timer_callback(grpc_custom_timer* t, grpc_error_handle error); #endif /* GRPC_CORE_LIB_IOMGR_TIMER_CUSTOM_H */ diff --git a/grpc/src/core/lib/iomgr/timer_generic.cc b/grpc/src/core/lib/iomgr/timer_generic.cc index 153fb1d5..3d2fc006 100644 --- a/grpc/src/core/lib/iomgr/timer_generic.cc +++ b/grpc/src/core/lib/iomgr/timer_generic.cc @@ -247,7 +247,7 @@ static grpc_millis saturating_add(grpc_millis a, grpc_millis b) { static grpc_timer_check_result run_some_expired_timers(grpc_millis now, grpc_millis* next, - grpc_error* error); + grpc_error_handle error); static grpc_millis compute_min_deadline(timer_shard* shard) { return grpc_timer_heap_is_empty(&shard->heap) @@ -409,7 +409,7 @@ static void timer_init(grpc_timer* timer, grpc_millis deadline, } gpr_mu_unlock(&shard->mu); - /* Deadline may have decreased, we need to adjust the master queue. Note + /* Deadline may have decreased, we need to adjust the main queue. Note that there is a potential racy unlocked region here. There could be a reordering of multiple grpc_timer_init calls, at this point, but the < test below should ensure that we err on the side of caution. There could @@ -561,7 +561,8 @@ static grpc_timer* pop_one(timer_shard* shard, grpc_millis now) { /* REQUIRES: shard->mu unlocked */ static size_t pop_timers(timer_shard* shard, grpc_millis now, - grpc_millis* new_min_deadline, grpc_error* error) { + grpc_millis* new_min_deadline, + grpc_error_handle error) { size_t n = 0; grpc_timer* timer; gpr_mu_lock(&shard->mu); @@ -580,9 +581,8 @@ static size_t pop_timers(timer_shard* shard, grpc_millis now, return n; } -static grpc_timer_check_result run_some_expired_timers(grpc_millis now, - grpc_millis* next, - grpc_error* error) { +static grpc_timer_check_result run_some_expired_timers( + grpc_millis now, grpc_millis* next, grpc_error_handle error) { grpc_timer_check_result result = GRPC_TIMERS_NOT_CHECKED; #if GPR_ARCH_64 @@ -639,7 +639,7 @@ static grpc_timer_check_result run_some_expired_timers(grpc_millis now, /* An grpc_timer_init() on the shard could intervene here, adding a new timer that is earlier than new_min_deadline. However, - grpc_timer_init() will block on the master_lock before it can call + grpc_timer_init() will block on the mutex before it can call set_min_deadline, so this one will complete first and then the Addtimer will reduce the min_deadline (perhaps unnecessarily). */ g_shard_queue[0]->min_deadline = new_min_deadline; @@ -702,7 +702,7 @@ static grpc_timer_check_result timer_check(grpc_millis* next) { return GRPC_TIMERS_CHECKED_AND_EMPTY; } - grpc_error* shutdown_error = + grpc_error_handle shutdown_error = now != GRPC_MILLIS_INF_FUTURE ? GRPC_ERROR_NONE : GRPC_ERROR_CREATE_FROM_STATIC_STRING("Shutting down timer system"); diff --git a/grpc/src/core/lib/iomgr/timer_manager.cc b/grpc/src/core/lib/iomgr/timer_manager.cc index e2347276..bf467cb5 100644 --- a/grpc/src/core/lib/iomgr/timer_manager.cc +++ b/grpc/src/core/lib/iomgr/timer_manager.cc @@ -133,7 +133,7 @@ static void run_some_timers() { } grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(&g_mu); - // garbage collect any threads hanging out that are dead + // garbage collect any threads that are dead gc_completed_threads(); // get ready to wait again ++g_waiter_count; diff --git a/grpc/src/core/lib/iomgr/udp_server.cc b/grpc/src/core/lib/iomgr/udp_server.cc index c2eacc50..4efaf23b 100644 --- a/grpc/src/core/lib/iomgr/udp_server.cc +++ b/grpc/src/core/lib/iomgr/udp_server.cc @@ -56,6 +56,8 @@ #include <grpc/support/string_util.h> #include <grpc/support/sync.h> #include <grpc/support/time.h> + +#include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gpr/string.h" #include "src/core/lib/gprpp/memory.h" @@ -64,7 +66,6 @@ #include "src/core/lib/iomgr/executor.h" #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/sockaddr.h" -#include "src/core/lib/iomgr/sockaddr_utils.h" #include "src/core/lib/iomgr/socket_factory_posix.h" #include "src/core/lib/iomgr/socket_utils_posix.h" #include "src/core/lib/iomgr/unix_sockets_posix.h" @@ -83,11 +84,11 @@ class GrpcUdpListener { /* Called when data is available to read from the socket. * Return true if there is more data to read from fd. */ - void OnRead(grpc_error* error, void* do_read_arg); + void OnRead(grpc_error_handle error, void* do_read_arg); /* Called when the socket is writeable. The given closure should be scheduled * when the socket becomes blocked next time. */ - void OnCanWrite(grpc_error* error, void* do_write_arg); + void OnCanWrite(grpc_error_handle error, void* do_write_arg); /* Called when the grpc_fd is about to be orphaned (and the FD closed). */ void OnFdAboutToOrphan(); @@ -107,16 +108,16 @@ class GrpcUdpListener { private: /* event manager callback when reads are ready */ - static void on_read(void* arg, grpc_error* error); - static void on_write(void* arg, grpc_error* error); + static void on_read(void* arg, grpc_error_handle error); + static void on_write(void* arg, grpc_error_handle error); - static void do_read(void* arg, grpc_error* error); - static void do_write(void* arg, grpc_error* error); + static void do_read(void* arg, grpc_error_handle error); + static void do_write(void* arg, grpc_error_handle error); // Wrapper of grpc_fd_notify_on_write() with a grpc_closure callback // interface. - static void fd_notify_on_write_wrapper(void* arg, grpc_error* error); + static void fd_notify_on_write_wrapper(void* arg, grpc_error_handle error); - static void shutdown_fd(void* args, grpc_error* error); + static void shutdown_fd(void* args, grpc_error_handle error); int fd_; grpc_fd* emfd_; @@ -222,7 +223,7 @@ grpc_udp_server* grpc_udp_server_create(const grpc_channel_args* args) { } // static -void GrpcUdpListener::shutdown_fd(void* args, grpc_error* error) { +void GrpcUdpListener::shutdown_fd(void* args, grpc_error_handle error) { if (args == nullptr) { // No-op if shutdown args are null. return; @@ -261,7 +262,7 @@ static void finish_shutdown(grpc_udp_server* s) { delete s; } -static void destroyed_port(void* server, grpc_error* /*error*/) { +static void destroyed_port(void* server, grpc_error_handle /*error*/) { grpc_udp_server* s = static_cast<grpc_udp_server*>(server); gpr_mu_lock(&s->mu); s->destroyed_ports++; @@ -436,7 +437,7 @@ error: } // static -void GrpcUdpListener::do_read(void* arg, grpc_error* error) { +void GrpcUdpListener::do_read(void* arg, grpc_error_handle error) { GrpcUdpListener* sp = static_cast<GrpcUdpListener*>(arg); GPR_ASSERT(error == GRPC_ERROR_NONE); /* TODO: the reason we hold server->mu here is merely to prevent fd @@ -460,12 +461,12 @@ void GrpcUdpListener::do_read(void* arg, grpc_error* error) { } // static -void GrpcUdpListener::on_read(void* arg, grpc_error* error) { +void GrpcUdpListener::on_read(void* arg, grpc_error_handle error) { GrpcUdpListener* sp = static_cast<GrpcUdpListener*>(arg); sp->OnRead(error, arg); } -void GrpcUdpListener::OnRead(grpc_error* error, void* do_read_arg) { +void GrpcUdpListener::OnRead(grpc_error_handle error, void* do_read_arg) { if (error != GRPC_ERROR_NONE) { gpr_mu_lock(&server_->mu); if (0 == --server_->active_ports && server_->shutdown) { @@ -497,7 +498,7 @@ void GrpcUdpListener::OnRead(grpc_error* error, void* do_read_arg) { // static // Wrapper of grpc_fd_notify_on_write() with a grpc_closure callback interface. void GrpcUdpListener::fd_notify_on_write_wrapper(void* arg, - grpc_error* /*error*/) { + grpc_error_handle /*error*/) { GrpcUdpListener* sp = static_cast<GrpcUdpListener*>(arg); gpr_mu_lock(sp->mutex()); if (!sp->notify_on_write_armed_) { @@ -508,7 +509,7 @@ void GrpcUdpListener::fd_notify_on_write_wrapper(void* arg, } // static -void GrpcUdpListener::do_write(void* arg, grpc_error* error) { +void GrpcUdpListener::do_write(void* arg, grpc_error_handle error) { GrpcUdpListener* sp = static_cast<GrpcUdpListener*>(arg); gpr_mu_lock(sp->mutex()); if (sp->already_shutdown_) { @@ -527,12 +528,12 @@ void GrpcUdpListener::do_write(void* arg, grpc_error* error) { } // static -void GrpcUdpListener::on_write(void* arg, grpc_error* error) { +void GrpcUdpListener::on_write(void* arg, grpc_error_handle error) { GrpcUdpListener* sp = static_cast<GrpcUdpListener*>(arg); sp->OnCanWrite(error, arg); } -void GrpcUdpListener::OnCanWrite(grpc_error* error, void* do_write_arg) { +void GrpcUdpListener::OnCanWrite(grpc_error_handle error, void* do_write_arg) { if (error != GRPC_ERROR_NONE) { gpr_mu_lock(&server_->mu); if (0 == --server_->active_ports && server_->shutdown) { @@ -630,7 +631,7 @@ int grpc_udp_server_add_port(grpc_udp_server* s, grpc_resolved_address* addr, /* Try listening on IPv6 first. */ addr = &wild6; - // TODO(rjshade): Test and propagate the returned grpc_error*: + // TODO(rjshade): Test and propagate the returned grpc_error_handle: GRPC_ERROR_UNREF(grpc_create_dualstack_socket_using_factory( s->socket_factory, addr, SOCK_DGRAM, IPPROTO_UDP, &dsmode, &fd)); allocated_port1 = @@ -666,7 +667,7 @@ int grpc_udp_server_add_port(grpc_udp_server* s, grpc_resolved_address* addr, addr = &wild4; } - // TODO(rjshade): Test and propagate the returned grpc_error*: + // TODO(rjshade): Test and propagate the returned grpc_error_handle: GRPC_ERROR_UNREF(grpc_create_dualstack_socket_using_factory( s->socket_factory, addr, SOCK_DGRAM, IPPROTO_UDP, &dsmode, &fd)); if (fd < 0) { diff --git a/grpc/src/core/lib/iomgr/unix_sockets_posix.cc b/grpc/src/core/lib/iomgr/unix_sockets_posix.cc index 034aa910..2b077a38 100644 --- a/grpc/src/core/lib/iomgr/unix_sockets_posix.cc +++ b/grpc/src/core/lib/iomgr/unix_sockets_posix.cc @@ -30,7 +30,7 @@ #include "absl/strings/str_cat.h" -#include "src/core/lib/iomgr/parse_address.h" +#include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/iomgr/unix_sockets_posix.h" #include <grpc/support/alloc.h> @@ -42,7 +42,7 @@ void grpc_create_socketpair_if_unix(int sv[2]) { GPR_ASSERT(socketpair(AF_UNIX, SOCK_STREAM, 0, sv) == 0); } -grpc_error* grpc_resolve_unix_domain_address( +grpc_error_handle grpc_resolve_unix_domain_address( const char* name, grpc_resolved_addresses** addresses) { *addresses = static_cast<grpc_resolved_addresses*>( gpr_malloc(sizeof(grpc_resolved_addresses))); @@ -52,7 +52,7 @@ grpc_error* grpc_resolve_unix_domain_address( return grpc_core::UnixSockaddrPopulate(name, (*addresses)->addrs); } -grpc_error* grpc_resolve_unix_abstract_domain_address( +grpc_error_handle grpc_resolve_unix_abstract_domain_address( const absl::string_view name, grpc_resolved_addresses** addresses) { *addresses = static_cast<grpc_resolved_addresses*>( gpr_malloc(sizeof(grpc_resolved_addresses))); diff --git a/grpc/src/core/lib/iomgr/unix_sockets_posix.h b/grpc/src/core/lib/iomgr/unix_sockets_posix.h index 302ac176..c35423bc 100644 --- a/grpc/src/core/lib/iomgr/unix_sockets_posix.h +++ b/grpc/src/core/lib/iomgr/unix_sockets_posix.h @@ -33,10 +33,10 @@ void grpc_create_socketpair_if_unix(int sv[2]); -grpc_error* grpc_resolve_unix_domain_address( +grpc_error_handle grpc_resolve_unix_domain_address( const char* name, grpc_resolved_addresses** addresses); -grpc_error* grpc_resolve_unix_abstract_domain_address( +grpc_error_handle grpc_resolve_unix_abstract_domain_address( absl::string_view name, grpc_resolved_addresses** addresses); int grpc_is_unix_socket(const grpc_resolved_address* resolved_addr); diff --git a/grpc/src/core/lib/iomgr/unix_sockets_posix_noop.cc b/grpc/src/core/lib/iomgr/unix_sockets_posix_noop.cc index 7205797c..c2659221 100644 --- a/grpc/src/core/lib/iomgr/unix_sockets_posix_noop.cc +++ b/grpc/src/core/lib/iomgr/unix_sockets_posix_noop.cc @@ -26,33 +26,36 @@ #include <grpc/support/log.h> -void grpc_create_socketpair_if_unix(int sv[2]) { +void grpc_create_socketpair_if_unix(int /* sv */[2]) { // TODO: Either implement this for the non-Unix socket case or make // sure that it is never called in any such case. Until then, leave an // assertion to notify if this gets called inadvertently GPR_ASSERT(0); } -grpc_error* grpc_resolve_unix_domain_address( - const char* name, grpc_resolved_addresses** addresses) { +grpc_error_handle grpc_resolve_unix_domain_address( + const char* /* name */, grpc_resolved_addresses** addresses) { *addresses = NULL; return GRPC_ERROR_CREATE_FROM_STATIC_STRING( "Unix domain sockets are not supported on Windows"); } -grpc_error* grpc_resolve_unix_abstract_domain_address( +grpc_error_handle grpc_resolve_unix_abstract_domain_address( absl::string_view, grpc_resolved_addresses** addresses) { *addresses = NULL; return GRPC_ERROR_CREATE_FROM_STATIC_STRING( "Unix domain sockets are not supported on Windows"); } -int grpc_is_unix_socket(const grpc_resolved_address* addr) { return false; } +int grpc_is_unix_socket(const grpc_resolved_address* /* addr */) { + return false; +} -void grpc_unlink_if_unix_domain_socket(const grpc_resolved_address* addr) {} +void grpc_unlink_if_unix_domain_socket( + const grpc_resolved_address* /* addr */) {} std::string grpc_sockaddr_to_uri_unix_if_possible( - const grpc_resolved_address* addr) { + const grpc_resolved_address* /* addr */) { return ""; } diff --git a/grpc/src/core/lib/iomgr/wakeup_fd_eventfd.cc b/grpc/src/core/lib/iomgr/wakeup_fd_eventfd.cc index d68c9ada..3951fe6f 100644 --- a/grpc/src/core/lib/iomgr/wakeup_fd_eventfd.cc +++ b/grpc/src/core/lib/iomgr/wakeup_fd_eventfd.cc @@ -31,7 +31,7 @@ #include "src/core/lib/iomgr/wakeup_fd_posix.h" #include "src/core/lib/profiling/timers.h" -static grpc_error* eventfd_create(grpc_wakeup_fd* fd_info) { +static grpc_error_handle eventfd_create(grpc_wakeup_fd* fd_info) { fd_info->read_fd = eventfd(0, EFD_NONBLOCK | EFD_CLOEXEC); fd_info->write_fd = -1; if (fd_info->read_fd < 0) { @@ -40,7 +40,7 @@ static grpc_error* eventfd_create(grpc_wakeup_fd* fd_info) { return GRPC_ERROR_NONE; } -static grpc_error* eventfd_consume(grpc_wakeup_fd* fd_info) { +static grpc_error_handle eventfd_consume(grpc_wakeup_fd* fd_info) { eventfd_t value; int err; do { @@ -52,7 +52,7 @@ static grpc_error* eventfd_consume(grpc_wakeup_fd* fd_info) { return GRPC_ERROR_NONE; } -static grpc_error* eventfd_wakeup(grpc_wakeup_fd* fd_info) { +static grpc_error_handle eventfd_wakeup(grpc_wakeup_fd* fd_info) { GPR_TIMER_SCOPE("eventfd_wakeup", 0); int err; do { diff --git a/grpc/src/core/lib/iomgr/wakeup_fd_nospecial.cc b/grpc/src/core/lib/iomgr/wakeup_fd_nospecial.cc index 64778929..b1565751 100644 --- a/grpc/src/core/lib/iomgr/wakeup_fd_nospecial.cc +++ b/grpc/src/core/lib/iomgr/wakeup_fd_nospecial.cc @@ -17,7 +17,7 @@ */ /* - * This is a dummy file to provide an invalid specialized_wakeup_fd_vtable on + * This is a phony file to provide an invalid specialized_wakeup_fd_vtable on * systems without anything better than pipe. */ diff --git a/grpc/src/core/lib/iomgr/wakeup_fd_pipe.cc b/grpc/src/core/lib/iomgr/wakeup_fd_pipe.cc index 797cd44c..943d9d54 100644 --- a/grpc/src/core/lib/iomgr/wakeup_fd_pipe.cc +++ b/grpc/src/core/lib/iomgr/wakeup_fd_pipe.cc @@ -33,14 +33,14 @@ #include "src/core/lib/iomgr/socket_utils_posix.h" -static grpc_error* pipe_init(grpc_wakeup_fd* fd_info) { +static grpc_error_handle pipe_init(grpc_wakeup_fd* fd_info) { int pipefd[2]; int r = pipe(pipefd); if (0 != r) { gpr_log(GPR_ERROR, "pipe creation failed (%d): %s", errno, strerror(errno)); return GRPC_OS_ERROR(errno, "pipe"); } - grpc_error* err; + grpc_error_handle err; err = grpc_set_socket_nonblocking(pipefd[0], 1); if (err != GRPC_ERROR_NONE) return err; err = grpc_set_socket_nonblocking(pipefd[1], 1); @@ -50,7 +50,7 @@ static grpc_error* pipe_init(grpc_wakeup_fd* fd_info) { return GRPC_ERROR_NONE; } -static grpc_error* pipe_consume(grpc_wakeup_fd* fd_info) { +static grpc_error_handle pipe_consume(grpc_wakeup_fd* fd_info) { char buf[128]; ssize_t r; @@ -69,7 +69,7 @@ static grpc_error* pipe_consume(grpc_wakeup_fd* fd_info) { } } -static grpc_error* pipe_wakeup(grpc_wakeup_fd* fd_info) { +static grpc_error_handle pipe_wakeup(grpc_wakeup_fd* fd_info) { char c = 0; while (write(fd_info->write_fd, &c, 1) != 1 && errno == EINTR) { } diff --git a/grpc/src/core/lib/iomgr/wakeup_fd_posix.cc b/grpc/src/core/lib/iomgr/wakeup_fd_posix.cc index 3b66d6f3..36b497b8 100644 --- a/grpc/src/core/lib/iomgr/wakeup_fd_posix.cc +++ b/grpc/src/core/lib/iomgr/wakeup_fd_posix.cc @@ -50,15 +50,15 @@ void grpc_wakeup_fd_global_destroy(void) { wakeup_fd_vtable = nullptr; } int grpc_has_wakeup_fd(void) { return has_real_wakeup_fd; } -grpc_error* grpc_wakeup_fd_init(grpc_wakeup_fd* fd_info) { +grpc_error_handle grpc_wakeup_fd_init(grpc_wakeup_fd* fd_info) { return wakeup_fd_vtable->init(fd_info); } -grpc_error* grpc_wakeup_fd_consume_wakeup(grpc_wakeup_fd* fd_info) { +grpc_error_handle grpc_wakeup_fd_consume_wakeup(grpc_wakeup_fd* fd_info) { return wakeup_fd_vtable->consume(fd_info); } -grpc_error* grpc_wakeup_fd_wakeup(grpc_wakeup_fd* fd_info) { +grpc_error_handle grpc_wakeup_fd_wakeup(grpc_wakeup_fd* fd_info) { return wakeup_fd_vtable->wakeup(fd_info); } diff --git a/grpc/src/core/lib/iomgr/wakeup_fd_posix.h b/grpc/src/core/lib/iomgr/wakeup_fd_posix.h index 670c3195..1079ce68 100644 --- a/grpc/src/core/lib/iomgr/wakeup_fd_posix.h +++ b/grpc/src/core/lib/iomgr/wakeup_fd_posix.h @@ -65,9 +65,9 @@ void grpc_enable_cv_wakeup_fds(int enable); typedef struct grpc_wakeup_fd grpc_wakeup_fd; typedef struct grpc_wakeup_fd_vtable { - grpc_error* (*init)(grpc_wakeup_fd* fd_info); - grpc_error* (*consume)(grpc_wakeup_fd* fd_info); - grpc_error* (*wakeup)(grpc_wakeup_fd* fd_info); + grpc_error_handle (*init)(grpc_wakeup_fd* fd_info); + grpc_error_handle (*consume)(grpc_wakeup_fd* fd_info); + grpc_error_handle (*wakeup)(grpc_wakeup_fd* fd_info); void (*destroy)(grpc_wakeup_fd* fd_info); /* Must be called before calling any other functions */ int (*check_availability)(void); @@ -83,10 +83,12 @@ extern int grpc_allow_pipe_wakeup_fd; #define GRPC_WAKEUP_FD_GET_READ_FD(fd_info) ((fd_info)->read_fd) -grpc_error* grpc_wakeup_fd_init(grpc_wakeup_fd* fd_info) GRPC_MUST_USE_RESULT; -grpc_error* grpc_wakeup_fd_consume_wakeup(grpc_wakeup_fd* fd_info) +grpc_error_handle grpc_wakeup_fd_init(grpc_wakeup_fd* fd_info) + GRPC_MUST_USE_RESULT; +grpc_error_handle grpc_wakeup_fd_consume_wakeup(grpc_wakeup_fd* fd_info) + GRPC_MUST_USE_RESULT; +grpc_error_handle grpc_wakeup_fd_wakeup(grpc_wakeup_fd* fd_info) GRPC_MUST_USE_RESULT; -grpc_error* grpc_wakeup_fd_wakeup(grpc_wakeup_fd* fd_info) GRPC_MUST_USE_RESULT; void grpc_wakeup_fd_destroy(grpc_wakeup_fd* fd_info); /* Defined in some specialized implementation's .c file, or by diff --git a/grpc/src/core/lib/iomgr/work_serializer.h b/grpc/src/core/lib/iomgr/work_serializer.h index 169562da..547b80c7 100644 --- a/grpc/src/core/lib/iomgr/work_serializer.h +++ b/grpc/src/core/lib/iomgr/work_serializer.h @@ -20,6 +20,8 @@ #include <functional> +#include "absl/synchronization/mutex.h" + #include "src/core/lib/debug/trace.h" #include "src/core/lib/gprpp/atomic.h" #include "src/core/lib/gprpp/debug_location.h" @@ -43,12 +45,26 @@ namespace grpc_core { // other callbacks from other threads might also be executed before Run() // returns. Since an arbitrary set of callbacks might be executed when Run() is // called, generally no locks should be held while calling Run(). -class WorkSerializer { +class ABSL_LOCKABLE WorkSerializer { public: WorkSerializer(); ~WorkSerializer(); + // Runs a given callback. + // + // If you want to use clang thread annotation to make sure that callback is + // called by WorkSerializer only, you need to add the annotation to both the + // lambda function given to Run and the actual callback function like; + // + // void run_callback() { + // work_serializer.Run( + // []() ABSL_EXCLUSIVE_LOCKS_REQUIRED(work_serializer) { + // callback(); + // }, DEBUG_LOCATION); + // } + // void callback() ABSL_EXCLUSIVE_LOCKS_REQUIRED(work_serializer) { ... } + // // TODO(yashkt): Replace grpc_core::DebugLocation with absl::SourceLocation // once we can start using it directly. void Run(std::function<void()> callback, diff --git a/grpc/src/core/lib/json/json.h b/grpc/src/core/lib/json/json.h index 9b3e0be7..fc09d3a7 100644 --- a/grpc/src/core/lib/json/json.h +++ b/grpc/src/core/lib/json/json.h @@ -56,7 +56,7 @@ class Json { using Array = std::vector<Json>; // Parses JSON string from json_str. On error, sets *error. - static Json Parse(absl::string_view json_str, grpc_error** error); + static Json Parse(absl::string_view json_str, grpc_error_handle* error); Json() = default; diff --git a/grpc/src/core/lib/json/json_reader.cc b/grpc/src/core/lib/json/json_reader.cc index d23112e4..2daeadf4 100644 --- a/grpc/src/core/lib/json/json_reader.cc +++ b/grpc/src/core/lib/json/json_reader.cc @@ -38,7 +38,7 @@ namespace { class JsonReader { public: - static grpc_error* Parse(absl::string_view input, Json* output); + static grpc_error_handle Parse(absl::string_view input, Json* output); private: enum class Status { @@ -117,7 +117,7 @@ class JsonReader { bool container_just_begun_ = false; uint16_t unicode_char_ = 0; uint16_t unicode_high_surrogate_ = 0; - std::vector<grpc_error*> errors_; + std::vector<grpc_error_handle> errors_; bool truncated_errors_ = false; Json root_value_; @@ -821,7 +821,7 @@ JsonReader::Status JsonReader::Run() { GPR_UNREACHABLE_CODE(return Status::GRPC_JSON_INTERNAL_ERROR); } -grpc_error* JsonReader::Parse(absl::string_view input, Json* output) { +grpc_error_handle JsonReader::Parse(absl::string_view input, Json* output) { JsonReader reader(input); Status status = reader.Run(); if (reader.truncated_errors_) { @@ -849,7 +849,7 @@ grpc_error* JsonReader::Parse(absl::string_view input, Json* output) { } // namespace -Json Json::Parse(absl::string_view json_str, grpc_error** error) { +Json Json::Parse(absl::string_view json_str, grpc_error_handle* error) { Json value; *error = JsonReader::Parse(json_str, &value); return value; diff --git a/grpc/src/core/lib/matchers/matchers.cc b/grpc/src/core/lib/matchers/matchers.cc new file mode 100644 index 00000000..489a4808 --- /dev/null +++ b/grpc/src/core/lib/matchers/matchers.cc @@ -0,0 +1,339 @@ +// Copyright 2021 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/lib/matchers/matchers.h" + +#include "absl/memory/memory.h" +#include "absl/strings/str_cat.h" +#include "absl/strings/str_format.h" +#include "absl/strings/str_join.h" +#include "absl/strings/str_split.h" + +namespace grpc_core { + +// +// StringMatcher +// + +absl::StatusOr<StringMatcher> StringMatcher::Create(Type type, + absl::string_view matcher, + bool case_sensitive) { + if (type == Type::kSafeRegex) { + RE2::Options options; + options.set_case_sensitive(case_sensitive); + auto regex_matcher = absl::make_unique<RE2>(std::string(matcher), options); + if (!regex_matcher->ok()) { + return absl::InvalidArgumentError( + "Invalid regex string specified in matcher."); + } + return StringMatcher(std::move(regex_matcher), case_sensitive); + } else { + return StringMatcher(type, matcher, case_sensitive); + } +} + +StringMatcher::StringMatcher(Type type, absl::string_view matcher, + bool case_sensitive) + : type_(type), string_matcher_(matcher), case_sensitive_(case_sensitive) {} + +StringMatcher::StringMatcher(std::unique_ptr<RE2> regex_matcher, + bool case_sensitive) + : type_(Type::kSafeRegex), + regex_matcher_(std::move(regex_matcher)), + case_sensitive_(case_sensitive) {} + +StringMatcher::StringMatcher(const StringMatcher& other) + : type_(other.type_), case_sensitive_(other.case_sensitive_) { + if (type_ == Type::kSafeRegex) { + RE2::Options options; + options.set_case_sensitive(other.case_sensitive_); + regex_matcher_ = + absl::make_unique<RE2>(other.regex_matcher_->pattern(), options); + } else { + string_matcher_ = other.string_matcher_; + } +} + +StringMatcher& StringMatcher::operator=(const StringMatcher& other) { + type_ = other.type_; + if (type_ == Type::kSafeRegex) { + RE2::Options options; + options.set_case_sensitive(other.case_sensitive_); + regex_matcher_ = + absl::make_unique<RE2>(other.regex_matcher_->pattern(), options); + } else { + string_matcher_ = other.string_matcher_; + } + case_sensitive_ = other.case_sensitive_; + return *this; +} + +StringMatcher::StringMatcher(StringMatcher&& other) noexcept + : type_(other.type_), case_sensitive_(other.case_sensitive_) { + if (type_ == Type::kSafeRegex) { + regex_matcher_ = std::move(other.regex_matcher_); + } else { + string_matcher_ = std::move(other.string_matcher_); + } +} + +StringMatcher& StringMatcher::operator=(StringMatcher&& other) noexcept { + type_ = other.type_; + if (type_ == Type::kSafeRegex) { + regex_matcher_ = std::move(other.regex_matcher_); + } else { + string_matcher_ = std::move(other.string_matcher_); + } + case_sensitive_ = other.case_sensitive_; + return *this; +} + +bool StringMatcher::operator==(const StringMatcher& other) const { + if (type_ != other.type_ || case_sensitive_ != other.case_sensitive_) { + return false; + } + if (type_ == Type::kSafeRegex) { + return regex_matcher_->pattern() == other.regex_matcher_->pattern(); + } else { + return string_matcher_ == other.string_matcher_; + } +} + +bool StringMatcher::Match(absl::string_view value) const { + switch (type_) { + case Type::kExact: + return case_sensitive_ ? value == string_matcher_ + : absl::EqualsIgnoreCase(value, string_matcher_); + case StringMatcher::Type::kPrefix: + return case_sensitive_ + ? absl::StartsWith(value, string_matcher_) + : absl::StartsWithIgnoreCase(value, string_matcher_); + case StringMatcher::Type::kSuffix: + return case_sensitive_ ? absl::EndsWith(value, string_matcher_) + : absl::EndsWithIgnoreCase(value, string_matcher_); + case StringMatcher::Type::kContains: + return case_sensitive_ + ? absl::StrContains(value, string_matcher_) + : absl::StrContains(absl::AsciiStrToLower(value), + absl::AsciiStrToLower(string_matcher_)); + case StringMatcher::Type::kSafeRegex: + return RE2::FullMatch(std::string(value), *regex_matcher_); + default: + return false; + } +} + +std::string StringMatcher::ToString() const { + switch (type_) { + case Type::kExact: + return absl::StrFormat("StringMatcher{exact=%s%s}", string_matcher_, + case_sensitive_ ? "" : ", case_sensitive=false"); + case Type::kPrefix: + return absl::StrFormat("StringMatcher{prefix=%s%s}", string_matcher_, + case_sensitive_ ? "" : ", case_sensitive=false"); + case Type::kSuffix: + return absl::StrFormat("StringMatcher{suffix=%s%s}", string_matcher_, + case_sensitive_ ? "" : ", case_sensitive=false"); + case Type::kContains: + return absl::StrFormat("StringMatcher{contains=%s%s}", string_matcher_, + case_sensitive_ ? "" : ", case_sensitive=false"); + case Type::kSafeRegex: + return absl::StrFormat("StringMatcher{safe_regex=%s%s}", + regex_matcher_->pattern(), + case_sensitive_ ? "" : ", case_sensitive=false"); + default: + return ""; + } +} + +// +// HeaderMatcher +// + +absl::StatusOr<HeaderMatcher> HeaderMatcher::Create( + absl::string_view name, Type type, absl::string_view matcher, + int64_t range_start, int64_t range_end, bool present_match, + bool invert_match) { + if (static_cast<int>(type) < 5) { + // Only for EXACT, PREFIX, SUFFIX, SAFE_REGEX and CONTAINS. + absl::StatusOr<StringMatcher> string_matcher = + StringMatcher::Create(static_cast<StringMatcher::Type>(type), matcher, + /*case_sensitive=*/true); + if (!string_matcher.ok()) { + return string_matcher.status(); + } + return HeaderMatcher(name, type, std::move(string_matcher.value()), + invert_match); + } else if (type == Type::kRange) { + if (range_start > range_end) { + return absl::InvalidArgumentError( + "Invalid range specifier specified: end cannot be smaller than " + "start."); + } + return HeaderMatcher(name, range_start, range_end, invert_match); + } else { + return HeaderMatcher(name, present_match, invert_match); + } +} + +HeaderMatcher::HeaderMatcher(absl::string_view name, Type type, + StringMatcher string_matcher, bool invert_match) + : name_(name), + type_(type), + matcher_(std::move(string_matcher)), + invert_match_(invert_match) {} + +HeaderMatcher::HeaderMatcher(absl::string_view name, int64_t range_start, + int64_t range_end, bool invert_match) + : name_(name), + type_(Type::kRange), + range_start_(range_start), + range_end_(range_end), + invert_match_(invert_match) {} + +HeaderMatcher::HeaderMatcher(absl::string_view name, bool present_match, + bool invert_match) + : name_(name), + type_(Type::kPresent), + present_match_(present_match), + invert_match_(invert_match) {} + +HeaderMatcher::HeaderMatcher(const HeaderMatcher& other) + : name_(other.name_), + type_(other.type_), + invert_match_(other.invert_match_) { + switch (type_) { + case Type::kRange: + range_start_ = other.range_start_; + range_end_ = other.range_end_; + break; + case Type::kPresent: + present_match_ = other.present_match_; + break; + default: + matcher_ = other.matcher_; + } +} + +HeaderMatcher& HeaderMatcher::operator=(const HeaderMatcher& other) { + name_ = other.name_; + type_ = other.type_; + invert_match_ = other.invert_match_; + switch (type_) { + case Type::kRange: + range_start_ = other.range_start_; + range_end_ = other.range_end_; + break; + case Type::kPresent: + present_match_ = other.present_match_; + break; + default: + matcher_ = other.matcher_; + } + return *this; +} + +HeaderMatcher::HeaderMatcher(HeaderMatcher&& other) noexcept + : name_(std::move(other.name_)), + type_(other.type_), + invert_match_(other.invert_match_) { + switch (type_) { + case Type::kRange: + range_start_ = other.range_start_; + range_end_ = other.range_end_; + break; + case Type::kPresent: + present_match_ = other.present_match_; + break; + default: + matcher_ = std::move(other.matcher_); + } +} + +HeaderMatcher& HeaderMatcher::operator=(HeaderMatcher&& other) noexcept { + name_ = std::move(other.name_); + type_ = other.type_; + invert_match_ = other.invert_match_; + switch (type_) { + case Type::kRange: + range_start_ = other.range_start_; + range_end_ = other.range_end_; + break; + case Type::kPresent: + present_match_ = other.present_match_; + break; + default: + matcher_ = std::move(other.matcher_); + } + return *this; +} + +bool HeaderMatcher::operator==(const HeaderMatcher& other) const { + if (name_ != other.name_) return false; + if (type_ != other.type_) return false; + if (invert_match_ != other.invert_match_) return false; + switch (type_) { + case Type::kRange: + return range_start_ == other.range_start_ && + range_end_ == other.range_end_; + case Type::kPresent: + return present_match_ == other.present_match_; + default: + return matcher_ == other.matcher_; + } +} + +bool HeaderMatcher::Match( + const absl::optional<absl::string_view>& value) const { + bool match; + if (type_ == Type::kPresent) { + match = value.has_value() == present_match_; + } else if (!value.has_value()) { + // All other types fail to match if field is not present. + match = false; + } else if (type_ == Type::kRange) { + int64_t int_value; + match = absl::SimpleAtoi(value.value(), &int_value) && + int_value >= range_start_ && int_value < range_end_; + } else { + match = matcher_.Match(value.value()); + } + return match != invert_match_; +} + +std::string HeaderMatcher::ToString() const { + switch (type_) { + case Type::kRange: + return absl::StrFormat("HeaderMatcher{%s %srange=[%d, %d]}", name_, + invert_match_ ? "not " : "", range_start_, + range_end_); + case Type::kPresent: + return absl::StrFormat("HeaderMatcher{%s %spresent=%s}", name_, + invert_match_ ? "not " : "", + present_match_ ? "true" : "false"); + case Type::kExact: + case Type::kPrefix: + case Type::kSuffix: + case Type::kSafeRegex: + case Type::kContains: + return absl::StrFormat("HeaderMatcher{%s %s%s}", name_, + invert_match_ ? "not " : "", matcher_.ToString()); + default: + return ""; + } +} + +} // namespace grpc_core diff --git a/grpc/src/core/lib/matchers/matchers.h b/grpc/src/core/lib/matchers/matchers.h new file mode 100644 index 00000000..af2ce59b --- /dev/null +++ b/grpc/src/core/lib/matchers/matchers.h @@ -0,0 +1,160 @@ +// Copyright 2021 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_MATCHERS_MATCHERS_H +#define GRPC_CORE_LIB_MATCHERS_MATCHERS_H + +#include <grpc/support/port_platform.h> + +#include <memory> +#include <string> + +#include "absl/status/statusor.h" +#include "absl/strings/string_view.h" +#include "absl/types/optional.h" + +#include "re2/re2.h" + +namespace grpc_core { + +class StringMatcher { + public: + enum class Type { + kExact, // value stored in string_matcher_ field + kPrefix, // value stored in string_matcher_ field + kSuffix, // value stored in string_matcher_ field + kSafeRegex, // pattern stored in regex_matcher_ field + kContains, // value stored in string_matcher_ field + }; + + // Creates StringMatcher instance. Returns error status on failure. + static absl::StatusOr<StringMatcher> Create(Type type, + absl::string_view matcher, + bool case_sensitive = true); + + StringMatcher() = default; + StringMatcher(const StringMatcher& other); + StringMatcher& operator=(const StringMatcher& other); + StringMatcher(StringMatcher&& other) noexcept; + StringMatcher& operator=(StringMatcher&& other) noexcept; + bool operator==(const StringMatcher& other) const; + + bool Match(absl::string_view value) const; + + std::string ToString() const; + + Type type() const { return type_; } + + // Valid for kExact, kPrefix, kSuffix and kContains. + const std::string& string_matcher() const { return string_matcher_; } + + // Valid for kSafeRegex. + RE2* regex_matcher() const { return regex_matcher_.get(); } + + bool case_sensitive() const { return case_sensitive_; } + + private: + StringMatcher(Type type, absl::string_view matcher, bool case_sensitive); + StringMatcher(std::unique_ptr<RE2> regex_matcher, bool case_sensitive); + + Type type_ = Type::kExact; + std::string string_matcher_; + std::unique_ptr<RE2> regex_matcher_; + bool case_sensitive_ = true; +}; + +class HeaderMatcher { + public: + enum class Type { + kExact, // value stored in StringMatcher field + kPrefix, // value stored in StringMatcher field + kSuffix, // value stored in StringMatcher field + kSafeRegex, // value stored in StringMatcher field + kContains, // value stored in StringMatcher field + kRange, // uses range_start and range_end fields + kPresent, // uses present_match field + }; + + // Make sure that the first five HeaderMatcher::Type enum values match up to + // the corresponding StringMatcher::Type enum values, so that it's safe to + // convert by casting when delegating to StringMatcher. + static_assert(static_cast<StringMatcher::Type>(Type::kExact) == + StringMatcher::Type::kExact, + ""); + static_assert(static_cast<StringMatcher::Type>(Type::kPrefix) == + StringMatcher::Type::kPrefix, + ""); + static_assert(static_cast<StringMatcher::Type>(Type::kSuffix) == + StringMatcher::Type::kSuffix, + ""); + static_assert(static_cast<StringMatcher::Type>(Type::kSafeRegex) == + StringMatcher::Type::kSafeRegex, + ""); + static_assert(static_cast<StringMatcher::Type>(Type::kContains) == + StringMatcher::Type::kContains, + ""); + + // Creates HeaderMatcher instance. Returns error status on failure. + static absl::StatusOr<HeaderMatcher> Create(absl::string_view name, Type type, + absl::string_view matcher, + int64_t range_start = 0, + int64_t range_end = 0, + bool present_match = false, + bool invert_match = false); + + HeaderMatcher() = default; + HeaderMatcher(const HeaderMatcher& other); + HeaderMatcher& operator=(const HeaderMatcher& other); + HeaderMatcher(HeaderMatcher&& other) noexcept; + HeaderMatcher& operator=(HeaderMatcher&& other) noexcept; + bool operator==(const HeaderMatcher& other) const; + + const std::string& name() const { return name_; } + + Type type() const { return type_; } + + // Valid for kExact, kPrefix, kSuffix and kContains. + const std::string& string_matcher() const { + return matcher_.string_matcher(); + } + + // Valid for kSafeRegex. + RE2* regex_matcher() const { return matcher_.regex_matcher(); } + + bool Match(const absl::optional<absl::string_view>& value) const; + + std::string ToString() const; + + private: + // For StringMatcher. + HeaderMatcher(absl::string_view name, Type type, StringMatcher matcher, + bool invert_match); + // For RangeMatcher. + HeaderMatcher(absl::string_view name, int64_t range_start, int64_t range_end, + bool invert_match); + // For PresentMatcher. + HeaderMatcher(absl::string_view name, bool present_match, bool invert_match); + + std::string name_; + Type type_ = Type::kExact; + StringMatcher matcher_; + int64_t range_start_; + int64_t range_end_; + bool present_match_; + bool invert_match_ = false; +}; + +} // namespace grpc_core + +#endif /* GRPC_CORE_LIB_MATCHERS_MATCHERS_H */ diff --git a/grpc/src/core/lib/security/authorization/authorization_engine.h b/grpc/src/core/lib/security/authorization/authorization_engine.h index 809784c3..7889e62d 100644 --- a/grpc/src/core/lib/security/authorization/authorization_engine.h +++ b/grpc/src/core/lib/security/authorization/authorization_engine.h @@ -1,5 +1,4 @@ - -// Copyright 2020 gRPC authors. +// Copyright 2021 gRPC authors. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -18,67 +17,28 @@ #include <grpc/support/port_platform.h> -#include <grpc/support/log.h> -#include <map> -#include <memory> #include <string> -#include <vector> - -#include "absl/container/flat_hash_set.h" -#include "envoy/config/rbac/v3/rbac.upb.h" -#include "google/api/expr/v1alpha1/syntax.upb.h" -#include "upb/upb.hpp" #include "src/core/lib/security/authorization/evaluate_args.h" -#include "src/core/lib/security/authorization/mock_cel/activation.h" namespace grpc_core { -// AuthorizationEngine makes an AuthorizationDecision to ALLOW or DENY the -// current action based on the condition fields in provided RBAC policies. -// The engine may be constructed with one or two policies. If two polcies, -// the first policy is deny-if-matched and the second is allow-if-matched. -// The engine returns UNDECIDED decision if it fails to find a match in any -// policy. This engine ignores the principal and permission fields in RBAC -// policies. It is the caller's responsibility to provide RBAC policies that -// are compatible with this engine. -// -// Example: -// AuthorizationEngine* -// auth_engine = AuthorizationEngine::CreateAuthorizationEngine(rbac_policies); -// auth_engine->Evaluate(evaluate_args); // returns authorization decision. +// Interface for gRPC Authorization Engine. class AuthorizationEngine { public: - // rbac_policies must be a vector containing either a single policy of any - // kind, or one deny policy and one allow policy, in that order. - static std::unique_ptr<AuthorizationEngine> CreateAuthorizationEngine( - const std::vector<envoy_config_rbac_v3_RBAC*>& rbac_policies); - - // Users should use the CreateAuthorizationEngine factory function - // instead of calling the AuthorizationEngine constructor directly. - explicit AuthorizationEngine( - const std::vector<envoy_config_rbac_v3_RBAC*>& rbac_policies); - // TODO(mywang@google.com): add an Evaluate member function. - - private: - enum Action { - kAllow, - kDeny, + struct Decision { + enum class Type { + kAllow, + kDeny, + }; + Type type; + std::string matching_policy_name; }; - std::unique_ptr<mock_cel::Activation> CreateActivation( - const EvaluateArgs& args); - - std::map<const std::string, const google_api_expr_v1alpha1_Expr*> - deny_if_matched_; - std::map<const std::string, const google_api_expr_v1alpha1_Expr*> - allow_if_matched_; - upb::Arena arena_; - absl::flat_hash_set<std::string> envoy_attributes_; - absl::flat_hash_set<std::string> header_keys_; - std::unique_ptr<mock_cel::CelMap> headers_; + virtual ~AuthorizationEngine() = default; + virtual Decision Evaluate(const EvaluateArgs& args) const = 0; }; } // namespace grpc_core -#endif /* GRPC_CORE_LIB_SECURITY_AUTHORIZATION_AUTHORIZATION_ENGINE_H */ +#endif // GRPC_CORE_LIB_SECURITY_AUTHORIZATION_AUTHORIZATION_ENGINE_H diff --git a/grpc/src/core/lib/security/authorization/authorization_engine.cc b/grpc/src/core/lib/security/authorization/cel_authorization_engine.cc index 8e6a63dc..844d9fb5 100644 --- a/grpc/src/core/lib/security/authorization/authorization_engine.cc +++ b/grpc/src/core/lib/security/authorization/cel_authorization_engine.cc @@ -16,7 +16,7 @@ #include "absl/memory/memory.h" -#include "src/core/lib/security/authorization/authorization_engine.h" +#include "src/core/lib/security/authorization/cel_authorization_engine.h" namespace grpc_core { @@ -36,8 +36,8 @@ constexpr char kCertServerName[] = "cert_server_name"; } // namespace -std::unique_ptr<AuthorizationEngine> -AuthorizationEngine::CreateAuthorizationEngine( +std::unique_ptr<CelAuthorizationEngine> +CelAuthorizationEngine::CreateCelAuthorizationEngine( const std::vector<envoy_config_rbac_v3_RBAC*>& rbac_policies) { if (rbac_policies.empty() || rbac_policies.size() > 2) { gpr_log(GPR_ERROR, @@ -52,11 +52,11 @@ AuthorizationEngine::CreateAuthorizationEngine( policy and one allow policy, in that order."); return nullptr; } else { - return absl::make_unique<AuthorizationEngine>(rbac_policies); + return absl::make_unique<CelAuthorizationEngine>(rbac_policies); } } -AuthorizationEngine::AuthorizationEngine( +CelAuthorizationEngine::CelAuthorizationEngine( const std::vector<envoy_config_rbac_v3_RBAC*>& rbac_policies) { for (const auto& rbac_policy : rbac_policies) { // Extract array of policies and store their condition fields in either @@ -90,7 +90,7 @@ AuthorizationEngine::AuthorizationEngine( } } -std::unique_ptr<mock_cel::Activation> AuthorizationEngine::CreateActivation( +std::unique_ptr<mock_cel::Activation> CelAuthorizationEngine::CreateActivation( const EvaluateArgs& args) { std::unique_ptr<mock_cel::Activation> activation; for (const auto& elem : envoy_attributes_) { @@ -158,7 +158,7 @@ std::unique_ptr<mock_cel::Activation> AuthorizationEngine::CreateActivation( kSpiffeId, mock_cel::CelValue::CreateStringView(spiffe_id)); } } else if (elem == kCertServerName) { - absl::string_view cert_server_name(args.GetCertServerName()); + absl::string_view cert_server_name(args.GetCommonName()); if (!cert_server_name.empty()) { activation->InsertValue( kCertServerName, diff --git a/grpc/src/core/lib/security/authorization/cel_authorization_engine.h b/grpc/src/core/lib/security/authorization/cel_authorization_engine.h new file mode 100644 index 00000000..6f37bfbe --- /dev/null +++ b/grpc/src/core/lib/security/authorization/cel_authorization_engine.h @@ -0,0 +1,84 @@ + +// 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_SECURITY_AUTHORIZATION_CEL_AUTHORIZATION_ENGINE_H +#define GRPC_CORE_LIB_SECURITY_AUTHORIZATION_CEL_AUTHORIZATION_ENGINE_H + +#include <grpc/support/port_platform.h> + +#include <grpc/support/log.h> +#include <map> +#include <memory> +#include <string> +#include <vector> + +#include "absl/container/flat_hash_set.h" +#include "envoy/config/rbac/v3/rbac.upb.h" +#include "google/api/expr/v1alpha1/syntax.upb.h" +#include "upb/upb.hpp" + +#include "src/core/lib/security/authorization/evaluate_args.h" +#include "src/core/lib/security/authorization/mock_cel/activation.h" + +namespace grpc_core { + +// CelAuthorizationEngine makes an AuthorizationDecision to ALLOW or DENY the +// current action based on the condition fields in provided RBAC policies. +// The engine may be constructed with one or two policies. If two polcies, +// the first policy is deny-if-matched and the second is allow-if-matched. +// The engine returns UNDECIDED decision if it fails to find a match in any +// policy. This engine ignores the principal and permission fields in RBAC +// policies. It is the caller's responsibility to provide RBAC policies that +// are compatible with this engine. +// +// Example: +// CelAuthorizationEngine* engine = +// CelAuthorizationEngine::CreateCelAuthorizationEngine(rbac_policies); +// engine->Evaluate(evaluate_args); // returns authorization decision. +class CelAuthorizationEngine { + public: + // rbac_policies must be a vector containing either a single policy of any + // kind, or one deny policy and one allow policy, in that order. + static std::unique_ptr<CelAuthorizationEngine> CreateCelAuthorizationEngine( + const std::vector<envoy_config_rbac_v3_RBAC*>& rbac_policies); + + // Users should use the CreateCelAuthorizationEngine factory function + // instead of calling the CelAuthorizationEngine constructor directly. + explicit CelAuthorizationEngine( + const std::vector<envoy_config_rbac_v3_RBAC*>& rbac_policies); + // TODO(mywang@google.com): add an Evaluate member function. + + private: + enum Action { + kAllow, + kDeny, + }; + + std::unique_ptr<mock_cel::Activation> CreateActivation( + const EvaluateArgs& args); + + std::map<const std::string, const google_api_expr_v1alpha1_Expr*> + deny_if_matched_; + std::map<const std::string, const google_api_expr_v1alpha1_Expr*> + allow_if_matched_; + upb::Arena arena_; + absl::flat_hash_set<std::string> envoy_attributes_; + absl::flat_hash_set<std::string> header_keys_; + std::unique_ptr<mock_cel::CelMap> headers_; +}; + +} // namespace grpc_core + +#endif /* GRPC_CORE_LIB_SECURITY_AUTHORIZATION_CEL_AUTHORIZATION_ENGINE_H */ diff --git a/grpc/src/core/lib/security/authorization/evaluate_args.cc b/grpc/src/core/lib/security/authorization/evaluate_args.cc index 6eaf1067..12144dfb 100644 --- a/grpc/src/core/lib/security/authorization/evaluate_args.cc +++ b/grpc/src/core/lib/security/authorization/evaluate_args.cc @@ -1,6 +1,4 @@ -// -// -// Copyright 2020 gRPC authors. +// Copyright 2021 gRPC authors. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -13,20 +11,76 @@ // 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/lib/security/authorization/evaluate_args.h" -#include "src/core/lib/iomgr/parse_address.h" -#include "src/core/lib/iomgr/resolve_address.h" -#include "src/core/lib/iomgr/sockaddr_utils.h" +#include "src/core/lib/address_utils/parse_address.h" +#include "src/core/lib/gprpp/host_port.h" #include "src/core/lib/slice/slice_utils.h" namespace grpc_core { +namespace { + +absl::string_view GetAuthPropertyValue(grpc_auth_context* context, + const char* property_name) { + grpc_auth_property_iterator it = + grpc_auth_context_find_properties_by_name(context, property_name); + const grpc_auth_property* prop = grpc_auth_property_iterator_next(&it); + if (prop == nullptr) { + gpr_log(GPR_DEBUG, "No value found for %s property.", property_name); + return ""; + } + if (grpc_auth_property_iterator_next(&it) != nullptr) { + gpr_log(GPR_DEBUG, "Multiple values found for %s property.", property_name); + return ""; + } + return absl::string_view(prop->value, prop->value_length); +} + +void ParseEndpointUri(absl::string_view uri_text, std::string* address, + int* port) { + absl::StatusOr<URI> uri = URI::Parse(uri_text); + if (!uri.ok()) { + gpr_log(GPR_DEBUG, "Failed to parse uri."); + return; + } + absl::string_view host_view; + absl::string_view port_view; + if (!SplitHostPort(uri->path(), &host_view, &port_view)) { + gpr_log(GPR_DEBUG, "Failed to split %s into host and port.", + uri->path().c_str()); + return; + } + *address = std::string(host_view); + if (!absl::SimpleAtoi(port_view, port)) { + gpr_log(GPR_DEBUG, "Port %s is out of range or null.", + std::string(port_view).c_str()); + } +} + +} // namespace + +EvaluateArgs::PerChannelArgs::PerChannelArgs(grpc_auth_context* auth_context, + grpc_endpoint* endpoint) { + if (auth_context != nullptr) { + transport_security_type = GetAuthPropertyValue( + auth_context, GRPC_TRANSPORT_SECURITY_TYPE_PROPERTY_NAME); + spiffe_id = + GetAuthPropertyValue(auth_context, GRPC_PEER_SPIFFE_ID_PROPERTY_NAME); + common_name = + GetAuthPropertyValue(auth_context, GRPC_X509_CN_PROPERTY_NAME); + } + if (endpoint != nullptr) { + ParseEndpointUri(grpc_endpoint_get_local_address(endpoint), &local_address, + &local_port); + ParseEndpointUri(grpc_endpoint_get_peer(endpoint), &peer_address, + &peer_port); + } +} + absl::string_view EvaluateArgs::GetPath() const { absl::string_view path; if (metadata_ != nullptr && metadata_->idx.named.path != nullptr) { @@ -72,77 +126,61 @@ std::multimap<absl::string_view, absl::string_view> EvaluateArgs::GetHeaders() return headers; } +absl::optional<absl::string_view> EvaluateArgs::GetHeaderValue( + absl::string_view key, std::string* concatenated_value) const { + if (metadata_ == nullptr) { + return absl::nullopt; + } + return grpc_metadata_batch_get_value(metadata_, key, concatenated_value); +} + absl::string_view EvaluateArgs::GetLocalAddress() const { - absl::string_view addr = grpc_endpoint_get_local_address(endpoint_); - size_t first_colon = addr.find(":"); - size_t last_colon = addr.rfind(":"); - if (first_colon == std::string::npos || last_colon == std::string::npos) { + if (channel_args_ == nullptr) { return ""; - } else { - return addr.substr(first_colon + 1, last_colon - first_colon - 1); } + return channel_args_->local_address; } int EvaluateArgs::GetLocalPort() const { - if (endpoint_ == nullptr) { - return 0; - } - absl::StatusOr<URI> uri = - URI::Parse(grpc_endpoint_get_local_address(endpoint_)); - grpc_resolved_address resolved_addr; - if (!uri.ok() || !grpc_parse_uri(*uri, &resolved_addr)) { + if (channel_args_ == nullptr) { return 0; } - return grpc_sockaddr_get_port(&resolved_addr); + return channel_args_->local_port; } absl::string_view EvaluateArgs::GetPeerAddress() const { - absl::string_view addr = grpc_endpoint_get_peer(endpoint_); - size_t first_colon = addr.find(":"); - size_t last_colon = addr.rfind(":"); - if (first_colon == std::string::npos || last_colon == std::string::npos) { + if (channel_args_ == nullptr) { return ""; - } else { - return addr.substr(first_colon + 1, last_colon - first_colon - 1); } + return channel_args_->peer_address; } int EvaluateArgs::GetPeerPort() const { - if (endpoint_ == nullptr) { - return 0; - } - absl::StatusOr<URI> uri = URI::Parse(grpc_endpoint_get_peer(endpoint_)); - grpc_resolved_address resolved_addr; - if (!uri.ok() || !grpc_parse_uri(*uri, &resolved_addr)) { + if (channel_args_ == nullptr) { return 0; } - return grpc_sockaddr_get_port(&resolved_addr); + return channel_args_->peer_port; } -absl::string_view EvaluateArgs::GetSpiffeId() const { - if (auth_context_ == nullptr) { +absl::string_view EvaluateArgs::GetTransportSecurityType() const { + if (channel_args_ == nullptr) { return ""; } - grpc_auth_property_iterator it = grpc_auth_context_find_properties_by_name( - auth_context_, GRPC_PEER_SPIFFE_ID_PROPERTY_NAME); - const grpc_auth_property* prop = grpc_auth_property_iterator_next(&it); - if (prop == nullptr || grpc_auth_property_iterator_next(&it) != nullptr) { - return ""; - } - return absl::string_view(prop->value, prop->value_length); + return channel_args_->transport_security_type; } -absl::string_view EvaluateArgs::GetCertServerName() const { - if (auth_context_ == nullptr) { +absl::string_view EvaluateArgs::GetSpiffeId() const { + if (channel_args_ == nullptr) { return ""; } - grpc_auth_property_iterator it = grpc_auth_context_find_properties_by_name( - auth_context_, GRPC_X509_CN_PROPERTY_NAME); - const grpc_auth_property* prop = grpc_auth_property_iterator_next(&it); - if (prop == nullptr || grpc_auth_property_iterator_next(&it) != nullptr) { + return channel_args_->spiffe_id; +} + +absl::string_view EvaluateArgs::GetCommonName() const { + if (channel_args_ == nullptr) { return ""; } - return absl::string_view(prop->value, prop->value_length); + return channel_args_->common_name; } } // namespace grpc_core diff --git a/grpc/src/core/lib/security/authorization/evaluate_args.h b/grpc/src/core/lib/security/authorization/evaluate_args.h index 14e25bcc..b3ac93ca 100644 --- a/grpc/src/core/lib/security/authorization/evaluate_args.h +++ b/grpc/src/core/lib/security/authorization/evaluate_args.h @@ -1,6 +1,4 @@ -// -// -// Copyright 2020 gRPC authors. +// Copyright 2021 gRPC authors. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -13,8 +11,6 @@ // 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_SECURITY_AUTHORIZATION_EVALUATE_ARGS_H #define GRPC_CORE_LIB_SECURITY_AUTHORIZATION_EVALUATE_ARGS_H @@ -23,6 +19,8 @@ #include <map> +#include "absl/types/optional.h" + #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/security/context/security_context.h" #include "src/core/lib/transport/metadata_batch.h" @@ -31,27 +29,48 @@ namespace grpc_core { class EvaluateArgs { public: - EvaluateArgs(grpc_metadata_batch* metadata, grpc_auth_context* auth_context, - grpc_endpoint* endpoint) - : metadata_(metadata), auth_context_(auth_context), endpoint_(endpoint) {} + // Caller is responsible for ensuring auth_context outlives PerChannelArgs + // struct. + struct PerChannelArgs { + PerChannelArgs(grpc_auth_context* auth_context, grpc_endpoint* endpoint); + + absl::string_view transport_security_type; + absl::string_view spiffe_id; + absl::string_view common_name; + std::string local_address; + int local_port = 0; + std::string peer_address; + int peer_port = 0; + }; + + EvaluateArgs(grpc_metadata_batch* metadata, PerChannelArgs* channel_args) + : metadata_(metadata), channel_args_(channel_args) {} absl::string_view GetPath() const; absl::string_view GetHost() const; absl::string_view GetMethod() const; std::multimap<absl::string_view, absl::string_view> GetHeaders() const; + // Returns metadata value(s) for the specified key. + // If the key is not present in the batch, returns absl::nullopt. + // If the key is present exactly once in the batch, returns a string_view of + // that value. + // If the key is present more than once in the batch, constructs a + // comma-concatenated string of all values in concatenated_value and returns a + // string_view of that string. + absl::optional<absl::string_view> GetHeaderValue( + absl::string_view key, std::string* concatenated_value) const; + absl::string_view GetLocalAddress() const; int GetLocalPort() const; absl::string_view GetPeerAddress() const; int GetPeerPort() const; + absl::string_view GetTransportSecurityType() const; absl::string_view GetSpiffeId() const; - absl::string_view GetCertServerName() const; - - // TODO(unknown): Add a getter function for source.principal + absl::string_view GetCommonName() const; private: grpc_metadata_batch* metadata_; - grpc_auth_context* auth_context_; - grpc_endpoint* endpoint_; + PerChannelArgs* channel_args_; }; } // namespace grpc_core diff --git a/grpc/src/core/lib/security/authorization/grpc_authorization_engine.cc b/grpc/src/core/lib/security/authorization/grpc_authorization_engine.cc new file mode 100644 index 00000000..34fc9767 --- /dev/null +++ b/grpc/src/core/lib/security/authorization/grpc_authorization_engine.cc @@ -0,0 +1,49 @@ +// Copyright 2021 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/lib/security/authorization/grpc_authorization_engine.h" + +namespace grpc_core { + +GrpcAuthorizationEngine::GrpcAuthorizationEngine(Rbac policy) + : action_(policy.action) { + for (auto& sub_policy : policy.policies) { + Policy policy; + policy.name = sub_policy.first; + policy.matcher = absl::make_unique<PolicyAuthorizationMatcher>( + std::move(sub_policy.second)); + policies_.push_back(std::move(policy)); + } +} + +AuthorizationEngine::Decision GrpcAuthorizationEngine::Evaluate( + const EvaluateArgs& args) const { + Decision decision; + bool matches = false; + for (const auto& policy : policies_) { + if (policy.matcher->Matches(args)) { + matches = true; + decision.matching_policy_name = policy.name; + break; + } + } + decision.type = (matches == (action_ == Rbac::Action::kAllow)) + ? Decision::Type::kAllow + : Decision::Type::kDeny; + return decision; +} + +} // namespace grpc_core diff --git a/grpc/src/core/lib/security/authorization/grpc_authorization_engine.h b/grpc/src/core/lib/security/authorization/grpc_authorization_engine.h new file mode 100644 index 00000000..5b7791ac --- /dev/null +++ b/grpc/src/core/lib/security/authorization/grpc_authorization_engine.h @@ -0,0 +1,55 @@ +// Copyright 2021 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_SECURITY_AUTHORIZATION_GRPC_AUTHORIZATION_ENGINE_H +#define GRPC_CORE_LIB_SECURITY_AUTHORIZATION_GRPC_AUTHORIZATION_ENGINE_H + +#include <grpc/support/port_platform.h> + +#include "src/core/lib/security/authorization/authorization_engine.h" +#include "src/core/lib/security/authorization/matchers.h" +#include "src/core/lib/security/authorization/rbac_policy.h" + +namespace grpc_core { + +// GrpcAuthorizationEngine can be either an Allow engine or Deny engine. This +// engine makes authorization decisions to Allow or Deny incoming RPC request +// based on permission and principal configs in the provided RBAC policy and the +// engine type. This engine ignores condition field in RBAC config. It is the +// caller's responsibility to provide RBAC policies that are compatible with +// this engine. +class GrpcAuthorizationEngine : public AuthorizationEngine { + public: + // Builds GrpcAuthorizationEngine without any policies. + explicit GrpcAuthorizationEngine(Rbac::Action action) : action_(action) {} + // Builds GrpcAuthorizationEngine with allow/deny RBAC policy. + explicit GrpcAuthorizationEngine(Rbac policy); + + // Evaluates incoming request against RBAC policy and makes a decision to + // whether allow/deny this request. + Decision Evaluate(const EvaluateArgs& args) const override; + + private: + struct Policy { + std::string name; + std::unique_ptr<AuthorizationMatcher> matcher; + }; + + Rbac::Action action_; + std::vector<Policy> policies_; +}; + +} // namespace grpc_core + +#endif // GRPC_CORE_LIB_SECURITY_AUTHORIZATION_GRPC_AUTHORIZATION_ENGINE_H diff --git a/grpc/src/core/lib/security/authorization/matchers.cc b/grpc/src/core/lib/security/authorization/matchers.cc new file mode 100644 index 00000000..5613b748 --- /dev/null +++ b/grpc/src/core/lib/security/authorization/matchers.cc @@ -0,0 +1,202 @@ +// Copyright 2021 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/lib/security/authorization/matchers.h" + +namespace grpc_core { + +namespace { + +bool AuthenticatedMatchesHelper(const EvaluateArgs& args, + const StringMatcher& matcher) { + if (args.GetTransportSecurityType() != GRPC_SSL_TRANSPORT_SECURITY_TYPE) { + // Connection is not authenticated. + return false; + } + if (matcher.string_matcher().empty()) { + // Allows any authenticated user. + return true; + } + absl::string_view spiffe_id = args.GetSpiffeId(); + if (!spiffe_id.empty()) { + return matcher.Match(spiffe_id); + } + // TODO(ashithasantosh): Check principal matches DNS SAN, followed by Subject + // field from certificate. This requires updating tsi_peer to expose these + // fields. + return false; +} + +} // namespace + +std::unique_ptr<AuthorizationMatcher> AuthorizationMatcher::Create( + Rbac::Permission permission) { + switch (permission.type) { + case Rbac::Permission::RuleType::kAnd: + return absl::make_unique<AndAuthorizationMatcher>( + std::move(permission.permissions), permission.not_rule); + case Rbac::Permission::RuleType::kOr: + return absl::make_unique<OrAuthorizationMatcher>( + std::move(permission.permissions), permission.not_rule); + case Rbac::Permission::RuleType::kAny: + return absl::make_unique<AlwaysAuthorizationMatcher>(permission.not_rule); + case Rbac::Permission::RuleType::kHeader: + return absl::make_unique<HeaderAuthorizationMatcher>( + std::move(permission.header_matcher), permission.not_rule); + case Rbac::Permission::RuleType::kPath: + return absl::make_unique<PathAuthorizationMatcher>( + std::move(permission.string_matcher), permission.not_rule); + case Rbac::Permission::RuleType::kDestIp: + return absl::make_unique<IpAuthorizationMatcher>(std::move(permission.ip), + permission.not_rule); + case Rbac::Permission::RuleType::kDestPort: + return absl::make_unique<PortAuthorizationMatcher>(permission.port, + permission.not_rule); + case Rbac::Permission::RuleType::kReqServerName: + return absl::make_unique<ReqServerNameAuthorizationMatcher>( + std::move(permission.string_matcher), permission.not_rule); + } + return nullptr; +} + +std::unique_ptr<AuthorizationMatcher> AuthorizationMatcher::Create( + Rbac::Principal principal) { + switch (principal.type) { + case Rbac::Principal::RuleType::kAnd: + return absl::make_unique<AndAuthorizationMatcher>( + std::move(principal.principals), principal.not_rule); + case Rbac::Principal::RuleType::kOr: + return absl::make_unique<OrAuthorizationMatcher>( + std::move(principal.principals), principal.not_rule); + case Rbac::Principal::RuleType::kAny: + return absl::make_unique<AlwaysAuthorizationMatcher>(principal.not_rule); + case Rbac::Principal::RuleType::kPrincipalName: + return absl::make_unique<AuthenticatedAuthorizationMatcher>( + std::move(principal.string_matcher), principal.not_rule); + case Rbac::Principal::RuleType::kSourceIp: + case Rbac::Principal::RuleType::kDirectRemoteIp: + case Rbac::Principal::RuleType::kRemoteIp: + return absl::make_unique<IpAuthorizationMatcher>(std::move(principal.ip), + principal.not_rule); + case Rbac::Principal::RuleType::kHeader: + return absl::make_unique<HeaderAuthorizationMatcher>( + std::move(principal.header_matcher), principal.not_rule); + case Rbac::Principal::RuleType::kPath: + return absl::make_unique<PathAuthorizationMatcher>( + std::move(principal.string_matcher), principal.not_rule); + } + return nullptr; +} + +AndAuthorizationMatcher::AndAuthorizationMatcher( + std::vector<std::unique_ptr<Rbac::Permission>> rules, bool not_rule) + : not_rule_(not_rule) { + for (auto& rule : rules) { + matchers_.push_back(AuthorizationMatcher::Create(std::move(*rule))); + } +} + +AndAuthorizationMatcher::AndAuthorizationMatcher( + std::vector<std::unique_ptr<Rbac::Principal>> ids, bool not_rule) + : not_rule_(not_rule) { + for (const auto& id : ids) { + matchers_.push_back(AuthorizationMatcher::Create(std::move(*id))); + } +} + +bool AndAuthorizationMatcher::Matches(const EvaluateArgs& args) const { + bool matches = true; + for (const auto& matcher : matchers_) { + if (!matcher->Matches(args)) { + matches = false; + break; + } + } + return matches != not_rule_; +} + +OrAuthorizationMatcher::OrAuthorizationMatcher( + std::vector<std::unique_ptr<Rbac::Permission>> rules, bool not_rule) + : not_rule_(not_rule) { + for (const auto& rule : rules) { + matchers_.push_back(AuthorizationMatcher::Create(std::move(*rule))); + } +} + +OrAuthorizationMatcher::OrAuthorizationMatcher( + std::vector<std::unique_ptr<Rbac::Principal>> ids, bool not_rule) + : not_rule_(not_rule) { + for (const auto& id : ids) { + matchers_.push_back(AuthorizationMatcher::Create(std::move(*id))); + } +} + +bool OrAuthorizationMatcher::Matches(const EvaluateArgs& args) const { + bool matches = false; + for (const auto& matcher : matchers_) { + if (matcher->Matches(args)) { + matches = true; + break; + } + } + return matches != not_rule_; +} + +bool HeaderAuthorizationMatcher::Matches(const EvaluateArgs& args) const { + std::string concatenated_value; + bool matches = + matcher_.Match(args.GetHeaderValue(matcher_.name(), &concatenated_value)); + return matches != not_rule_; +} + +// TODO(ashithasantosh): Implement IpAuthorizationMatcher::Matches. +bool IpAuthorizationMatcher::Matches(const EvaluateArgs&) const { + bool matches = false; + return matches != not_rule_; +} + +bool PortAuthorizationMatcher::Matches(const EvaluateArgs& args) const { + bool matches = (port_ == args.GetLocalPort()); + return matches != not_rule_; +} + +bool AuthenticatedAuthorizationMatcher::Matches( + const EvaluateArgs& args) const { + bool matches = AuthenticatedMatchesHelper(args, matcher_); + return matches != not_rule_; +} + +bool ReqServerNameAuthorizationMatcher::Matches(const EvaluateArgs&) const { + // Currently we do not support matching rules containing + // "requested_server_name". + bool matches = false; + return matches != not_rule_; +} + +bool PathAuthorizationMatcher::Matches(const EvaluateArgs& args) const { + bool matches = false; + absl::string_view path = args.GetPath(); + if (!path.empty()) { + matches = matcher_.Match(path); + } + return matches != not_rule_; +} + +bool PolicyAuthorizationMatcher::Matches(const EvaluateArgs& args) const { + return permissions_->Matches(args) && principals_->Matches(args); +} + +} // namespace grpc_core diff --git a/grpc/src/core/lib/security/authorization/matchers.h b/grpc/src/core/lib/security/authorization/matchers.h new file mode 100644 index 00000000..86b40ee7 --- /dev/null +++ b/grpc/src/core/lib/security/authorization/matchers.h @@ -0,0 +1,206 @@ +// Copyright 2021 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_SECURITY_AUTHORIZATION_MATCHERS_H +#define GRPC_CORE_LIB_SECURITY_AUTHORIZATION_MATCHERS_H + +#include <grpc/support/port_platform.h> + +#include <memory> + +#include "src/core/lib/matchers/matchers.h" +#include "src/core/lib/security/authorization/evaluate_args.h" +#include "src/core/lib/security/authorization/rbac_policy.h" + +namespace grpc_core { + +// Describes the rules for matching permission or principal. +class AuthorizationMatcher { + public: + virtual ~AuthorizationMatcher() = default; + + // Returns whether or not the permission/principal matches the rules of the + // matcher. + virtual bool Matches(const EvaluateArgs& args) const = 0; + + // Creates an instance of a matcher based off the rules defined in Permission + // config. + static std::unique_ptr<AuthorizationMatcher> Create( + Rbac::Permission permission); + + // Creates an instance of a matcher based off the rules defined in Principal + // config. + static std::unique_ptr<AuthorizationMatcher> Create( + Rbac::Principal principal); +}; + +class AlwaysAuthorizationMatcher : public AuthorizationMatcher { + public: + explicit AlwaysAuthorizationMatcher(bool not_rule = false) + : not_rule_(not_rule) {} + + bool Matches(const EvaluateArgs&) const override { return !not_rule_; } + + private: + // Negates matching the provided permission/principal. + const bool not_rule_; +}; + +class AndAuthorizationMatcher : public AuthorizationMatcher { + public: + explicit AndAuthorizationMatcher( + std::vector<std::unique_ptr<Rbac::Permission>> rules, + bool not_rule = false); + explicit AndAuthorizationMatcher( + std::vector<std::unique_ptr<Rbac::Principal>> ids, bool not_rule = false); + + bool Matches(const EvaluateArgs& args) const override; + + private: + std::vector<std::unique_ptr<AuthorizationMatcher>> matchers_; + // Negates matching the provided permission/principal. + const bool not_rule_; +}; + +class OrAuthorizationMatcher : public AuthorizationMatcher { + public: + explicit OrAuthorizationMatcher( + std::vector<std::unique_ptr<Rbac::Permission>> rules, + bool not_rule = false); + explicit OrAuthorizationMatcher( + std::vector<std::unique_ptr<Rbac::Principal>> ids, bool not_rule = false); + + bool Matches(const EvaluateArgs& args) const override; + + private: + std::vector<std::unique_ptr<AuthorizationMatcher>> matchers_; + // Negates matching the provided permission/principal. + const bool not_rule_; +}; + +// TODO(ashithasantosh): Add matcher implementation for metadata field. + +// Perform a match against HTTP headers. +class HeaderAuthorizationMatcher : public AuthorizationMatcher { + public: + explicit HeaderAuthorizationMatcher(HeaderMatcher matcher, + bool not_rule = false) + : matcher_(std::move(matcher)), not_rule_(not_rule) {} + + bool Matches(const EvaluateArgs& args) const override; + + private: + const HeaderMatcher matcher_; + // Negates matching the provided permission/principal. + const bool not_rule_; +}; + +// Perform a match against IP Cidr Range. +// TODO(ashithasantosh): Handle type of Ip or use seperate matchers for each +// type. Implement Match functionality, this would require updating EvaluateArgs +// getters, to return format of IP as well. +class IpAuthorizationMatcher : public AuthorizationMatcher { + public: + explicit IpAuthorizationMatcher(Rbac::CidrRange range, bool not_rule = false) + : range_(std::move(range)), not_rule_(not_rule) {} + + bool Matches(const EvaluateArgs&) const override; + + private: + const Rbac::CidrRange range_; + // Negates matching the provided permission/principal. + const bool not_rule_; +}; + +// Perform a match against port number of the destination (local) address. +class PortAuthorizationMatcher : public AuthorizationMatcher { + public: + explicit PortAuthorizationMatcher(int port, bool not_rule = false) + : port_(port), not_rule_(not_rule) {} + + bool Matches(const EvaluateArgs& args) const override; + + private: + const int port_; + // Negates matching the provided permission/principal. + const bool not_rule_; +}; + +// Matches the principal name as described in the peer certificate. Uses URI SAN +// or DNS SAN in that order, otherwise uses subject field. +class AuthenticatedAuthorizationMatcher : public AuthorizationMatcher { + public: + explicit AuthenticatedAuthorizationMatcher(StringMatcher auth, + bool not_rule = false) + : matcher_(std::move(auth)), not_rule_(not_rule) {} + + bool Matches(const EvaluateArgs& args) const override; + + private: + const StringMatcher matcher_; + // Negates matching the provided permission/principal. + const bool not_rule_; +}; + +// Perform a match against the request server from the client's connection +// request. This is typically TLS SNI. Currently unsupported. +class ReqServerNameAuthorizationMatcher : public AuthorizationMatcher { + public: + explicit ReqServerNameAuthorizationMatcher( + StringMatcher requested_server_name, bool not_rule = false) + : matcher_(std::move(requested_server_name)), not_rule_(not_rule) {} + + bool Matches(const EvaluateArgs&) const override; + + private: + const StringMatcher matcher_; + // Negates matching the provided permission/principal. + const bool not_rule_; +}; + +// Perform a match against the path header of HTTP request. +class PathAuthorizationMatcher : public AuthorizationMatcher { + public: + explicit PathAuthorizationMatcher(StringMatcher path, bool not_rule = false) + : matcher_(std::move(path)), not_rule_(not_rule) {} + + bool Matches(const EvaluateArgs& args) const override; + + private: + const StringMatcher matcher_; + // Negates matching the provided permission/principal. + const bool not_rule_; +}; + +// Performs a match for policy field in RBAC, which is a collection of +// permission and principal matchers. Policy matches iff, we find a match in one +// of its permissions and a match in one of its principals. +class PolicyAuthorizationMatcher : public AuthorizationMatcher { + public: + explicit PolicyAuthorizationMatcher(Rbac::Policy policy) + : permissions_( + AuthorizationMatcher::Create(std::move(policy.permissions))), + principals_( + AuthorizationMatcher::Create(std::move(policy.principals))) {} + + bool Matches(const EvaluateArgs& args) const override; + + private: + std::unique_ptr<AuthorizationMatcher> permissions_; + std::unique_ptr<AuthorizationMatcher> principals_; +}; + +} // namespace grpc_core + +#endif // GRPC_CORE_LIB_SECURITY_AUTHORIZATION_MATCHERS_H diff --git a/grpc/src/core/lib/security/authorization/mock_cel/activation.h b/grpc/src/core/lib/security/authorization/mock_cel/activation.h index 693ed4d4..0e6eed1b 100644 --- a/grpc/src/core/lib/security/authorization/mock_cel/activation.h +++ b/grpc/src/core/lib/security/authorization/mock_cel/activation.h @@ -48,7 +48,7 @@ class Activation : public BaseActivation { Activation& operator=(const Activation&) = delete; // Insert value into Activation. - void InsertValue(absl::string_view name, const CelValue& value) {} + void InsertValue(absl::string_view /*name*/, const CelValue& /*value*/) {} }; } // namespace mock_cel diff --git a/grpc/src/core/lib/security/authorization/mock_cel/cel_value.h b/grpc/src/core/lib/security/authorization/mock_cel/cel_value.h index d0377279..22d23243 100644 --- a/grpc/src/core/lib/security/authorization/mock_cel/cel_value.h +++ b/grpc/src/core/lib/security/authorization/mock_cel/cel_value.h @@ -61,23 +61,25 @@ class CelValue { // We rely on copy elision to avoid extra copying. static CelValue CreateNull() { return CelValue(nullptr); } - static CelValue CreateInt64(int64_t value) { return CreateNull(); } + static CelValue CreateInt64(int64_t /*value*/) { return CreateNull(); } - static CelValue CreateUint64(uint64_t value) { return CreateNull(); } + static CelValue CreateUint64(uint64_t /*value*/) { return CreateNull(); } - static CelValue CreateStringView(absl::string_view value) { + static CelValue CreateStringView(absl::string_view /*value*/) { return CreateNull(); } - static CelValue CreateString(const std::string* str) { return CreateNull(); } + static CelValue CreateString(const std::string* /*str*/) { + return CreateNull(); + } - static CelValue CreateMap(const CelMap* value) { return CreateNull(); } + static CelValue CreateMap(const CelMap* /*value*/) { return CreateNull(); } private: // Constructs CelValue wrapping value supplied as argument. // Value type T should be supported by specification of ValueHolder. template <class T> - explicit CelValue(T value) {} + explicit CelValue(T /*value*/) {} }; // CelMap implementation that uses STL map container as backing storage. @@ -86,7 +88,7 @@ class ContainerBackedMapImpl : public CelMap { ContainerBackedMapImpl() = default; static std::unique_ptr<CelMap> Create( - absl::Span<std::pair<CelValue, CelValue>> key_values) { + absl::Span<std::pair<CelValue, CelValue>> /*key_values*/) { return absl::make_unique<ContainerBackedMapImpl>(); } }; diff --git a/grpc/src/core/lib/security/authorization/rbac_policy.cc b/grpc/src/core/lib/security/authorization/rbac_policy.cc new file mode 100644 index 00000000..a081c514 --- /dev/null +++ b/grpc/src/core/lib/security/authorization/rbac_policy.cc @@ -0,0 +1,328 @@ +// Copyright 2021 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/lib/security/authorization/rbac_policy.h" + +#include "absl/strings/str_format.h" +#include "absl/strings/str_join.h" + +namespace grpc_core { + +// +// Rbac +// + +Rbac::Rbac(Rbac::Action action, std::map<std::string, Policy> policies) + : action(action), policies(std::move(policies)) {} + +Rbac::Rbac(Rbac&& other) noexcept + : action(other.action), policies(std::move(other.policies)) {} + +Rbac& Rbac::operator=(Rbac&& other) noexcept { + action = other.action; + policies = std::move(other.policies); + return *this; +} + +std::string Rbac::ToString() const { + std::vector<std::string> contents; + contents.push_back(absl::StrFormat( + "Rbac action=%s{", action == Rbac::Action::kAllow ? "Allow" : "Deny")); + for (const auto& p : policies) { + contents.push_back(absl::StrFormat("{\n policy_name=%s\n%s\n}", p.first, + p.second.ToString())); + } + contents.push_back("}"); + return absl::StrJoin(contents, "\n"); +} + +// +// CidrRange +// + +Rbac::CidrRange::CidrRange(std::string address_prefix, uint32_t prefix_len) + : address_prefix(std::move(address_prefix)), prefix_len(prefix_len) {} + +Rbac::CidrRange::CidrRange(Rbac::CidrRange&& other) noexcept + : address_prefix(std::move(other.address_prefix)), + prefix_len(other.prefix_len) {} + +Rbac::CidrRange& Rbac::CidrRange::operator=(Rbac::CidrRange&& other) noexcept { + address_prefix = std::move(other.address_prefix); + prefix_len = other.prefix_len; + return *this; +} + +std::string Rbac::CidrRange::ToString() const { + return absl::StrFormat("CidrRange{address_prefix=%s,prefix_len=%d}", + address_prefix, prefix_len); +} + +// +// Permission +// + +Rbac::Permission::Permission( + Permission::RuleType type, + std::vector<std::unique_ptr<Permission>> permissions, bool not_rule) + : type(type), permissions(std::move(permissions)), not_rule(not_rule) {} +Rbac::Permission::Permission(Permission::RuleType type, bool not_rule) + : type(type), not_rule(not_rule) {} +Rbac::Permission::Permission(Permission::RuleType type, + HeaderMatcher header_matcher, bool not_rule) + : type(type), + header_matcher(std::move(header_matcher)), + not_rule(not_rule) {} +Rbac::Permission::Permission(Permission::RuleType type, + StringMatcher string_matcher, bool not_rule) + : type(type), + string_matcher(std::move(string_matcher)), + not_rule(not_rule) {} +Rbac::Permission::Permission(Permission::RuleType type, CidrRange ip, + bool not_rule) + : type(type), ip(std::move(ip)), not_rule(not_rule) {} +Rbac::Permission::Permission(Permission::RuleType type, int port, bool not_rule) + : type(type), port(port), not_rule(not_rule) {} + +Rbac::Permission::Permission(Rbac::Permission&& other) noexcept + : type(other.type), not_rule(other.not_rule) { + switch (type) { + case RuleType::kAnd: + case RuleType::kOr: + permissions = std::move(other.permissions); + break; + case RuleType::kAny: + break; + case RuleType::kHeader: + header_matcher = std::move(other.header_matcher); + break; + case RuleType::kPath: + case RuleType::kReqServerName: + string_matcher = std::move(other.string_matcher); + break; + case RuleType::kDestIp: + ip = std::move(other.ip); + break; + default: + port = other.port; + } +} + +Rbac::Permission& Rbac::Permission::operator=( + Rbac::Permission&& other) noexcept { + type = other.type; + not_rule = other.not_rule; + switch (type) { + case RuleType::kAnd: + case RuleType::kOr: + permissions = std::move(other.permissions); + break; + case RuleType::kAny: + break; + case RuleType::kHeader: + header_matcher = std::move(other.header_matcher); + break; + case RuleType::kPath: + case RuleType::kReqServerName: + string_matcher = std::move(other.string_matcher); + break; + case RuleType::kDestIp: + ip = std::move(other.ip); + break; + default: + port = other.port; + } + return *this; +} + +std::string Rbac::Permission::ToString() const { + switch (type) { + case RuleType::kAnd: { + std::vector<std::string> contents; + contents.reserve(permissions.size()); + for (const auto& permission : permissions) { + contents.push_back(permission->ToString()); + } + return absl::StrFormat("%sand=[%s]", not_rule ? "not " : "", + absl::StrJoin(contents, ",")); + } + case RuleType::kOr: { + std::vector<std::string> contents; + contents.reserve(permissions.size()); + for (const auto& permission : permissions) { + contents.push_back(permission->ToString()); + } + return absl::StrFormat("%sor=[%s]", not_rule ? "not " : "", + absl::StrJoin(contents, ",")); + } + case RuleType::kAny: + return absl::StrFormat("%sany", not_rule ? "not " : ""); + case RuleType::kHeader: + return absl::StrFormat("%sheader=%s", not_rule ? "not " : "", + header_matcher.ToString()); + case RuleType::kPath: + return absl::StrFormat("%spath=%s", not_rule ? "not " : "", + string_matcher.ToString()); + case RuleType::kDestIp: + return absl::StrFormat("%sdest_ip=%s", not_rule ? "not " : "", + ip.ToString()); + case RuleType::kDestPort: + return absl::StrFormat("%sdest_port=%d", not_rule ? "not " : "", port); + case RuleType::kReqServerName: + return absl::StrFormat("%srequested_server_name=%s", + not_rule ? "not " : "", string_matcher.ToString()); + default: + return ""; + } +} + +// +// Principal +// + +Rbac::Principal::Principal(Principal::RuleType type, + std::vector<std::unique_ptr<Principal>> principals, + bool not_rule) + : type(type), principals(std::move(principals)), not_rule(not_rule) {} +Rbac::Principal::Principal(Principal::RuleType type, bool not_rule) + : type(type), not_rule(not_rule) {} +Rbac::Principal::Principal(Principal::RuleType type, + StringMatcher string_matcher, bool not_rule) + : type(type), + string_matcher(std::move(string_matcher)), + not_rule(not_rule) {} +Rbac::Principal::Principal(Principal::RuleType type, CidrRange ip, + bool not_rule) + : type(type), ip(std::move(ip)), not_rule(not_rule) {} +Rbac::Principal::Principal(Principal::RuleType type, + HeaderMatcher header_matcher, bool not_rule) + : type(type), + header_matcher(std::move(header_matcher)), + not_rule(not_rule) {} + +Rbac::Principal::Principal(Rbac::Principal&& other) noexcept + : type(other.type), not_rule(other.not_rule) { + switch (type) { + case RuleType::kAnd: + case RuleType::kOr: + principals = std::move(other.principals); + break; + case RuleType::kAny: + break; + case RuleType::kHeader: + header_matcher = std::move(other.header_matcher); + break; + case RuleType::kPrincipalName: + case RuleType::kPath: + string_matcher = std::move(other.string_matcher); + break; + default: + ip = std::move(other.ip); + } +} + +Rbac::Principal& Rbac::Principal::operator=(Rbac::Principal&& other) noexcept { + type = other.type; + not_rule = other.not_rule; + switch (type) { + case RuleType::kAnd: + case RuleType::kOr: + principals = std::move(other.principals); + break; + case RuleType::kAny: + break; + case RuleType::kHeader: + header_matcher = std::move(other.header_matcher); + break; + case RuleType::kPrincipalName: + case RuleType::kPath: + string_matcher = std::move(other.string_matcher); + break; + default: + ip = std::move(other.ip); + } + return *this; +} + +std::string Rbac::Principal::ToString() const { + switch (type) { + case RuleType::kAnd: { + std::vector<std::string> contents; + contents.reserve(principals.size()); + for (const auto& principal : principals) { + contents.push_back(principal->ToString()); + } + return absl::StrFormat("%sand=[%s]", not_rule ? "not " : "", + absl::StrJoin(contents, ",")); + } + case RuleType::kOr: { + std::vector<std::string> contents; + contents.reserve(principals.size()); + for (const auto& principal : principals) { + contents.push_back(principal->ToString()); + } + return absl::StrFormat("%sor=[%s]", not_rule ? "not " : "", + absl::StrJoin(contents, ",")); + } + case RuleType::kAny: + return absl::StrFormat("%sany", not_rule ? "not " : ""); + case RuleType::kPrincipalName: + return absl::StrFormat("%sprincipal_name=%s", not_rule ? "not " : "", + string_matcher.ToString()); + case RuleType::kSourceIp: + return absl::StrFormat("%ssource_ip=%s", not_rule ? "not " : "", + ip.ToString()); + case RuleType::kDirectRemoteIp: + return absl::StrFormat("%sdirect_remote_ip=%s", not_rule ? "not " : "", + ip.ToString()); + case RuleType::kRemoteIp: + return absl::StrFormat("%sremote_ip=%s", not_rule ? "not " : "", + ip.ToString()); + case RuleType::kHeader: + return absl::StrFormat("%sheader=%s", not_rule ? "not " : "", + header_matcher.ToString()); + case RuleType::kPath: + return absl::StrFormat("%spath=%s", not_rule ? "not " : "", + string_matcher.ToString()); + default: + return ""; + } +} + +// +// Policy +// + +Rbac::Policy::Policy(Permission permissions, Principal principals) + : permissions(std::move(permissions)), principals(std::move(principals)) {} + +Rbac::Policy::Policy(Rbac::Policy&& other) noexcept + : permissions(std::move(other.permissions)), + principals(std::move(other.principals)) {} + +Rbac::Policy& Rbac::Policy::operator=(Rbac::Policy&& other) noexcept { + permissions = std::move(other.permissions); + principals = std::move(other.principals); + return *this; +} + +std::string Rbac::Policy::ToString() const { + return absl::StrFormat( + " Policy {\n Permissions{%s}\n Principals{%s}\n }", + permissions.ToString(), principals.ToString()); +} + +} // namespace grpc_core diff --git a/grpc/src/core/lib/security/authorization/rbac_policy.h b/grpc/src/core/lib/security/authorization/rbac_policy.h new file mode 100644 index 00000000..027bf92e --- /dev/null +++ b/grpc/src/core/lib/security/authorization/rbac_policy.h @@ -0,0 +1,163 @@ +// Copyright 2021 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_SECURITY_AUTHORIZATION_RBAC_POLICY_H +#define GRPC_CORE_LIB_SECURITY_AUTHORIZATION_RBAC_POLICY_H + +#include <grpc/support/port_platform.h> + +#include <memory> + +#include "src/core/lib/matchers/matchers.h" + +namespace grpc_core { + +// Represents Envoy RBAC Proto. [See +// https://github.com/envoyproxy/envoy/blob/release/v1.17/api/envoy/config/rbac/v3/rbac.proto] +struct Rbac { + enum class Action { + kAllow, + kDeny, + }; + + struct CidrRange { + CidrRange() = default; + CidrRange(std::string address_prefix, uint32_t prefix_len); + + CidrRange(CidrRange&& other) noexcept; + CidrRange& operator=(CidrRange&& other) noexcept; + + std::string ToString() const; + + std::string address_prefix; + uint32_t prefix_len; + }; + + // TODO(ashithasantosh): Add metadata field to Permission and Principal. + struct Permission { + enum class RuleType { + kAnd, + kOr, + kAny, + kHeader, + kPath, + kDestIp, + kDestPort, + kReqServerName, + }; + + Permission() = default; + // For AND/OR RuleType. + Permission(Permission::RuleType type, + std::vector<std::unique_ptr<Permission>> permissions, + bool not_rule = false); + // For ANY RuleType. + explicit Permission(Permission::RuleType type, bool not_rule = false); + // For HEADER RuleType. + Permission(Permission::RuleType type, HeaderMatcher header_matcher, + bool not_rule = false); + // For PATH/REQ_SERVER_NAME RuleType. + Permission(Permission::RuleType type, StringMatcher string_matcher, + bool not_rule = false); + // For DEST_IP RuleType. + Permission(Permission::RuleType type, CidrRange ip, bool not_rule = false); + // For DEST_PORT RuleType. + Permission(Permission::RuleType type, int port, bool not_rule = false); + + Permission(Permission&& other) noexcept; + Permission& operator=(Permission&& other) noexcept; + + std::string ToString() const; + + RuleType type; + HeaderMatcher header_matcher; + StringMatcher string_matcher; + CidrRange ip; + int port; + // For type AND/OR. + std::vector<std::unique_ptr<Permission>> permissions; + bool not_rule = false; + }; + + struct Principal { + enum class RuleType { + kAnd, + kOr, + kAny, + kPrincipalName, + kSourceIp, + kDirectRemoteIp, + kRemoteIp, + kHeader, + kPath, + }; + + Principal() = default; + // For AND/OR RuleType. + Principal(Principal::RuleType type, + std::vector<std::unique_ptr<Principal>> principals, + bool not_rule = false); + // For ANY RuleType. + explicit Principal(Principal::RuleType type, bool not_rule = false); + // For PRINCIPAL_NAME/PATH RuleType. + Principal(Principal::RuleType type, StringMatcher string_matcher, + bool not_rule = false); + // For SOURCE_IP/DIRECT_REMOTE_IP/REMOTE_IP RuleType. + Principal(Principal::RuleType type, CidrRange ip, bool not_rule = false); + // For HEADER RuleType. + Principal(Principal::RuleType type, HeaderMatcher header_matcher, + bool not_rule = false); + + Principal(Principal&& other) noexcept; + Principal& operator=(Principal&& other) noexcept; + + std::string ToString() const; + + RuleType type; + HeaderMatcher header_matcher; + StringMatcher string_matcher; + CidrRange ip; + // For type AND/OR. + std::vector<std::unique_ptr<Principal>> principals; + bool not_rule = false; + }; + + struct Policy { + Policy() = default; + Policy(Permission permissions, Principal principals); + + Policy(Policy&& other) noexcept; + Policy& operator=(Policy&& other) noexcept; + + std::string ToString() const; + + Permission permissions; + Principal principals; + }; + + Rbac() = default; + Rbac(Rbac::Action action, std::map<std::string, Policy> policies); + + Rbac(Rbac&& other) noexcept; + Rbac& operator=(Rbac&& other) noexcept; + + std::string ToString() const; + + Action action; + std::map<std::string, Policy> policies; +}; + +} // namespace grpc_core + +#endif /* GRPC_CORE_LIB_SECURITY_AUTHORIZATION_RBAC_POLICY_H */ diff --git a/grpc/src/core/lib/security/authorization/rbac_translator.cc b/grpc/src/core/lib/security/authorization/rbac_translator.cc new file mode 100644 index 00000000..ea5599dd --- /dev/null +++ b/grpc/src/core/lib/security/authorization/rbac_translator.cc @@ -0,0 +1,354 @@ +// Copyright 2021 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/lib/security/authorization/rbac_translator.h" + +#include "absl/strings/str_cat.h" +#include "absl/strings/str_format.h" +#include "absl/strings/strip.h" + +#include "src/core/lib/matchers/matchers.h" + +namespace grpc_core { + +namespace { + +absl::string_view GetMatcherType(absl::string_view value, + StringMatcher::Type* type) { + if (value == "*") { + *type = StringMatcher::Type::kPrefix; + return ""; + } else if (absl::StartsWith(value, "*")) { + *type = StringMatcher::Type::kSuffix; + return absl::StripPrefix(value, "*"); + } else if (absl::EndsWith(value, "*")) { + *type = StringMatcher::Type::kPrefix; + return absl::StripSuffix(value, "*"); + } + *type = StringMatcher::Type::kExact; + return value; +} + +absl::StatusOr<StringMatcher> GetStringMatcher(absl::string_view value) { + StringMatcher::Type type; + absl::string_view matcher = GetMatcherType(value, &type); + return StringMatcher::Create(type, matcher); +} + +absl::StatusOr<HeaderMatcher> GetHeaderMatcher(absl::string_view name, + absl::string_view value) { + StringMatcher::Type type; + absl::string_view matcher = GetMatcherType(value, &type); + return HeaderMatcher::Create(name, static_cast<HeaderMatcher::Type>(type), + matcher); +} + +absl::StatusOr<Rbac::Principal> ParsePrincipalsArray(const Json& json) { + std::vector<std::unique_ptr<Rbac::Principal>> principal_names; + for (size_t i = 0; i < json.array_value().size(); ++i) { + const Json& child = json.array_value().at(i); + if (child.type() != Json::Type::STRING) { + return absl::InvalidArgumentError( + absl::StrCat("\"principals\" ", i, ": is not a string.")); + } + auto matcher_or = GetStringMatcher(child.string_value()); + if (!matcher_or.ok()) { + return absl::Status(matcher_or.status().code(), + absl::StrCat("\"principals\" ", i, ": ", + matcher_or.status().message())); + } + principal_names.push_back(absl::make_unique<Rbac::Principal>( + Rbac::Principal::RuleType::kPrincipalName, + std::move(matcher_or.value()))); + } + return Rbac::Principal(Rbac::Principal::RuleType::kOr, + std::move(principal_names)); +} + +absl::StatusOr<Rbac::Principal> ParsePeer(const Json& json) { + std::vector<std::unique_ptr<Rbac::Principal>> peer; + auto it = json.object_value().find("principals"); + if (it != json.object_value().end()) { + if (it->second.type() != Json::Type::ARRAY) { + return absl::InvalidArgumentError("\"principals\" is not an array."); + } + auto principal_names_or = ParsePrincipalsArray(it->second); + if (!principal_names_or.ok()) return principal_names_or.status(); + if (!principal_names_or.value().principals.empty()) { + peer.push_back(absl::make_unique<Rbac::Principal>( + std::move(principal_names_or.value()))); + } + } + if (peer.empty()) { + return Rbac::Principal(Rbac::Principal::RuleType::kAny); + } + return Rbac::Principal(Rbac::Principal::RuleType::kAnd, std::move(peer)); +} + +absl::StatusOr<Rbac::Permission> ParseHeaderValues( + const Json& json, absl::string_view header_name) { + if (json.array_value().empty()) { + return absl::InvalidArgumentError("\"values\" list is empty."); + } + std::vector<std::unique_ptr<Rbac::Permission>> values; + for (size_t i = 0; i < json.array_value().size(); ++i) { + const Json& child = json.array_value().at(i); + if (child.type() != Json::Type::STRING) { + return absl::InvalidArgumentError( + absl::StrCat("\"values\" ", i, ": is not a string.")); + } + auto matcher_or = GetHeaderMatcher(header_name, child.string_value()); + if (!matcher_or.ok()) { + return absl::Status( + matcher_or.status().code(), + absl::StrCat("\"values\" ", i, ": ", matcher_or.status().message())); + } + values.push_back(absl::make_unique<Rbac::Permission>( + Rbac::Permission::RuleType::kHeader, std::move(matcher_or.value()))); + } + return Rbac::Permission(Rbac::Permission::RuleType::kOr, std::move(values)); +} + +absl::StatusOr<Rbac::Permission> ParseHeaders(const Json& json) { + auto it = json.object_value().find("key"); + if (it == json.object_value().end()) { + return absl::InvalidArgumentError("\"key\" is not present."); + } + if (it->second.type() != Json::Type::STRING) { + return absl::InvalidArgumentError("\"key\" is not a string."); + } + absl::string_view header_name = it->second.string_value(); + // TODO(ashithasantosh): Add connection headers below. + if (absl::StartsWith(header_name, ":") || + absl::StartsWith(header_name, "grpc-") || header_name == "host" || + header_name == "Host") { + return absl::InvalidArgumentError( + absl::StrFormat("Unsupported \"key\" %s.", header_name)); + } + it = json.object_value().find("values"); + if (it == json.object_value().end()) { + return absl::InvalidArgumentError("\"values\" is not present."); + } + if (it->second.type() != Json::Type::ARRAY) { + return absl::InvalidArgumentError("\"values\" is not an array."); + } + return ParseHeaderValues(it->second, header_name); +} + +absl::StatusOr<Rbac::Permission> ParseHeadersArray(const Json& json) { + std::vector<std::unique_ptr<Rbac::Permission>> headers; + for (size_t i = 0; i < json.array_value().size(); ++i) { + const Json& child = json.array_value().at(i); + if (child.type() != Json::Type::OBJECT) { + return absl::InvalidArgumentError( + absl::StrCat("\"headers\" ", i, ": is not an object.")); + } + auto headers_or = ParseHeaders(child); + if (!headers_or.ok()) { + return absl::Status( + headers_or.status().code(), + absl::StrCat("\"headers\" ", i, ": ", headers_or.status().message())); + } + headers.push_back( + absl::make_unique<Rbac::Permission>(std::move(headers_or.value()))); + } + return Rbac::Permission(Rbac::Permission::RuleType::kAnd, std::move(headers)); +} + +absl::StatusOr<Rbac::Permission> ParsePathsArray(const Json& json) { + std::vector<std::unique_ptr<Rbac::Permission>> paths; + for (size_t i = 0; i < json.array_value().size(); ++i) { + const Json& child = json.array_value().at(i); + if (child.type() != Json::Type::STRING) { + return absl::InvalidArgumentError( + absl::StrCat("\"paths\" ", i, ": is not a string.")); + } + auto matcher_or = GetStringMatcher(child.string_value()); + if (!matcher_or.ok()) { + return absl::Status( + matcher_or.status().code(), + absl::StrCat("\"paths\" ", i, ": ", matcher_or.status().message())); + } + paths.push_back(absl::make_unique<Rbac::Permission>( + Rbac::Permission::RuleType::kPath, std::move(matcher_or.value()))); + } + return Rbac::Permission(Rbac::Permission::RuleType::kOr, std::move(paths)); +} + +absl::StatusOr<Rbac::Permission> ParseRequest(const Json& json) { + std::vector<std::unique_ptr<Rbac::Permission>> request; + auto it = json.object_value().find("paths"); + if (it != json.object_value().end()) { + if (it->second.type() != Json::Type::ARRAY) { + return absl::InvalidArgumentError("\"paths\" is not an array."); + } + auto paths_or = ParsePathsArray(it->second); + if (!paths_or.ok()) return paths_or.status(); + if (!paths_or.value().permissions.empty()) { + request.push_back( + absl::make_unique<Rbac::Permission>(std::move(paths_or.value()))); + } + } + it = json.object_value().find("headers"); + if (it != json.object_value().end()) { + if (it->second.type() != Json::Type::ARRAY) { + return absl::InvalidArgumentError("\"headers\" is not an array."); + } + auto headers_or = ParseHeadersArray(it->second); + if (!headers_or.ok()) return headers_or.status(); + if (!headers_or.value().permissions.empty()) { + request.push_back( + absl::make_unique<Rbac::Permission>(std::move(headers_or.value()))); + } + } + if (request.empty()) { + return Rbac::Permission(Rbac::Permission::RuleType::kAny); + } + return Rbac::Permission(Rbac::Permission::RuleType::kAnd, std::move(request)); +} + +absl::StatusOr<Rbac::Policy> ParseRules(const Json& json) { + Rbac::Principal principals; + auto it = json.object_value().find("source"); + if (it != json.object_value().end()) { + if (it->second.type() != Json::Type::OBJECT) { + return absl::InvalidArgumentError("\"source\" is not an object."); + } + auto peer_or = ParsePeer(it->second); + if (!peer_or.ok()) return peer_or.status(); + principals = std::move(peer_or.value()); + } else { + principals = Rbac::Principal(Rbac::Principal::RuleType::kAny); + } + Rbac::Permission permissions; + it = json.object_value().find("request"); + if (it != json.object_value().end()) { + if (it->second.type() != Json::Type::OBJECT) { + return absl::InvalidArgumentError("\"request\" is not an object."); + } + auto request_or = ParseRequest(it->second); + if (!request_or.ok()) return request_or.status(); + permissions = std::move(request_or.value()); + } else { + permissions = Rbac::Permission(Rbac::Permission::RuleType::kAny); + } + return Rbac::Policy(std::move(permissions), std::move(principals)); +} + +absl::StatusOr<std::map<std::string, Rbac::Policy>> ParseRulesArray( + const Json& json, absl::string_view name) { + std::map<std::string, Rbac::Policy> policies; + for (size_t i = 0; i < json.array_value().size(); ++i) { + const Json& child = json.array_value().at(i); + if (child.type() != Json::Type::OBJECT) { + return absl::InvalidArgumentError( + absl::StrCat("rules ", i, ": is not an object.")); + } + auto it = child.object_value().find("name"); + if (it == child.object_value().end()) { + return absl::InvalidArgumentError( + absl::StrCat("rules ", i, ": \"name\" is not present.")); + } + if (it->second.type() != Json::Type::STRING) { + return absl::InvalidArgumentError( + absl::StrCat("rules ", i, ": \"name\" is not a string.")); + } + std::string policy_name = + std::string(name) + "_" + it->second.string_value(); + auto policy_or = ParseRules(child); + if (!policy_or.ok()) { + return absl::Status( + policy_or.status().code(), + absl::StrCat("rules ", i, ": ", policy_or.status().message())); + } + policies[policy_name] = std::move(policy_or.value()); + } + return std::move(policies); +} + +absl::StatusOr<Rbac> ParseDenyRulesArray(const Json& json, + absl::string_view name) { + auto policies_or = ParseRulesArray(json, name); + if (!policies_or.ok()) return policies_or.status(); + return Rbac(Rbac::Action::kDeny, std::move(policies_or.value())); +} + +absl::StatusOr<Rbac> ParseAllowRulesArray(const Json& json, + absl::string_view name) { + auto policies_or = ParseRulesArray(json, name); + if (!policies_or.ok()) return policies_or.status(); + return Rbac(Rbac::Action::kAllow, std::move(policies_or.value())); +} + +} // namespace + +absl::StatusOr<RbacPolicies> GenerateRbacPolicies( + absl::string_view authz_policy) { + grpc_error_handle error = GRPC_ERROR_NONE; + Json json = Json::Parse(authz_policy, &error); + if (error != GRPC_ERROR_NONE) { + absl::Status status = absl::InvalidArgumentError( + absl::StrCat("Failed to parse SDK authorization policy. Error: ", + grpc_error_std_string(error))); + GRPC_ERROR_UNREF(error); + return status; + } + if (json.type() != Json::Type::OBJECT) { + return absl::InvalidArgumentError( + "SDK authorization policy is not an object."); + } + auto it = json.mutable_object()->find("name"); + if (it == json.mutable_object()->end()) { + return absl::InvalidArgumentError("\"name\" field is not present."); + } + if (it->second.type() != Json::Type::STRING) { + return absl::InvalidArgumentError("\"name\" is not a string."); + } + absl::string_view name = it->second.string_value(); + RbacPolicies rbac_policies; + it = json.mutable_object()->find("deny_rules"); + if (it != json.mutable_object()->end()) { + if (it->second.type() != Json::Type::ARRAY) { + return absl::InvalidArgumentError("\"deny_rules\" is not an array."); + } + auto deny_policy_or = ParseDenyRulesArray(it->second, name); + if (!deny_policy_or.ok()) { + return absl::Status( + deny_policy_or.status().code(), + absl::StrCat("deny_", deny_policy_or.status().message())); + } + rbac_policies.deny_policy = std::move(deny_policy_or.value()); + } else { + rbac_policies.deny_policy.action = Rbac::Action::kDeny; + } + it = json.mutable_object()->find("allow_rules"); + if (it == json.mutable_object()->end()) { + return absl::InvalidArgumentError("\"allow_rules\" is not present."); + } + if (it->second.type() != Json::Type::ARRAY) { + return absl::InvalidArgumentError("\"allow_rules\" is not an array."); + } + auto allow_policy_or = ParseAllowRulesArray(it->second, name); + if (!allow_policy_or.ok()) { + return absl::Status( + allow_policy_or.status().code(), + absl::StrCat("allow_", allow_policy_or.status().message())); + } + rbac_policies.allow_policy = std::move(allow_policy_or.value()); + return std::move(rbac_policies); +} + +} // namespace grpc_core diff --git a/grpc/src/core/lib/security/authorization/rbac_translator.h b/grpc/src/core/lib/security/authorization/rbac_translator.h new file mode 100644 index 00000000..51d70248 --- /dev/null +++ b/grpc/src/core/lib/security/authorization/rbac_translator.h @@ -0,0 +1,39 @@ +// Copyright 2021 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_SECURITY_AUTHORIZATION_RBAC_TRANSLATOR_H +#define GRPC_CORE_LIB_SECURITY_AUTHORIZATION_RBAC_TRANSLATOR_H + +#include <grpc/support/port_platform.h> + +#include "absl/status/statusor.h" +#include "src/core/lib/json/json.h" +#include "src/core/lib/security/authorization/rbac_policy.h" + +namespace grpc_core { + +struct RbacPolicies { + Rbac deny_policy; + Rbac allow_policy; +}; + +// Translates SDK authorization policy to Envoy RBAC policies. Returns error on +// failure. +// authz_policy: Authorization Policy string in JSON format. +absl::StatusOr<RbacPolicies> GenerateRbacPolicies( + absl::string_view authz_policy); + +} // namespace grpc_core + +#endif /* GRPC_CORE_LIB_SECURITY_AUTHORIZATION_RBAC_TRANSLATOR_H */ diff --git a/grpc/src/core/lib/security/credentials/alts/alts_credentials.cc b/grpc/src/core/lib/security/credentials/alts/alts_credentials.cc index 1bc76d9c..30acd749 100644 --- a/grpc/src/core/lib/security/credentials/alts/alts_credentials.cc +++ b/grpc/src/core/lib/security/credentials/alts/alts_credentials.cc @@ -70,7 +70,8 @@ grpc_alts_server_credentials::grpc_alts_server_credentials( } grpc_core::RefCountedPtr<grpc_server_security_connector> -grpc_alts_server_credentials::create_security_connector() { +grpc_alts_server_credentials::create_security_connector( + const grpc_channel_args* /* args */) { return grpc_alts_server_security_connector_create(this->Ref()); } diff --git a/grpc/src/core/lib/security/credentials/alts/alts_credentials.h b/grpc/src/core/lib/security/credentials/alts/alts_credentials.h index cc6d5222..8e1362c0 100644 --- a/grpc/src/core/lib/security/credentials/alts/alts_credentials.h +++ b/grpc/src/core/lib/security/credentials/alts/alts_credentials.h @@ -56,7 +56,7 @@ class grpc_alts_server_credentials final : public grpc_server_credentials { ~grpc_alts_server_credentials() override; grpc_core::RefCountedPtr<grpc_server_security_connector> - create_security_connector() override; + create_security_connector(const grpc_channel_args* /* args */) override; const grpc_alts_credentials_options* options() const { return options_; } grpc_alts_credentials_options* mutable_options() { return options_; } diff --git a/grpc/src/core/lib/security/credentials/composite/composite_credentials.cc b/grpc/src/core/lib/security/credentials/composite/composite_credentials.cc index bccc0347..5543ad1a 100644 --- a/grpc/src/core/lib/security/credentials/composite/composite_credentials.cc +++ b/grpc/src/core/lib/security/credentials/composite/composite_credentials.cc @@ -36,7 +36,7 @@ /* -- Composite call credentials. -- */ -static void composite_call_metadata_cb(void* arg, grpc_error* error); +static void composite_call_metadata_cb(void* arg, grpc_error_handle error); namespace { struct grpc_composite_call_credentials_metadata_context { @@ -64,7 +64,7 @@ struct grpc_composite_call_credentials_metadata_context { }; } // namespace -static void composite_call_metadata_cb(void* arg, grpc_error* error) { +static void composite_call_metadata_cb(void* arg, grpc_error_handle error) { grpc_composite_call_credentials_metadata_context* ctx = static_cast<grpc_composite_call_credentials_metadata_context*>(arg); if (error == GRPC_ERROR_NONE) { @@ -91,7 +91,7 @@ static void composite_call_metadata_cb(void* arg, grpc_error* error) { bool grpc_composite_call_credentials::get_request_metadata( grpc_polling_entity* pollent, grpc_auth_metadata_context auth_md_context, grpc_credentials_mdelem_array* md_array, grpc_closure* on_request_metadata, - grpc_error** error) { + grpc_error_handle* error) { grpc_composite_call_credentials_metadata_context* ctx; ctx = new grpc_composite_call_credentials_metadata_context( this, pollent, auth_md_context, md_array, on_request_metadata); @@ -112,7 +112,7 @@ bool grpc_composite_call_credentials::get_request_metadata( } void grpc_composite_call_credentials::cancel_get_request_metadata( - grpc_credentials_mdelem_array* md_array, grpc_error* error) { + grpc_credentials_mdelem_array* md_array, grpc_error_handle error) { for (size_t i = 0; i < inner_.size(); ++i) { inner_[i]->cancel_get_request_metadata(md_array, GRPC_ERROR_REF(error)); } diff --git a/grpc/src/core/lib/security/credentials/composite/composite_credentials.h b/grpc/src/core/lib/security/credentials/composite/composite_credentials.h index 6b9e9d11..86346275 100644 --- a/grpc/src/core/lib/security/credentials/composite/composite_credentials.h +++ b/grpc/src/core/lib/security/credentials/composite/composite_credentials.h @@ -83,10 +83,10 @@ class grpc_composite_call_credentials : public grpc_call_credentials { grpc_auth_metadata_context context, grpc_credentials_mdelem_array* md_array, grpc_closure* on_request_metadata, - grpc_error** error) override; + grpc_error_handle* error) override; void cancel_get_request_metadata(grpc_credentials_mdelem_array* md_array, - grpc_error* error) override; + grpc_error_handle error) override; grpc_security_level min_security_level() const override { return min_security_level_; diff --git a/grpc/src/core/lib/security/credentials/credentials.h b/grpc/src/core/lib/security/credentials/credentials.h index 61e56e58..b8609c58 100644 --- a/grpc/src/core/lib/security/credentials/credentials.h +++ b/grpc/src/core/lib/security/credentials/credentials.h @@ -187,13 +187,13 @@ struct grpc_call_credentials grpc_auth_metadata_context context, grpc_credentials_mdelem_array* md_array, grpc_closure* on_request_metadata, - grpc_error** error) = 0; + grpc_error_handle* error) = 0; // Cancels a pending asynchronous operation started by // grpc_call_credentials_get_request_metadata() with the corresponding // value of \a md_array. virtual void cancel_get_request_metadata( - grpc_credentials_mdelem_array* md_array, grpc_error* error) = 0; + grpc_credentials_mdelem_array* md_array, grpc_error_handle error) = 0; virtual grpc_security_level min_security_level() const { return min_security_level_; @@ -227,8 +227,9 @@ struct grpc_server_credentials ~grpc_server_credentials() override { DestroyProcessor(); } + // Ownership of \a args is not passed. virtual grpc_core::RefCountedPtr<grpc_server_security_connector> - create_security_connector() = 0; + create_security_connector(const grpc_channel_args* args) = 0; const char* type() const { return type_; } diff --git a/grpc/src/core/lib/security/credentials/external/aws_external_account_credentials.cc b/grpc/src/core/lib/security/credentials/external/aws_external_account_credentials.cc index e9d60ead..c479bf06 100644 --- a/grpc/src/core/lib/security/credentials/external/aws_external_account_credentials.cc +++ b/grpc/src/core/lib/security/credentials/external/aws_external_account_credentials.cc @@ -30,6 +30,7 @@ namespace { const char* kExpectedEnvironmentId = "aws1"; const char* kRegionEnvVar = "AWS_REGION"; +const char* kDefaultRegionEnvVar = "AWS_DEFAULT_REGION"; const char* kAccessKeyIdEnvVar = "AWS_ACCESS_KEY_ID"; const char* kSecretAccessKeyEnvVar = "AWS_SECRET_ACCESS_KEY"; const char* kSessionTokenEnvVar = "AWS_SESSION_TOKEN"; @@ -57,7 +58,7 @@ std::string UrlEncode(const absl::string_view& s) { RefCountedPtr<AwsExternalAccountCredentials> AwsExternalAccountCredentials::Create(Options options, std::vector<std::string> scopes, - grpc_error** error) { + grpc_error_handle* error) { auto creds = MakeRefCounted<AwsExternalAccountCredentials>( std::move(options), std::move(scopes), error); if (*error == GRPC_ERROR_NONE) { @@ -68,7 +69,7 @@ AwsExternalAccountCredentials::Create(Options options, } AwsExternalAccountCredentials::AwsExternalAccountCredentials( - Options options, std::vector<std::string> scopes, grpc_error** error) + Options options, std::vector<std::string> scopes, grpc_error_handle* error) : ExternalAccountCredentials(options, std::move(scopes)) { audience_ = options.audience; auto it = options.credential_source.object_value().find("environment_id"); @@ -120,8 +121,8 @@ AwsExternalAccountCredentials::AwsExternalAccountCredentials( } void AwsExternalAccountCredentials::RetrieveSubjectToken( - HTTPRequestContext* ctx, const Options& options, - std::function<void(std::string, grpc_error*)> cb) { + HTTPRequestContext* ctx, const Options& /*options*/, + std::function<void(std::string, grpc_error_handle)> cb) { if (ctx == nullptr) { FinishRetrieveSubjectToken( "", @@ -140,6 +141,9 @@ void AwsExternalAccountCredentials::RetrieveSubjectToken( void AwsExternalAccountCredentials::RetrieveRegion() { UniquePtr<char> region_from_env(gpr_getenv(kRegionEnvVar)); + if (region_from_env == nullptr) { + region_from_env = UniquePtr<char>(gpr_getenv(kDefaultRegionEnvVar)); + } if (region_from_env != nullptr) { region_ = std::string(region_from_env.get()); if (url_.empty()) { @@ -175,14 +179,14 @@ void AwsExternalAccountCredentials::RetrieveRegion() { } void AwsExternalAccountCredentials::OnRetrieveRegion(void* arg, - grpc_error* error) { + grpc_error_handle error) { AwsExternalAccountCredentials* self = static_cast<AwsExternalAccountCredentials*>(arg); self->OnRetrieveRegionInternal(GRPC_ERROR_REF(error)); } void AwsExternalAccountCredentials::OnRetrieveRegionInternal( - grpc_error* error) { + grpc_error_handle error) { if (error != GRPC_ERROR_NONE) { FinishRetrieveSubjectToken("", error); return; @@ -224,15 +228,15 @@ void AwsExternalAccountCredentials::RetrieveRoleName() { grpc_http_request_destroy(&request.http); } -void AwsExternalAccountCredentials::OnRetrieveRoleName(void* arg, - grpc_error* error) { +void AwsExternalAccountCredentials::OnRetrieveRoleName( + void* arg, grpc_error_handle error) { AwsExternalAccountCredentials* self = static_cast<AwsExternalAccountCredentials*>(arg); self->OnRetrieveRoleNameInternal(GRPC_ERROR_REF(error)); } void AwsExternalAccountCredentials::OnRetrieveRoleNameInternal( - grpc_error* error) { + grpc_error_handle error) { if (error != GRPC_ERROR_NONE) { FinishRetrieveSubjectToken("", error); return; @@ -287,15 +291,15 @@ void AwsExternalAccountCredentials::RetrieveSigningKeys() { grpc_http_request_destroy(&request.http); } -void AwsExternalAccountCredentials::OnRetrieveSigningKeys(void* arg, - grpc_error* error) { +void AwsExternalAccountCredentials::OnRetrieveSigningKeys( + void* arg, grpc_error_handle error) { AwsExternalAccountCredentials* self = static_cast<AwsExternalAccountCredentials*>(arg); self->OnRetrieveSigningKeysInternal(GRPC_ERROR_REF(error)); } void AwsExternalAccountCredentials::OnRetrieveSigningKeysInternal( - grpc_error* error) { + grpc_error_handle error) { if (error != GRPC_ERROR_NONE) { FinishRetrieveSubjectToken("", error); return; @@ -350,7 +354,7 @@ void AwsExternalAccountCredentials::OnRetrieveSigningKeysInternal( } void AwsExternalAccountCredentials::BuildSubjectToken() { - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; if (signer_ == nullptr) { cred_verification_url_ = absl::StrReplaceAll( regional_cred_verification_url_, {{"{region}", region_}}); @@ -396,7 +400,7 @@ void AwsExternalAccountCredentials::BuildSubjectToken() { } void AwsExternalAccountCredentials::FinishRetrieveSubjectToken( - std::string subject_token, grpc_error* error) { + std::string subject_token, grpc_error_handle error) { // Reset context ctx_ = nullptr; // Move object state into local variables. diff --git a/grpc/src/core/lib/security/credentials/external/aws_external_account_credentials.h b/grpc/src/core/lib/security/credentials/external/aws_external_account_credentials.h index edb7e825..50ccf194 100644 --- a/grpc/src/core/lib/security/credentials/external/aws_external_account_credentials.h +++ b/grpc/src/core/lib/security/credentials/external/aws_external_account_credentials.h @@ -28,31 +28,33 @@ namespace grpc_core { class AwsExternalAccountCredentials final : public ExternalAccountCredentials { public: static RefCountedPtr<AwsExternalAccountCredentials> Create( - Options options, std::vector<std::string> scopes, grpc_error** error); + Options options, std::vector<std::string> scopes, + grpc_error_handle* error); AwsExternalAccountCredentials(Options options, std::vector<std::string> scopes, - grpc_error** error); + grpc_error_handle* error); private: void RetrieveSubjectToken( HTTPRequestContext* ctx, const Options& options, - std::function<void(std::string, grpc_error*)> cb) override; + std::function<void(std::string, grpc_error_handle)> cb) override; void RetrieveRegion(); - static void OnRetrieveRegion(void* arg, grpc_error* error); - void OnRetrieveRegionInternal(grpc_error* error); + static void OnRetrieveRegion(void* arg, grpc_error_handle error); + void OnRetrieveRegionInternal(grpc_error_handle error); void RetrieveRoleName(); - static void OnRetrieveRoleName(void* arg, grpc_error* error); - void OnRetrieveRoleNameInternal(grpc_error* error); + static void OnRetrieveRoleName(void* arg, grpc_error_handle error); + void OnRetrieveRoleNameInternal(grpc_error_handle error); void RetrieveSigningKeys(); - static void OnRetrieveSigningKeys(void* arg, grpc_error* error); - void OnRetrieveSigningKeysInternal(grpc_error* error); + static void OnRetrieveSigningKeys(void* arg, grpc_error_handle error); + void OnRetrieveSigningKeysInternal(grpc_error_handle error); void BuildSubjectToken(); - void FinishRetrieveSubjectToken(std::string subject_token, grpc_error* error); + void FinishRetrieveSubjectToken(std::string subject_token, + grpc_error_handle error); std::string audience_; @@ -72,7 +74,7 @@ class AwsExternalAccountCredentials final : public ExternalAccountCredentials { std::string cred_verification_url_; HTTPRequestContext* ctx_ = nullptr; - std::function<void(std::string, grpc_error*)> cb_ = nullptr; + std::function<void(std::string, grpc_error_handle)> cb_ = nullptr; }; } // namespace grpc_core diff --git a/grpc/src/core/lib/security/credentials/external/aws_request_signer.cc b/grpc/src/core/lib/security/credentials/external/aws_request_signer.cc index af8531ee..b665701b 100644 --- a/grpc/src/core/lib/security/credentials/external/aws_request_signer.cc +++ b/grpc/src/core/lib/security/credentials/external/aws_request_signer.cc @@ -66,7 +66,8 @@ AwsRequestSigner::AwsRequestSigner( std::string access_key_id, std::string secret_access_key, std::string token, std::string method, std::string url, std::string region, std::string request_payload, - std::map<std::string, std::string> additional_headers, grpc_error** error) + std::map<std::string, std::string> additional_headers, + grpc_error_handle* error) : access_key_id_(std::move(access_key_id)), secret_access_key_(std::move(secret_access_key)), token_(std::move(token)), diff --git a/grpc/src/core/lib/security/credentials/external/aws_request_signer.h b/grpc/src/core/lib/security/credentials/external/aws_request_signer.h index 62e112cf..22c4ad67 100644 --- a/grpc/src/core/lib/security/credentials/external/aws_request_signer.h +++ b/grpc/src/core/lib/security/credentials/external/aws_request_signer.h @@ -45,7 +45,7 @@ class AwsRequestSigner { std::string token, std::string method, std::string url, std::string region, std::string request_payload, std::map<std::string, std::string> additional_headers, - grpc_error** error); + grpc_error_handle* error); // This method triggers the signing process then returns the headers of the // signed request as a map. In case there is an error, the input `error` diff --git a/grpc/src/core/lib/security/credentials/external/external_account_credentials.cc b/grpc/src/core/lib/security/credentials/external/external_account_credentials.cc index 127a5f39..f5d9442e 100644 --- a/grpc/src/core/lib/security/credentials/external/external_account_credentials.cc +++ b/grpc/src/core/lib/security/credentials/external/external_account_credentials.cc @@ -63,7 +63,8 @@ std::string UrlEncode(const absl::string_view& s) { } // namespace RefCountedPtr<ExternalAccountCredentials> ExternalAccountCredentials::Create( - const Json& json, std::vector<std::string> scopes, grpc_error** error) { + const Json& json, std::vector<std::string> scopes, + grpc_error_handle* error) { GPR_ASSERT(*error == GRPC_ERROR_NONE); Options options; options.type = GRPC_AUTH_JSON_TYPE_INVALID; @@ -213,14 +214,14 @@ void ExternalAccountCredentials::fetch_oauth2( ctx_ = new HTTPRequestContext(httpcli_context, pollent, deadline); metadata_req_ = metadata_req; response_cb_ = response_cb; - auto cb = [this](std::string token, grpc_error* error) { + auto cb = [this](std::string token, grpc_error_handle error) { OnRetrieveSubjectTokenInternal(token, error); }; RetrieveSubjectToken(ctx_, options_, cb); } void ExternalAccountCredentials::OnRetrieveSubjectTokenInternal( - absl::string_view subject_token, grpc_error* error) { + absl::string_view subject_token, grpc_error_handle error) { if (error != GRPC_ERROR_NONE) { FinishTokenFetch(error); } else { @@ -300,13 +301,15 @@ void ExternalAccountCredentials::ExchangeToken( grpc_http_request_destroy(&request.http); } -void ExternalAccountCredentials::OnExchangeToken(void* arg, grpc_error* error) { +void ExternalAccountCredentials::OnExchangeToken(void* arg, + grpc_error_handle error) { ExternalAccountCredentials* self = static_cast<ExternalAccountCredentials*>(arg); self->OnExchangeTokenInternal(GRPC_ERROR_REF(error)); } -void ExternalAccountCredentials::OnExchangeTokenInternal(grpc_error* error) { +void ExternalAccountCredentials::OnExchangeTokenInternal( + grpc_error_handle error) { if (error != GRPC_ERROR_NONE) { FinishTokenFetch(error); } else { @@ -316,7 +319,7 @@ void ExternalAccountCredentials::OnExchangeTokenInternal(grpc_error* error) { std::string(ctx_->response.body, ctx_->response.body_length).c_str()); metadata_req_->response.hdrs = static_cast<grpc_http_header*>( gpr_malloc(sizeof(grpc_http_header) * ctx_->response.hdr_count)); - for (int i = 0; i < ctx_->response.hdr_count; i++) { + for (size_t i = 0; i < ctx_->response.hdr_count; i++) { metadata_req_->response.hdrs[i].key = gpr_strdup(ctx_->response.hdrs[i].key); metadata_req_->response.hdrs[i].value = @@ -330,7 +333,7 @@ void ExternalAccountCredentials::OnExchangeTokenInternal(grpc_error* error) { } void ExternalAccountCredentials::ImpersenateServiceAccount() { - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; absl::string_view response_body(ctx_->response.body, ctx_->response.body_length); Json json = Json::Parse(response_body, &error); @@ -389,14 +392,14 @@ void ExternalAccountCredentials::ImpersenateServiceAccount() { } void ExternalAccountCredentials::OnImpersenateServiceAccount( - void* arg, grpc_error* error) { + void* arg, grpc_error_handle error) { ExternalAccountCredentials* self = static_cast<ExternalAccountCredentials*>(arg); self->OnImpersenateServiceAccountInternal(GRPC_ERROR_REF(error)); } void ExternalAccountCredentials::OnImpersenateServiceAccountInternal( - grpc_error* error) { + grpc_error_handle error) { if (error != GRPC_ERROR_NONE) { FinishTokenFetch(error); return; @@ -443,7 +446,7 @@ void ExternalAccountCredentials::OnImpersenateServiceAccountInternal( metadata_req_->response.body_length = body.length(); metadata_req_->response.hdrs = static_cast<grpc_http_header*>( gpr_malloc(sizeof(grpc_http_header) * ctx_->response.hdr_count)); - for (int i = 0; i < ctx_->response.hdr_count; i++) { + for (size_t i = 0; i < ctx_->response.hdr_count; i++) { metadata_req_->response.hdrs[i].key = gpr_strdup(ctx_->response.hdrs[i].key); metadata_req_->response.hdrs[i].value = @@ -452,7 +455,7 @@ void ExternalAccountCredentials::OnImpersenateServiceAccountInternal( FinishTokenFetch(GRPC_ERROR_NONE); } -void ExternalAccountCredentials::FinishTokenFetch(grpc_error* error) { +void ExternalAccountCredentials::FinishTokenFetch(grpc_error_handle error) { GRPC_LOG_IF_ERROR("Fetch external account credentials access token", GRPC_ERROR_REF(error)); // Move object state into local variables. @@ -473,12 +476,12 @@ void ExternalAccountCredentials::FinishTokenFetch(grpc_error* error) { grpc_call_credentials* grpc_external_account_credentials_create( const char* json_string, const char* scopes_string) { - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; grpc_core::Json json = grpc_core::Json::Parse(json_string, &error); if (error != GRPC_ERROR_NONE) { gpr_log(GPR_ERROR, "External account credentials creation failed. Error: %s.", - grpc_error_string(error)); + grpc_error_std_string(error).c_str()); GRPC_ERROR_UNREF(error); return nullptr; } @@ -489,7 +492,7 @@ grpc_call_credentials* grpc_external_account_credentials_create( if (error != GRPC_ERROR_NONE) { gpr_log(GPR_ERROR, "External account credentials creation failed. Error: %s.", - grpc_error_string(error)); + grpc_error_std_string(error).c_str()); GRPC_ERROR_UNREF(error); return nullptr; } diff --git a/grpc/src/core/lib/security/credentials/external/external_account_credentials.h b/grpc/src/core/lib/security/credentials/external/external_account_credentials.h index 0da77860..3c000968 100644 --- a/grpc/src/core/lib/security/credentials/external/external_account_credentials.h +++ b/grpc/src/core/lib/security/credentials/external/external_account_credentials.h @@ -49,7 +49,8 @@ class ExternalAccountCredentials }; static RefCountedPtr<ExternalAccountCredentials> Create( - const Json& json, std::vector<std::string> scopes, grpc_error** error); + const Json& json, std::vector<std::string> scopes, + grpc_error_handle* error); ExternalAccountCredentials(Options options, std::vector<std::string> scopes); ~ExternalAccountCredentials() override; @@ -84,7 +85,7 @@ class ExternalAccountCredentials // back. virtual void RetrieveSubjectToken( HTTPRequestContext* ctx, const Options& options, - std::function<void(std::string, grpc_error*)> cb) = 0; + std::function<void(std::string, grpc_error_handle)> cb) = 0; private: // This method implements the common token fetch logic and it will be called @@ -95,17 +96,17 @@ class ExternalAccountCredentials grpc_millis deadline) override; void OnRetrieveSubjectTokenInternal(absl::string_view subject_token, - grpc_error* error); + grpc_error_handle error); void ExchangeToken(absl::string_view subject_token); - static void OnExchangeToken(void* arg, grpc_error* error); - void OnExchangeTokenInternal(grpc_error* error); + static void OnExchangeToken(void* arg, grpc_error_handle error); + void OnExchangeTokenInternal(grpc_error_handle error); void ImpersenateServiceAccount(); - static void OnImpersenateServiceAccount(void* arg, grpc_error* error); - void OnImpersenateServiceAccountInternal(grpc_error* error); + static void OnImpersenateServiceAccount(void* arg, grpc_error_handle error); + void OnImpersenateServiceAccountInternal(grpc_error_handle error); - void FinishTokenFetch(grpc_error* error); + void FinishTokenFetch(grpc_error_handle error); Options options_; std::vector<std::string> scopes_; diff --git a/grpc/src/core/lib/security/credentials/external/file_external_account_credentials.cc b/grpc/src/core/lib/security/credentials/external/file_external_account_credentials.cc index 730c0951..d596d294 100644 --- a/grpc/src/core/lib/security/credentials/external/file_external_account_credentials.cc +++ b/grpc/src/core/lib/security/credentials/external/file_external_account_credentials.cc @@ -28,7 +28,7 @@ namespace grpc_core { RefCountedPtr<FileExternalAccountCredentials> FileExternalAccountCredentials::Create(Options options, std::vector<std::string> scopes, - grpc_error** error) { + grpc_error_handle* error) { auto creds = MakeRefCounted<FileExternalAccountCredentials>( std::move(options), std::move(scopes), error); if (*error == GRPC_ERROR_NONE) { @@ -39,7 +39,7 @@ FileExternalAccountCredentials::Create(Options options, } FileExternalAccountCredentials::FileExternalAccountCredentials( - Options options, std::vector<std::string> scopes, grpc_error** error) + Options options, std::vector<std::string> scopes, grpc_error_handle* error) : ExternalAccountCredentials(options, std::move(scopes)) { auto it = options.credential_source.object_value().find("file"); if (it == options.credential_source.object_value().end()) { @@ -91,8 +91,8 @@ FileExternalAccountCredentials::FileExternalAccountCredentials( } void FileExternalAccountCredentials::RetrieveSubjectToken( - HTTPRequestContext* ctx, const Options& options, - std::function<void(std::string, grpc_error*)> cb) { + HTTPRequestContext* /*ctx*/, const Options& /*options*/, + std::function<void(std::string, grpc_error_handle)> cb) { struct SliceWrapper { ~SliceWrapper() { grpc_slice_unref_internal(slice); } grpc_slice slice = grpc_empty_slice(); @@ -100,7 +100,8 @@ void FileExternalAccountCredentials::RetrieveSubjectToken( SliceWrapper content_slice; // To retrieve the subject token, we read the file every time we make a // request because it may have changed since the last request. - grpc_error* error = grpc_load_file(file_.c_str(), 0, &content_slice.slice); + grpc_error_handle error = + grpc_load_file(file_.c_str(), 0, &content_slice.slice); if (error != GRPC_ERROR_NONE) { cb("", error); return; diff --git a/grpc/src/core/lib/security/credentials/external/file_external_account_credentials.h b/grpc/src/core/lib/security/credentials/external/file_external_account_credentials.h index 7df5b6b8..23a6b6d6 100644 --- a/grpc/src/core/lib/security/credentials/external/file_external_account_credentials.h +++ b/grpc/src/core/lib/security/credentials/external/file_external_account_credentials.h @@ -26,16 +26,17 @@ namespace grpc_core { class FileExternalAccountCredentials final : public ExternalAccountCredentials { public: static RefCountedPtr<FileExternalAccountCredentials> Create( - Options options, std::vector<std::string> scopes, grpc_error** error); + Options options, std::vector<std::string> scopes, + grpc_error_handle* error); FileExternalAccountCredentials(Options options, std::vector<std::string> scopes, - grpc_error** error); + grpc_error_handle* error); private: void RetrieveSubjectToken( HTTPRequestContext* ctx, const Options& options, - std::function<void(std::string, grpc_error*)> cb) override; + std::function<void(std::string, grpc_error_handle)> cb) override; // Fields of credential source std::string file_; diff --git a/grpc/src/core/lib/security/credentials/external/url_external_account_credentials.cc b/grpc/src/core/lib/security/credentials/external/url_external_account_credentials.cc index 85d09be9..55151b96 100644 --- a/grpc/src/core/lib/security/credentials/external/url_external_account_credentials.cc +++ b/grpc/src/core/lib/security/credentials/external/url_external_account_credentials.cc @@ -26,7 +26,7 @@ namespace grpc_core { RefCountedPtr<UrlExternalAccountCredentials> UrlExternalAccountCredentials::Create(Options options, std::vector<std::string> scopes, - grpc_error** error) { + grpc_error_handle* error) { auto creds = MakeRefCounted<UrlExternalAccountCredentials>( std::move(options), std::move(scopes), error); if (*error == GRPC_ERROR_NONE) { @@ -37,7 +37,7 @@ UrlExternalAccountCredentials::Create(Options options, } UrlExternalAccountCredentials::UrlExternalAccountCredentials( - Options options, std::vector<std::string> scopes, grpc_error** error) + Options options, std::vector<std::string> scopes, grpc_error_handle* error) : ExternalAccountCredentials(options, std::move(scopes)) { auto it = options.credential_source.object_value().find("url"); if (it == options.credential_source.object_value().end()) { @@ -112,8 +112,8 @@ UrlExternalAccountCredentials::UrlExternalAccountCredentials( } void UrlExternalAccountCredentials::RetrieveSubjectToken( - HTTPRequestContext* ctx, const Options& options, - std::function<void(std::string, grpc_error*)> cb) { + HTTPRequestContext* ctx, const Options& /*options*/, + std::function<void(std::string, grpc_error_handle)> cb) { if (ctx == nullptr) { FinishRetrieveSubjectToken( "", @@ -151,15 +151,15 @@ void UrlExternalAccountCredentials::RetrieveSubjectToken( grpc_http_request_destroy(&request.http); } -void UrlExternalAccountCredentials::OnRetrieveSubjectToken(void* arg, - grpc_error* error) { +void UrlExternalAccountCredentials::OnRetrieveSubjectToken( + void* arg, grpc_error_handle error) { UrlExternalAccountCredentials* self = static_cast<UrlExternalAccountCredentials*>(arg); self->OnRetrieveSubjectTokenInternal(GRPC_ERROR_REF(error)); } void UrlExternalAccountCredentials::OnRetrieveSubjectTokenInternal( - grpc_error* error) { + grpc_error_handle error) { if (error != GRPC_ERROR_NONE) { FinishRetrieveSubjectToken("", error); return; @@ -167,7 +167,7 @@ void UrlExternalAccountCredentials::OnRetrieveSubjectTokenInternal( absl::string_view response_body(ctx_->response.body, ctx_->response.body_length); if (format_type_ == "json") { - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; Json response_json = Json::Parse(response_body, &error); if (error != GRPC_ERROR_NONE || response_json.type() != Json::Type::OBJECT) { @@ -196,7 +196,7 @@ void UrlExternalAccountCredentials::OnRetrieveSubjectTokenInternal( } void UrlExternalAccountCredentials::FinishRetrieveSubjectToken( - std::string subject_token, grpc_error* error) { + std::string subject_token, grpc_error_handle error) { // Reset context ctx_ = nullptr; // Move object state into local variables. diff --git a/grpc/src/core/lib/security/credentials/external/url_external_account_credentials.h b/grpc/src/core/lib/security/credentials/external/url_external_account_credentials.h index 4e37c573..eaf984c7 100644 --- a/grpc/src/core/lib/security/credentials/external/url_external_account_credentials.h +++ b/grpc/src/core/lib/security/credentials/external/url_external_account_credentials.h @@ -26,21 +26,23 @@ namespace grpc_core { class UrlExternalAccountCredentials final : public ExternalAccountCredentials { public: static RefCountedPtr<UrlExternalAccountCredentials> Create( - Options options, std::vector<std::string> scopes, grpc_error** error); + Options options, std::vector<std::string> scopes, + grpc_error_handle* error); UrlExternalAccountCredentials(Options options, std::vector<std::string> scopes, - grpc_error** error); + grpc_error_handle* error); private: void RetrieveSubjectToken( HTTPRequestContext* ctx, const Options& options, - std::function<void(std::string, grpc_error*)> cb) override; + std::function<void(std::string, grpc_error_handle)> cb) override; - static void OnRetrieveSubjectToken(void* arg, grpc_error* error); - void OnRetrieveSubjectTokenInternal(grpc_error* error); + static void OnRetrieveSubjectToken(void* arg, grpc_error_handle error); + void OnRetrieveSubjectTokenInternal(grpc_error_handle error); - void FinishRetrieveSubjectToken(std::string subject_token, grpc_error* error); + void FinishRetrieveSubjectToken(std::string subject_token, + grpc_error_handle error); // Fields of credential source URI url_; @@ -50,7 +52,7 @@ class UrlExternalAccountCredentials final : public ExternalAccountCredentials { std::string format_subject_token_field_name_; HTTPRequestContext* ctx_ = nullptr; - std::function<void(std::string, grpc_error*)> cb_ = nullptr; + std::function<void(std::string, grpc_error_handle)> cb_ = nullptr; }; } // namespace grpc_core diff --git a/grpc/src/core/lib/security/credentials/fake/fake_credentials.cc b/grpc/src/core/lib/security/credentials/fake/fake_credentials.cc index eef636d0..57a897f0 100644 --- a/grpc/src/core/lib/security/credentials/fake/fake_credentials.cc +++ b/grpc/src/core/lib/security/credentials/fake/fake_credentials.cc @@ -59,7 +59,7 @@ class grpc_fake_server_credentials final : public grpc_server_credentials { ~grpc_fake_server_credentials() override = default; grpc_core::RefCountedPtr<grpc_server_security_connector> - create_security_connector() override { + create_security_connector(const grpc_channel_args* /*args*/) override { return grpc_fake_server_security_connector_create(this->Ref()); } }; @@ -92,7 +92,7 @@ const char* grpc_fake_transport_get_expected_targets( bool grpc_md_only_test_credentials::get_request_metadata( grpc_polling_entity* /*pollent*/, grpc_auth_metadata_context /*context*/, grpc_credentials_mdelem_array* md_array, grpc_closure* on_request_metadata, - grpc_error** /*error*/) { + grpc_error_handle* /*error*/) { grpc_credentials_mdelem_array_add(md_array, md_); if (is_async_) { grpc_core::ExecCtx::Run(DEBUG_LOCATION, on_request_metadata, @@ -103,7 +103,7 @@ bool grpc_md_only_test_credentials::get_request_metadata( } void grpc_md_only_test_credentials::cancel_get_request_metadata( - grpc_credentials_mdelem_array* /*md_array*/, grpc_error* error) { + grpc_credentials_mdelem_array* /*md_array*/, grpc_error_handle error) { GRPC_ERROR_UNREF(error); } diff --git a/grpc/src/core/lib/security/credentials/fake/fake_credentials.h b/grpc/src/core/lib/security/credentials/fake/fake_credentials.h index 3c2449fa..ea8c8136 100644 --- a/grpc/src/core/lib/security/credentials/fake/fake_credentials.h +++ b/grpc/src/core/lib/security/credentials/fake/fake_credentials.h @@ -72,10 +72,10 @@ class grpc_md_only_test_credentials : public grpc_call_credentials { grpc_auth_metadata_context context, grpc_credentials_mdelem_array* md_array, grpc_closure* on_request_metadata, - grpc_error** error) override; + grpc_error_handle* error) override; void cancel_get_request_metadata(grpc_credentials_mdelem_array* md_array, - grpc_error* error) override; + grpc_error_handle error) override; std::string debug_string() override { return "MD only Test Credentials"; }; diff --git a/grpc/src/core/lib/security/credentials/google_default/google_default_credentials.cc b/grpc/src/core/lib/security/credentials/google_default/google_default_credentials.cc index d1de87db..0e1a2a10 100644 --- a/grpc/src/core/lib/security/credentials/google_default/google_default_credentials.cc +++ b/grpc/src/core/lib/security/credentials/google_default/google_default_credentials.cc @@ -61,7 +61,7 @@ using grpc_core::Json; * means the detection is done via network test that is unreliable and the * unreliable result should not be referred by successive calls. */ static int g_metadata_server_available = 0; -static gpr_mu g_state_mu; +static grpc_core::Mutex* g_state_mu; /* Protect a metadata_server_detector instance that can be modified by more than * one gRPC threads */ static gpr_mu* g_polling_mu; @@ -69,7 +69,9 @@ static gpr_once g_once = GPR_ONCE_INIT; static grpc_core::internal::grpc_gce_tenancy_checker g_gce_tenancy_checker = grpc_alts_is_running_on_gcp; -static void init_default_credentials(void) { gpr_mu_init(&g_state_mu); } +static void init_default_credentials(void) { + g_state_mu = new grpc_core::Mutex(); +} struct metadata_server_detector { grpc_polling_entity pollent; @@ -132,8 +134,8 @@ grpc_channel_args* grpc_google_default_channel_credentials::update_arguments( return updated; } -static void on_metadata_server_detection_http_response(void* user_data, - grpc_error* error) { +static void on_metadata_server_detection_http_response( + void* user_data, grpc_error_handle error) { metadata_server_detector* detector = static_cast<metadata_server_detector*>(user_data); if (error == GRPC_ERROR_NONE && detector->response.status == 200 && @@ -159,7 +161,7 @@ static void on_metadata_server_detection_http_response(void* user_data, gpr_mu_unlock(g_polling_mu); } -static void destroy_pollset(void* p, grpc_error* /*e*/) { +static void destroy_pollset(void* p, grpc_error_handle /*e*/) { grpc_pollset_destroy(static_cast<grpc_pollset*>(p)); } @@ -219,14 +221,14 @@ static int is_metadata_server_reachable() { } /* Takes ownership of creds_path if not NULL. */ -static grpc_error* create_default_creds_from_path( +static grpc_error_handle create_default_creds_from_path( const std::string& creds_path, grpc_core::RefCountedPtr<grpc_call_credentials>* creds) { grpc_auth_json_key key; grpc_auth_refresh_token token; grpc_core::RefCountedPtr<grpc_call_credentials> result; grpc_slice creds_data = grpc_empty_slice(); - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; Json json; if (creds_path.empty()) { error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("creds_path unset"); @@ -282,7 +284,7 @@ end: static void update_tenancy() { gpr_once_init(&g_once, init_default_credentials); - grpc_core::MutexLock lock(&g_state_mu); + grpc_core::MutexLock lock(g_state_mu); /* Try a platform-provided hint for GCE. */ if (!g_metadata_server_available) { @@ -297,14 +299,14 @@ static void update_tenancy() { } static bool metadata_server_available() { - grpc_core::MutexLock lock(&g_state_mu); + grpc_core::MutexLock lock(g_state_mu); return static_cast<bool>(g_metadata_server_available); } static grpc_core::RefCountedPtr<grpc_call_credentials> make_default_call_creds( - grpc_error** error) { + grpc_error_handle* error) { grpc_core::RefCountedPtr<grpc_call_credentials> call_creds; - grpc_error* err; + grpc_error_handle err; /* First, try the environment variable. */ char* path_from_env = gpr_getenv(GRPC_GOOGLE_CREDENTIALS_ENV_VAR); @@ -342,7 +344,7 @@ grpc_channel_credentials* grpc_google_default_credentials_create( grpc_call_credentials* call_credentials) { grpc_channel_credentials* result = nullptr; grpc_core::RefCountedPtr<grpc_call_credentials> call_creds(call_credentials); - grpc_error* error = nullptr; + grpc_error_handle error = GRPC_ERROR_NONE; grpc_core::ExecCtx exec_ctx; GRPC_API_TRACE("grpc_google_default_credentials_create(%p)", 1, @@ -371,7 +373,7 @@ grpc_channel_credentials* grpc_google_default_credentials_create( GPR_ASSERT(result != nullptr); } else { gpr_log(GPR_ERROR, "Could not create google default credentials: %s", - grpc_error_string(error)); + grpc_error_std_string(error).c_str()); } GRPC_ERROR_UNREF(error); return result; @@ -387,9 +389,8 @@ void set_gce_tenancy_checker_for_testing(grpc_gce_tenancy_checker checker) { void grpc_flush_cached_google_default_credentials(void) { grpc_core::ExecCtx exec_ctx; gpr_once_init(&g_once, init_default_credentials); - gpr_mu_lock(&g_state_mu); + grpc_core::MutexLock lock(g_state_mu); g_metadata_server_available = 0; - gpr_mu_unlock(&g_state_mu); } } // namespace internal diff --git a/grpc/src/core/lib/security/credentials/iam/iam_credentials.cc b/grpc/src/core/lib/security/credentials/iam/iam_credentials.cc index 1aeaa888..c9dc2235 100644 --- a/grpc/src/core/lib/security/credentials/iam/iam_credentials.cc +++ b/grpc/src/core/lib/security/credentials/iam/iam_credentials.cc @@ -36,13 +36,13 @@ grpc_google_iam_credentials::~grpc_google_iam_credentials() { bool grpc_google_iam_credentials::get_request_metadata( grpc_polling_entity* /*pollent*/, grpc_auth_metadata_context /*context*/, grpc_credentials_mdelem_array* md_array, - grpc_closure* /*on_request_metadata*/, grpc_error** /*error*/) { + grpc_closure* /*on_request_metadata*/, grpc_error_handle* /*error*/) { grpc_credentials_mdelem_array_append(md_array, &md_array_); return true; } void grpc_google_iam_credentials::cancel_get_request_metadata( - grpc_credentials_mdelem_array* /*md_array*/, grpc_error* error) { + grpc_credentials_mdelem_array* /*md_array*/, grpc_error_handle error) { GRPC_ERROR_UNREF(error); } diff --git a/grpc/src/core/lib/security/credentials/iam/iam_credentials.h b/grpc/src/core/lib/security/credentials/iam/iam_credentials.h index 9d4a1e2e..881ba268 100644 --- a/grpc/src/core/lib/security/credentials/iam/iam_credentials.h +++ b/grpc/src/core/lib/security/credentials/iam/iam_credentials.h @@ -35,10 +35,10 @@ class grpc_google_iam_credentials : public grpc_call_credentials { grpc_auth_metadata_context context, grpc_credentials_mdelem_array* md_array, grpc_closure* on_request_metadata, - grpc_error** error) override; + grpc_error_handle* error) override; void cancel_get_request_metadata(grpc_credentials_mdelem_array* md_array, - grpc_error* error) override; + grpc_error_handle error) override; std::string debug_string() override { return debug_string_; } private: diff --git a/grpc/src/core/lib/security/credentials/insecure/insecure_credentials.cc b/grpc/src/core/lib/security/credentials/insecure/insecure_credentials.cc index 01c1ad71..4cf500e6 100644 --- a/grpc/src/core/lib/security/credentials/insecure/insecure_credentials.cc +++ b/grpc/src/core/lib/security/credentials/insecure/insecure_credentials.cc @@ -46,8 +46,8 @@ class InsecureServerCredentials final : public grpc_server_credentials { InsecureServerCredentials() : grpc_server_credentials(kCredentialsTypeInsecure) {} - RefCountedPtr<grpc_server_security_connector> create_security_connector() - override { + RefCountedPtr<grpc_server_security_connector> create_security_connector( + const grpc_channel_args* /* args */) override { return MakeRefCounted<InsecureServerSecurityConnector>(Ref()); } }; diff --git a/grpc/src/core/lib/security/credentials/jwt/json_token.cc b/grpc/src/core/lib/security/credentials/jwt/json_token.cc index 8f5a94f4..5e317c49 100644 --- a/grpc/src/core/lib/security/credentials/jwt/json_token.cc +++ b/grpc/src/core/lib/security/credentials/jwt/json_token.cc @@ -33,14 +33,11 @@ #include "src/core/lib/security/util/json_util.h" #include "src/core/lib/slice/b64.h" -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wmodule-import-in-extern-c" extern "C" { #include <openssl/bio.h> #include <openssl/evp.h> #include <openssl/pem.h> } -#pragma clang diagnostic pop using grpc_core::Json; @@ -75,7 +72,7 @@ grpc_auth_json_key grpc_auth_json_key_create_from_json(const Json& json) { BIO* bio = nullptr; const char* prop_value; int success = 0; - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; memset(&result, 0, sizeof(grpc_auth_json_key)); result.type = GRPC_AUTH_JSON_TYPE_INVALID; @@ -127,7 +124,7 @@ end: grpc_auth_json_key grpc_auth_json_key_create_from_string( const char* json_string) { - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; Json json = Json::Parse(json_string, &error); GRPC_LOG_IF_ERROR("JSON key parsing", error); return grpc_auth_json_key_create_from_json(json); diff --git a/grpc/src/core/lib/security/credentials/jwt/jwt_credentials.cc b/grpc/src/core/lib/security/credentials/jwt/jwt_credentials.cc index e5edc052..27590f4b 100644 --- a/grpc/src/core/lib/security/credentials/jwt/jwt_credentials.cc +++ b/grpc/src/core/lib/security/credentials/jwt/jwt_credentials.cc @@ -59,7 +59,7 @@ grpc_service_account_jwt_access_credentials:: bool grpc_service_account_jwt_access_credentials::get_request_metadata( grpc_polling_entity* /*pollent*/, grpc_auth_metadata_context context, grpc_credentials_mdelem_array* md_array, - grpc_closure* /*on_request_metadata*/, grpc_error** error) { + grpc_closure* /*on_request_metadata*/, grpc_error_handle* error) { gpr_timespec refresh_threshold = gpr_time_from_seconds( GRPC_SECURE_TOKEN_REFRESH_THRESHOLD_SECS, GPR_TIMESPAN); @@ -109,7 +109,7 @@ bool grpc_service_account_jwt_access_credentials::get_request_metadata( } void grpc_service_account_jwt_access_credentials::cancel_get_request_metadata( - grpc_credentials_mdelem_array* /*md_array*/, grpc_error* error) { + grpc_credentials_mdelem_array* /*md_array*/, grpc_error_handle error) { GRPC_ERROR_UNREF(error); } @@ -141,7 +141,7 @@ grpc_service_account_jwt_access_credentials_create_from_auth_json_key( } static char* redact_private_key(const char* json_key) { - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; Json json = Json::Parse(json_key, &error); if (error != GRPC_ERROR_NONE || json.type() != Json::Type::OBJECT) { GRPC_ERROR_UNREF(error); diff --git a/grpc/src/core/lib/security/credentials/jwt/jwt_credentials.h b/grpc/src/core/lib/security/credentials/jwt/jwt_credentials.h index d42fc25f..5ae4c1f4 100644 --- a/grpc/src/core/lib/security/credentials/jwt/jwt_credentials.h +++ b/grpc/src/core/lib/security/credentials/jwt/jwt_credentials.h @@ -41,10 +41,10 @@ class grpc_service_account_jwt_access_credentials grpc_auth_metadata_context context, grpc_credentials_mdelem_array* md_array, grpc_closure* on_request_metadata, - grpc_error** error) override; + grpc_error_handle* error) override; void cancel_get_request_metadata(grpc_credentials_mdelem_array* md_array, - grpc_error* error) override; + grpc_error_handle error) override; const gpr_timespec& jwt_lifetime() const { return jwt_lifetime_; } const grpc_auth_json_key& key() const { return key_; } diff --git a/grpc/src/core/lib/security/credentials/jwt/jwt_verifier.cc b/grpc/src/core/lib/security/credentials/jwt/jwt_verifier.cc index ec3aed8a..8d43cf98 100644 --- a/grpc/src/core/lib/security/credentials/jwt/jwt_verifier.cc +++ b/grpc/src/core/lib/security/credentials/jwt/jwt_verifier.cc @@ -28,14 +28,11 @@ #include <grpc/support/string_util.h> #include <grpc/support/sync.h> -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wmodule-import-in-extern-c" extern "C" { #include <openssl/bn.h> #include <openssl/pem.h> #include <openssl/rsa.h> } -#pragma clang diagnostic pop #include "src/core/lib/gpr/string.h" #include "src/core/lib/gprpp/manual_constructor.h" @@ -90,10 +87,11 @@ static Json parse_json_part_from_jwt(const char* str, size_t len) { return Json(); // JSON null } absl::string_view string = grpc_core::StringViewFromSlice(slice); - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; Json json = Json::Parse(string, &error); if (error != GRPC_ERROR_NONE) { - gpr_log(GPR_ERROR, "JSON parse error: %s", grpc_error_string(error)); + gpr_log(GPR_ERROR, "JSON parse error: %s", + grpc_error_std_string(error).c_str()); GRPC_ERROR_UNREF(error); json = Json(); // JSON null } @@ -415,7 +413,7 @@ static Json json_from_http(const grpc_httpcli_response* response) { response->status); return Json(); // JSON null } - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; Json json = Json::Parse( absl::string_view(response->body, response->body_length), &error); if (error != GRPC_ERROR_NONE) { @@ -630,7 +628,7 @@ end: return result; } -static void on_keys_retrieved(void* user_data, grpc_error* /*error*/) { +static void on_keys_retrieved(void* user_data, grpc_error_handle /*error*/) { verifier_cb_ctx* ctx = static_cast<verifier_cb_ctx*>(user_data); Json json = json_from_http(&ctx->responses[HTTP_RESPONSE_KEYS]); EVP_PKEY* verification_key = nullptr; @@ -669,7 +667,8 @@ end: verifier_cb_ctx_destroy(ctx); } -static void on_openid_config_retrieved(void* user_data, grpc_error* /*error*/) { +static void on_openid_config_retrieved(void* user_data, + grpc_error_handle /*error*/) { verifier_cb_ctx* ctx = static_cast<verifier_cb_ctx*>(user_data); const grpc_http_response* response = &ctx->responses[HTTP_RESPONSE_OPENID]; Json json = json_from_http(response); diff --git a/grpc/src/core/lib/security/credentials/local/local_credentials.cc b/grpc/src/core/lib/security/credentials/local/local_credentials.cc index 966a887b..84caf1c3 100644 --- a/grpc/src/core/lib/security/credentials/local/local_credentials.cc +++ b/grpc/src/core/lib/security/credentials/local/local_credentials.cc @@ -39,7 +39,8 @@ grpc_local_credentials::create_security_connector( } grpc_core::RefCountedPtr<grpc_server_security_connector> -grpc_local_server_credentials::create_security_connector() { +grpc_local_server_credentials::create_security_connector( + const grpc_channel_args* /* args */) { return grpc_local_server_security_connector_create(this->Ref()); } diff --git a/grpc/src/core/lib/security/credentials/local/local_credentials.h b/grpc/src/core/lib/security/credentials/local/local_credentials.h index 60a8a4f6..a1857ad8 100644 --- a/grpc/src/core/lib/security/credentials/local/local_credentials.h +++ b/grpc/src/core/lib/security/credentials/local/local_credentials.h @@ -50,7 +50,7 @@ class grpc_local_server_credentials final : public grpc_server_credentials { ~grpc_local_server_credentials() override = default; grpc_core::RefCountedPtr<grpc_server_security_connector> - create_security_connector() override; + create_security_connector(const grpc_channel_args* /* args */) override; grpc_local_connect_type connect_type() const { return connect_type_; } diff --git a/grpc/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc b/grpc/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc index bbd2cb5b..50d20e64 100644 --- a/grpc/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc +++ b/grpc/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc @@ -61,7 +61,7 @@ grpc_auth_refresh_token grpc_auth_refresh_token_create_from_json( grpc_auth_refresh_token result; const char* prop_value; int success = 0; - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; memset(&result, 0, sizeof(grpc_auth_refresh_token)); result.type = GRPC_AUTH_JSON_TYPE_INVALID; @@ -94,10 +94,11 @@ end: grpc_auth_refresh_token grpc_auth_refresh_token_create_from_string( const char* json_string) { - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; Json json = Json::Parse(json_string, &error); if (error != GRPC_ERROR_NONE) { - gpr_log(GPR_ERROR, "JSON parsing failed: %s", grpc_error_string(error)); + gpr_log(GPR_ERROR, "JSON parsing failed: %s", + grpc_error_std_string(error).c_str()); GRPC_ERROR_UNREF(error); } return grpc_auth_refresh_token_create_from_json(json); @@ -164,11 +165,11 @@ grpc_oauth2_token_fetcher_credentials_parse_server_response( const char* token_type = nullptr; const char* expires_in = nullptr; Json::Object::const_iterator it; - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; json = Json::Parse(null_terminated_body, &error); if (error != GRPC_ERROR_NONE) { gpr_log(GPR_ERROR, "Could not parse JSON from %s: %s", - null_terminated_body, grpc_error_string(error)); + null_terminated_body, grpc_error_std_string(error).c_str()); GRPC_ERROR_UNREF(error); status = GRPC_CREDENTIALS_ERROR; goto end; @@ -221,7 +222,7 @@ end: } static void on_oauth2_token_fetcher_http_response(void* user_data, - grpc_error* error) { + grpc_error_handle error) { GRPC_LOG_IF_ERROR("oauth_fetch", GRPC_ERROR_REF(error)); grpc_credentials_metadata_request* r = static_cast<grpc_credentials_metadata_request*>(user_data); @@ -231,7 +232,7 @@ static void on_oauth2_token_fetcher_http_response(void* user_data, } void grpc_oauth2_token_fetcher_credentials::on_http_response( - grpc_credentials_metadata_request* r, grpc_error* error) { + grpc_credentials_metadata_request* r, grpc_error_handle error) { grpc_mdelem access_token_md = GRPC_MDNULL; grpc_millis token_lifetime = 0; grpc_credentials_status status = @@ -253,7 +254,7 @@ void grpc_oauth2_token_fetcher_credentials::on_http_response( gpr_mu_unlock(&mu_); // Invoke callbacks for all pending requests. while (pending_request != nullptr) { - grpc_error* new_error = GRPC_ERROR_NONE; + grpc_error_handle new_error = GRPC_ERROR_NONE; if (status == GRPC_CREDENTIALS_OK) { grpc_credentials_mdelem_array_add(pending_request->md_array, access_token_md); @@ -277,7 +278,7 @@ void grpc_oauth2_token_fetcher_credentials::on_http_response( bool grpc_oauth2_token_fetcher_credentials::get_request_metadata( grpc_polling_entity* pollent, grpc_auth_metadata_context /*context*/, grpc_credentials_mdelem_array* md_array, grpc_closure* on_request_metadata, - grpc_error** /*error*/) { + grpc_error_handle* /*error*/) { // Check if we can use the cached token. grpc_millis refresh_threshold = GRPC_SECURE_TOKEN_REFRESH_THRESHOLD_SECS * GPR_MS_PER_SEC; @@ -325,7 +326,7 @@ bool grpc_oauth2_token_fetcher_credentials::get_request_metadata( } void grpc_oauth2_token_fetcher_credentials::cancel_get_request_metadata( - grpc_credentials_mdelem_array* md_array, grpc_error* error) { + grpc_credentials_mdelem_array* md_array, grpc_error_handle error) { gpr_mu_lock(&mu_); grpc_oauth2_pending_get_request_metadata* prev = nullptr; grpc_oauth2_pending_get_request_metadata* pending_request = pending_requests_; @@ -525,8 +526,8 @@ void MaybeAddToBody(const char* field_name, const char* field, body->push_back(absl::StrFormat("&%s=%s", field_name, field)); } -grpc_error* LoadTokenFile(const char* path, gpr_slice* token) { - grpc_error* err = grpc_load_file(path, 1, token); +grpc_error_handle LoadTokenFile(const char* path, gpr_slice* token) { + grpc_error_handle err = grpc_load_file(path, 1, token); if (err != GRPC_ERROR_NONE) return err; if (GRPC_SLICE_LENGTH(*token) == 0) { gpr_log(GPR_ERROR, "Token file %s is empty", path); @@ -565,7 +566,7 @@ class StsTokenFetcherCredentials grpc_millis deadline) override { char* body = nullptr; size_t body_length = 0; - grpc_error* err = FillBody(&body, &body_length); + grpc_error_handle err = FillBody(&body, &body_length); if (err != GRPC_ERROR_NONE) { response_cb(metadata_req, err); GRPC_ERROR_UNREF(err); @@ -598,12 +599,12 @@ class StsTokenFetcherCredentials gpr_free(body); } - grpc_error* FillBody(char** body, size_t* body_length) { + grpc_error_handle FillBody(char** body, size_t* body_length) { *body = nullptr; std::vector<std::string> body_parts; grpc_slice subject_token = grpc_empty_slice(); grpc_slice actor_token = grpc_empty_slice(); - grpc_error* err = GRPC_ERROR_NONE; + grpc_error_handle err = GRPC_ERROR_NONE; auto cleanup = [&body, &body_length, &body_parts, &subject_token, &actor_token, &err]() { @@ -656,7 +657,7 @@ class StsTokenFetcherCredentials absl::StatusOr<URI> ValidateStsCredentialsOptions( const grpc_sts_credentials_options* options) { - absl::InlinedVector<grpc_error*, 3> error_list; + absl::InlinedVector<grpc_error_handle, 3> error_list; absl::StatusOr<URI> sts_url = URI::Parse(options->token_exchange_service_uri == nullptr ? "" @@ -685,7 +686,8 @@ absl::StatusOr<URI> ValidateStsCredentialsOptions( } auto grpc_error_vec = GRPC_ERROR_CREATE_FROM_VECTOR( "Invalid STS Credentials Options", &error_list); - auto retval = absl::InvalidArgumentError(grpc_error_string(grpc_error_vec)); + auto retval = + absl::InvalidArgumentError(grpc_error_std_string(grpc_error_vec)); GRPC_ERROR_UNREF(grpc_error_vec); return retval; } @@ -718,13 +720,13 @@ grpc_access_token_credentials::~grpc_access_token_credentials() { bool grpc_access_token_credentials::get_request_metadata( grpc_polling_entity* /*pollent*/, grpc_auth_metadata_context /*context*/, grpc_credentials_mdelem_array* md_array, - grpc_closure* /*on_request_metadata*/, grpc_error** /*error*/) { + grpc_closure* /*on_request_metadata*/, grpc_error_handle* /*error*/) { grpc_credentials_mdelem_array_add(md_array, access_token_md_); return true; } void grpc_access_token_credentials::cancel_get_request_metadata( - grpc_credentials_mdelem_array* /*md_array*/, grpc_error* error) { + grpc_credentials_mdelem_array* /*md_array*/, grpc_error_handle error) { GRPC_ERROR_UNREF(error); } diff --git a/grpc/src/core/lib/security/credentials/oauth2/oauth2_credentials.h b/grpc/src/core/lib/security/credentials/oauth2/oauth2_credentials.h index 26429196..f174112b 100644 --- a/grpc/src/core/lib/security/credentials/oauth2/oauth2_credentials.h +++ b/grpc/src/core/lib/security/credentials/oauth2/oauth2_credentials.h @@ -78,13 +78,13 @@ class grpc_oauth2_token_fetcher_credentials : public grpc_call_credentials { grpc_auth_metadata_context context, grpc_credentials_mdelem_array* md_array, grpc_closure* on_request_metadata, - grpc_error** error) override; + grpc_error_handle* error) override; void cancel_get_request_metadata(grpc_credentials_mdelem_array* md_array, - grpc_error* error) override; + grpc_error_handle error) override; void on_http_response(grpc_credentials_metadata_request* r, - grpc_error* error); + grpc_error_handle error); std::string debug_string() override; protected: @@ -138,10 +138,10 @@ class grpc_access_token_credentials final : public grpc_call_credentials { grpc_auth_metadata_context context, grpc_credentials_mdelem_array* md_array, grpc_closure* on_request_metadata, - grpc_error** error) override; + grpc_error_handle* error) override; void cancel_get_request_metadata(grpc_credentials_mdelem_array* md_array, - grpc_error* error) override; + grpc_error_handle error) override; std::string debug_string() override; diff --git a/grpc/src/core/lib/security/credentials/plugin/plugin_credentials.cc b/grpc/src/core/lib/security/credentials/plugin/plugin_credentials.cc index a5b01cd8..4c583ad3 100644 --- a/grpc/src/core/lib/security/credentials/plugin/plugin_credentials.cc +++ b/grpc/src/core/lib/security/credentials/plugin/plugin_credentials.cc @@ -82,10 +82,10 @@ void grpc_plugin_credentials::pending_request_complete(pending_request* r) { Unref(); } -static grpc_error* process_plugin_result( +static grpc_error_handle process_plugin_result( grpc_plugin_credentials::pending_request* r, const grpc_metadata* md, size_t num_md, grpc_status_code status, const char* error_details) { - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; if (status != GRPC_STATUS_OK) { error = GRPC_ERROR_CREATE_FROM_COPIED_STRING( absl::StrCat("Getting metadata from plugin failed with error: ", @@ -142,7 +142,7 @@ static void plugin_md_request_metadata_ready(void* request, r->creds->pending_request_complete(r); // If it has not been cancelled, process it. if (!r->cancelled) { - grpc_error* error = + grpc_error_handle error = process_plugin_result(r, md, num_md, status, error_details); grpc_core::ExecCtx::Run(DEBUG_LOCATION, r->on_request_metadata, error); } else if (GRPC_TRACE_FLAG_ENABLED(grpc_plugin_credentials_trace)) { @@ -157,7 +157,7 @@ static void plugin_md_request_metadata_ready(void* request, bool grpc_plugin_credentials::get_request_metadata( grpc_polling_entity* /*pollent*/, grpc_auth_metadata_context context, grpc_credentials_mdelem_array* md_array, grpc_closure* on_request_metadata, - grpc_error** error) { + grpc_error_handle* error) { bool retval = true; // Synchronous return. if (plugin_.get_metadata != nullptr) { // Create pending_request object. @@ -231,7 +231,7 @@ bool grpc_plugin_credentials::get_request_metadata( } void grpc_plugin_credentials::cancel_get_request_metadata( - grpc_credentials_mdelem_array* md_array, grpc_error* error) { + grpc_credentials_mdelem_array* md_array, grpc_error_handle error) { gpr_mu_lock(&mu_); for (pending_request* pending_request = pending_requests_; pending_request != nullptr; pending_request = pending_request->next) { diff --git a/grpc/src/core/lib/security/credentials/plugin/plugin_credentials.h b/grpc/src/core/lib/security/credentials/plugin/plugin_credentials.h index 881eded7..68351868 100644 --- a/grpc/src/core/lib/security/credentials/plugin/plugin_credentials.h +++ b/grpc/src/core/lib/security/credentials/plugin/plugin_credentials.h @@ -47,10 +47,10 @@ struct grpc_plugin_credentials final : public grpc_call_credentials { grpc_auth_metadata_context context, grpc_credentials_mdelem_array* md_array, grpc_closure* on_request_metadata, - grpc_error** error) override; + grpc_error_handle* error) override; void cancel_get_request_metadata(grpc_credentials_mdelem_array* md_array, - grpc_error* error) override; + grpc_error_handle error) override; // Checks if the request has been cancelled. // If not, removes it from the pending list, so that it cannot be diff --git a/grpc/src/core/lib/security/credentials/ssl/ssl_credentials.cc b/grpc/src/core/lib/security/credentials/ssl/ssl_credentials.cc index e2a1ad03..469eb0cf 100644 --- a/grpc/src/core/lib/security/credentials/ssl/ssl_credentials.cc +++ b/grpc/src/core/lib/security/credentials/ssl/ssl_credentials.cc @@ -190,7 +190,8 @@ grpc_ssl_server_credentials::~grpc_ssl_server_credentials() { gpr_free(config_.pem_root_certs); } grpc_core::RefCountedPtr<grpc_server_security_connector> -grpc_ssl_server_credentials::create_security_connector() { +grpc_ssl_server_credentials::create_security_connector( + const grpc_channel_args* /* args */) { return grpc_ssl_server_security_connector_create(this->Ref()); } diff --git a/grpc/src/core/lib/security/credentials/ssl/ssl_credentials.h b/grpc/src/core/lib/security/credentials/ssl/ssl_credentials.h index 0c5af81c..0491eea7 100644 --- a/grpc/src/core/lib/security/credentials/ssl/ssl_credentials.h +++ b/grpc/src/core/lib/security/credentials/ssl/ssl_credentials.h @@ -69,7 +69,7 @@ class grpc_ssl_server_credentials final : public grpc_server_credentials { ~grpc_ssl_server_credentials() override; grpc_core::RefCountedPtr<grpc_server_security_connector> - create_security_connector() override; + create_security_connector(const grpc_channel_args* /* args */) override; bool has_cert_config_fetcher() const { return certificate_config_fetcher_.cb != nullptr; diff --git a/grpc/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.cc b/grpc/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.cc index 179df8da..e831aa5c 100644 --- a/grpc/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.cc +++ b/grpc/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.cc @@ -100,8 +100,9 @@ bool grpc_tls_certificate_distributor::HasKeyCertPairs( }; void grpc_tls_certificate_distributor::SetErrorForCert( - const std::string& cert_name, absl::optional<grpc_error*> root_cert_error, - absl::optional<grpc_error*> identity_cert_error) { + const std::string& cert_name, + absl::optional<grpc_error_handle> root_cert_error, + absl::optional<grpc_error_handle> identity_cert_error) { GPR_ASSERT(root_cert_error.has_value() || identity_cert_error.has_value()); grpc_core::MutexLock lock(&mu_); CertificateInfo& cert_info = certificate_info_map_[cert_name]; @@ -112,7 +113,7 @@ void grpc_tls_certificate_distributor::SetErrorForCert( GPR_ASSERT(watcher_it != watchers_.end()); // identity_cert_error_to_report is the error of the identity cert this // watcher is watching, if there is any. - grpc_error* identity_cert_error_to_report = GRPC_ERROR_NONE; + grpc_error_handle identity_cert_error_to_report = GRPC_ERROR_NONE; if (identity_cert_error.has_value() && watcher_it->second.identity_cert_name == cert_name) { identity_cert_error_to_report = *identity_cert_error; @@ -133,7 +134,7 @@ void grpc_tls_certificate_distributor::SetErrorForCert( GPR_ASSERT(watcher_it != watchers_.end()); // root_cert_error_to_report is the error of the root cert this watcher is // watching, if there is any. - grpc_error* root_cert_error_to_report = GRPC_ERROR_NONE; + grpc_error_handle root_cert_error_to_report = GRPC_ERROR_NONE; if (root_cert_error.has_value() && watcher_it->second.root_cert_name == cert_name) { // In this case, We've already sent the error updates at the time when @@ -151,7 +152,7 @@ void grpc_tls_certificate_distributor::SetErrorForCert( } }; -void grpc_tls_certificate_distributor::SetError(grpc_error* error) { +void grpc_tls_certificate_distributor::SetError(grpc_error_handle error) { GPR_ASSERT(error != GRPC_ERROR_NONE); grpc_core::MutexLock lock(&mu_); for (const auto& watcher : watchers_) { @@ -194,8 +195,8 @@ void grpc_tls_certificate_distributor::WatchTlsCertificates( identity_cert_name}; absl::optional<absl::string_view> updated_root_certs; absl::optional<grpc_core::PemKeyCertPairList> updated_identity_pairs; - grpc_error* root_error = GRPC_ERROR_NONE; - grpc_error* identity_error = GRPC_ERROR_NONE; + grpc_error_handle root_error = GRPC_ERROR_NONE; + grpc_error_handle identity_error = GRPC_ERROR_NONE; if (root_cert_name.has_value()) { CertificateInfo& cert_info = certificate_info_map_[*root_cert_name]; start_watching_root_cert = cert_info.root_cert_watchers.empty(); diff --git a/grpc/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h b/grpc/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h index 9ce94433..36c46bef 100644 --- a/grpc/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h +++ b/grpc/src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h @@ -68,8 +68,8 @@ struct grpc_tls_certificate_distributor // certificates. // @param identity_cert_error the error occurred while reloading identity // certificates. - virtual void OnError(grpc_error* root_cert_error, - grpc_error* identity_cert_error) = 0; + virtual void OnError(grpc_error_handle root_cert_error, + grpc_error_handle identity_cert_error) = 0; }; // Sets the key materials based on their certificate name. @@ -95,14 +95,14 @@ struct grpc_tls_certificate_distributor // @param identity_cert_error The error that the caller encounters when // reloading identity certs. void SetErrorForCert(const std::string& cert_name, - absl::optional<grpc_error*> root_cert_error, - absl::optional<grpc_error*> identity_cert_error); + absl::optional<grpc_error_handle> root_cert_error, + absl::optional<grpc_error_handle> identity_cert_error); // Propagates the error that the caller (e.g. Producer) encounters to all // watchers. // // @param error The error that the caller encounters. - void SetError(grpc_error* error); + void SetError(grpc_error_handle error); // Sets the TLS certificate watch status callback function. The // grpc_tls_certificate_distributor will invoke this callback when a new @@ -169,9 +169,9 @@ struct grpc_tls_certificate_distributor // The contents of the identity key-certificate pairs. grpc_core::PemKeyCertPairList pem_key_cert_pairs; // The root cert reloading error propagated by the caller. - grpc_error* root_cert_error = GRPC_ERROR_NONE; + grpc_error_handle root_cert_error = GRPC_ERROR_NONE; // The identity cert reloading error propagated by the caller. - grpc_error* identity_cert_error = GRPC_ERROR_NONE; + grpc_error_handle identity_cert_error = GRPC_ERROR_NONE; // The set of watchers watching root certificates. // This is mainly used for quickly looking up the affected watchers while // performing a credential reloading. @@ -185,11 +185,11 @@ struct grpc_tls_certificate_distributor GRPC_ERROR_UNREF(root_cert_error); GRPC_ERROR_UNREF(identity_cert_error); } - void SetRootError(grpc_error* error) { + void SetRootError(grpc_error_handle error) { GRPC_ERROR_UNREF(root_cert_error); root_cert_error = error; } - void SetIdentityError(grpc_error* error) { + void SetIdentityError(grpc_error_handle error) { GRPC_ERROR_UNREF(identity_cert_error); identity_cert_error = error; } diff --git a/grpc/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.cc b/grpc/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.cc index 2dae03c9..b4b6bf55 100644 --- a/grpc/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.cc +++ b/grpc/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.cc @@ -60,8 +60,8 @@ StaticDataCertificateProvider::StaticDataCertificateProvider( distributor_->SetKeyMaterials(cert_name, std::move(root_certificate), std::move(pem_key_cert_pairs)); } - grpc_error* root_cert_error = GRPC_ERROR_NONE; - grpc_error* identity_cert_error = GRPC_ERROR_NONE; + grpc_error_handle root_cert_error = GRPC_ERROR_NONE; + grpc_error_handle identity_cert_error = GRPC_ERROR_NONE; if (root_being_watched && !root_has_update) { root_cert_error = GRPC_ERROR_CREATE_FROM_STATIC_STRING( "Unable to get latest root certificates."); @@ -150,8 +150,8 @@ FileWatcherCertificateProvider::FileWatcherCertificateProvider( distributor_->SetKeyMaterials(cert_name, root_certificate, pem_key_cert_pairs); } - grpc_error* root_cert_error = GRPC_ERROR_NONE; - grpc_error* identity_cert_error = GRPC_ERROR_NONE; + grpc_error_handle root_cert_error = GRPC_ERROR_NONE; + grpc_error_handle identity_cert_error = GRPC_ERROR_NONE; if (root_being_watched && !root_certificate.has_value()) { root_cert_error = GRPC_ERROR_CREATE_FROM_STATIC_STRING( "Unable to get latest root certificates."); @@ -210,10 +210,11 @@ void FileWatcherCertificateProvider::ForceUpdate() { } if (root_cert_changed || identity_cert_changed) { ExecCtx exec_ctx; - grpc_error* root_cert_error = GRPC_ERROR_CREATE_FROM_STATIC_STRING( + grpc_error_handle root_cert_error = GRPC_ERROR_CREATE_FROM_STATIC_STRING( "Unable to get latest root certificates."); - grpc_error* identity_cert_error = GRPC_ERROR_CREATE_FROM_STATIC_STRING( - "Unable to get latest identity certificates."); + grpc_error_handle identity_cert_error = + GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "Unable to get latest identity certificates."); for (const auto& p : watcher_info_) { const std::string& cert_name = p.first; const WatcherInfo& info = p.second; @@ -256,11 +257,12 @@ FileWatcherCertificateProvider::ReadRootCertificatesFromFile( const std::string& root_cert_full_path) { // Read the root file. grpc_slice root_slice = grpc_empty_slice(); - grpc_error* root_error = + grpc_error_handle root_error = grpc_load_file(root_cert_full_path.c_str(), 0, &root_slice); if (root_error != GRPC_ERROR_NONE) { gpr_log(GPR_ERROR, "Reading file %s failed: %s", - root_cert_full_path.c_str(), grpc_error_string(root_error)); + root_cert_full_path.c_str(), + grpc_error_std_string(root_error).c_str()); GRPC_ERROR_UNREF(root_error); return absl::nullopt; } @@ -314,19 +316,21 @@ FileWatcherCertificateProvider::ReadIdentityKeyCertPairFromFiles( } // Read the identity files. SliceWrapper key_slice, cert_slice; - grpc_error* key_error = + grpc_error_handle key_error = grpc_load_file(private_key_path.c_str(), 0, &key_slice.slice); if (key_error != GRPC_ERROR_NONE) { gpr_log(GPR_ERROR, "Reading file %s failed: %s. Start retrying...", - private_key_path.c_str(), grpc_error_string(key_error)); + private_key_path.c_str(), + grpc_error_std_string(key_error).c_str()); GRPC_ERROR_UNREF(key_error); continue; } - grpc_error* cert_error = + grpc_error_handle cert_error = grpc_load_file(identity_certificate_path.c_str(), 0, &cert_slice.slice); if (cert_error != GRPC_ERROR_NONE) { gpr_log(GPR_ERROR, "Reading file %s failed: %s. Start retrying...", - identity_certificate_path.c_str(), grpc_error_string(cert_error)); + identity_certificate_path.c_str(), + grpc_error_std_string(cert_error).c_str()); GRPC_ERROR_UNREF(cert_error); continue; } @@ -367,6 +371,7 @@ FileWatcherCertificateProvider::ReadIdentityKeyCertPairFromFiles( grpc_tls_certificate_provider* grpc_tls_certificate_provider_static_data_create( const char* root_certificate, grpc_tls_identity_pairs* pem_key_cert_pairs) { GPR_ASSERT(root_certificate != nullptr || pem_key_cert_pairs != nullptr); + grpc_core::ExecCtx exec_ctx; grpc_core::PemKeyCertPairList identity_pairs_core; if (pem_key_cert_pairs != nullptr) { identity_pairs_core = std::move(pem_key_cert_pairs->pem_key_cert_pairs); @@ -384,6 +389,7 @@ grpc_tls_certificate_provider* grpc_tls_certificate_provider_file_watcher_create( const char* private_key_path, const char* identity_certificate_path, const char* root_cert_path, unsigned int refresh_interval_sec) { + grpc_core::ExecCtx exec_ctx; return new grpc_core::FileWatcherCertificateProvider( private_key_path == nullptr ? "" : private_key_path, identity_certificate_path == nullptr ? "" : identity_certificate_path, diff --git a/grpc/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc b/grpc/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc index cf2b4c60..bf26e707 100644 --- a/grpc/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc +++ b/grpc/src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc @@ -87,6 +87,7 @@ void grpc_tls_server_authorization_check_config::Cancel( /** -- Wrapper APIs declared in grpc_security.h -- **/ grpc_tls_credentials_options* grpc_tls_credentials_options_create() { + grpc_core::ExecCtx exec_ctx; return new grpc_tls_credentials_options(); } @@ -109,6 +110,7 @@ void grpc_tls_credentials_options_set_certificate_provider( grpc_tls_certificate_provider* provider) { GPR_ASSERT(options != nullptr); GPR_ASSERT(provider != nullptr); + grpc_core::ExecCtx exec_ctx; options->set_certificate_provider( provider->Ref(DEBUG_LOCATION, "set_certificate_provider")); } @@ -142,6 +144,7 @@ void grpc_tls_credentials_options_set_server_authorization_check_config( grpc_tls_server_authorization_check_config* config) { GPR_ASSERT(options != nullptr); GPR_ASSERT(config != nullptr); + grpc_core::ExecCtx exec_ctx; options->set_server_authorization_check_config(config->Ref()); } @@ -159,6 +162,7 @@ grpc_tls_server_authorization_check_config_create( "check config."); return nullptr; } + grpc_core::ExecCtx exec_ctx; return new grpc_tls_server_authorization_check_config( config_user_data, schedule, cancel, destruct); } diff --git a/grpc/src/core/lib/security/credentials/tls/tls_credentials.cc b/grpc/src/core/lib/security/credentials/tls/tls_credentials.cc index 06887e76..f5b05d8a 100644 --- a/grpc/src/core/lib/security/credentials/tls/tls_credentials.cc +++ b/grpc/src/core/lib/security/credentials/tls/tls_credentials.cc @@ -106,7 +106,8 @@ TlsServerCredentials::TlsServerCredentials( TlsServerCredentials::~TlsServerCredentials() {} grpc_core::RefCountedPtr<grpc_server_security_connector> -TlsServerCredentials::create_security_connector() { +TlsServerCredentials::create_security_connector( + const grpc_channel_args* /* args */) { return grpc_core::TlsServerSecurityConnector:: CreateTlsServerSecurityConnector(this->Ref(), options_); } diff --git a/grpc/src/core/lib/security/credentials/tls/tls_credentials.h b/grpc/src/core/lib/security/credentials/tls/tls_credentials.h index 214bc904..a5e4f486 100644 --- a/grpc/src/core/lib/security/credentials/tls/tls_credentials.h +++ b/grpc/src/core/lib/security/credentials/tls/tls_credentials.h @@ -51,7 +51,7 @@ class TlsServerCredentials final : public grpc_server_credentials { ~TlsServerCredentials() override; grpc_core::RefCountedPtr<grpc_server_security_connector> - create_security_connector() override; + create_security_connector(const grpc_channel_args* /* args */) override; grpc_tls_credentials_options* options() const { return options_.get(); } diff --git a/grpc/src/core/lib/security/credentials/xds/xds_credentials.cc b/grpc/src/core/lib/security/credentials/xds/xds_credentials.cc index 9e00f70f..15b8e900 100644 --- a/grpc/src/core/lib/security/credentials/xds/xds_credentials.cc +++ b/grpc/src/core/lib/security/credentials/xds/xds_credentials.cc @@ -20,6 +20,7 @@ #include "src/core/lib/security/credentials/xds/xds_credentials.h" +#include "src/core/ext/filters/client_channel/lb_policy/xds/xds_channel_args.h" #include "src/core/ext/xds/xds_certificate_provider.h" #include "src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h" #include "src/core/lib/security/credentials/tls/tls_credentials.h" @@ -35,17 +36,17 @@ namespace { bool XdsVerifySubjectAlternativeNames( const char* const* subject_alternative_names, size_t subject_alternative_names_size, - const std::vector<XdsApi::StringMatcher>& matchers) { + const std::vector<StringMatcher>& matchers) { if (matchers.empty()) return true; for (size_t i = 0; i < subject_alternative_names_size; ++i) { for (const auto& matcher : matchers) { - if (matcher.type() == XdsApi::StringMatcher::StringMatcherType::EXACT) { - // For EXACT match, use DNS rules for verifying SANs + if (matcher.type() == StringMatcher::Type::kExact) { + // For Exact match, use DNS rules for verifying SANs // TODO(zhenlian): Right now, the SSL layer does not save the type of // the SAN, so we are doing a DNS style verification for all SANs when // the type is EXACT. When we expose the SAN type, change this to only // do this verification when the SAN type is DNS and match type is - // EXACT. For all other cases, we should use matcher.Match(). + // kExact. For all other cases, we should use matcher.Match(). if (VerifySubjectAlternativeName(subject_alternative_names[i], matcher.string_matcher())) { return true; @@ -60,39 +61,51 @@ bool XdsVerifySubjectAlternativeNames( return false; } -int ServerAuthCheckSchedule(void* config_user_data, - grpc_tls_server_authorization_check_arg* arg) { - XdsCertificateProvider* xds_certificate_provider = - static_cast<XdsCertificateProvider*>(config_user_data); - if (XdsVerifySubjectAlternativeNames( - arg->subject_alternative_names, arg->subject_alternative_names_size, - xds_certificate_provider->subject_alternative_name_matchers())) { - arg->success = 1; - arg->status = GRPC_STATUS_OK; - } else { - arg->success = 0; - arg->status = GRPC_STATUS_UNAUTHENTICATED; - if (arg->error_details) { - arg->error_details->set_error_details( - "SANs from certificate did not match SANs from xDS control plane"); - } +class ServerAuthCheck { + public: + ServerAuthCheck( + RefCountedPtr<XdsCertificateProvider> xds_certificate_provider, + std::string cluster_name) + : xds_certificate_provider_(std::move(xds_certificate_provider)), + cluster_name_(std::move(cluster_name)) {} + + static int Schedule(void* config_user_data, + grpc_tls_server_authorization_check_arg* arg) { + return static_cast<ServerAuthCheck*>(config_user_data)->ScheduleImpl(arg); } - return 0; /* synchronous check */ -} + static void Destroy(void* config_user_data) { + delete static_cast<ServerAuthCheck*>(config_user_data); + } -void ServerAuthCheckDestroy(void* config_user_data) { - XdsCertificateProvider* xds_certificate_provider = - static_cast<XdsCertificateProvider*>(config_user_data); - xds_certificate_provider->Unref(); -} + private: + int ScheduleImpl(grpc_tls_server_authorization_check_arg* arg) { + if (XdsVerifySubjectAlternativeNames( + arg->subject_alternative_names, arg->subject_alternative_names_size, + xds_certificate_provider_->GetSanMatchers(cluster_name_))) { + arg->success = 1; + arg->status = GRPC_STATUS_OK; + } else { + arg->success = 0; + arg->status = GRPC_STATUS_UNAUTHENTICATED; + if (arg->error_details) { + arg->error_details->set_error_details( + "SANs from certificate did not match SANs from xDS control plane"); + } + } + return 0; /* synchronous check */ + } + + RefCountedPtr<XdsCertificateProvider> xds_certificate_provider_; + std::string cluster_name_; +}; } // namespace bool TestOnlyXdsVerifySubjectAlternativeNames( const char* const* subject_alternative_names, size_t subject_alternative_names_size, - const std::vector<XdsApi::StringMatcher>& matchers) { + const std::vector<StringMatcher>& matchers) { return XdsVerifySubjectAlternativeNames( subject_alternative_names, subject_alternative_names_size, matchers); } @@ -105,49 +118,79 @@ RefCountedPtr<grpc_channel_security_connector> XdsCredentials::create_security_connector( RefCountedPtr<grpc_call_credentials> call_creds, const char* target_name, const grpc_channel_args* args, grpc_channel_args** new_args) { - auto xds_certificate_provider = - XdsCertificateProvider::GetFromChannelArgs(args); + struct ChannelArgsDeleter { + const grpc_channel_args* args; + bool owned; + ~ChannelArgsDeleter() { + if (owned) grpc_channel_args_destroy(args); + } + }; + ChannelArgsDeleter temp_args{args, false}; // TODO(yashykt): This arg will no longer need to be added after b/173119596 // is fixed. grpc_arg override_arg = grpc_channel_arg_string_create( const_cast<char*>(GRPC_SSL_TARGET_NAME_OVERRIDE_ARG), const_cast<char*>(target_name)); const char* override_arg_name = GRPC_SSL_TARGET_NAME_OVERRIDE_ARG; - const grpc_channel_args* temp_args = args; if (grpc_channel_args_find(args, override_arg_name) == nullptr) { - temp_args = grpc_channel_args_copy_and_add_and_remove( + temp_args.args = grpc_channel_args_copy_and_add_and_remove( args, &override_arg_name, 1, &override_arg, 1); + temp_args.owned = true; } RefCountedPtr<grpc_channel_security_connector> security_connector; + auto xds_certificate_provider = + XdsCertificateProvider::GetFromChannelArgs(args); if (xds_certificate_provider != nullptr) { - auto tls_credentials_options = - MakeRefCounted<grpc_tls_credentials_options>(); - tls_credentials_options->set_certificate_provider(xds_certificate_provider); - if (xds_certificate_provider->ProvidesRootCerts()) { - tls_credentials_options->set_watch_root_cert(true); - } - if (xds_certificate_provider->ProvidesIdentityCerts()) { - tls_credentials_options->set_watch_identity_pair(true); + std::string cluster_name = + grpc_channel_args_find_string(args, GRPC_ARG_XDS_CLUSTER_NAME); + GPR_ASSERT(cluster_name.data() != nullptr); + const bool watch_root = + xds_certificate_provider->ProvidesRootCerts(cluster_name); + const bool watch_identity = + xds_certificate_provider->ProvidesIdentityCerts(cluster_name); + if (watch_root || watch_identity) { + auto tls_credentials_options = + MakeRefCounted<grpc_tls_credentials_options>(); + tls_credentials_options->set_certificate_provider( + xds_certificate_provider); + if (watch_root) { + tls_credentials_options->set_watch_root_cert(true); + tls_credentials_options->set_root_cert_name(cluster_name); + } + if (watch_identity) { + tls_credentials_options->set_watch_identity_pair(true); + tls_credentials_options->set_identity_cert_name(cluster_name); + } + tls_credentials_options->set_server_verification_option( + GRPC_TLS_SKIP_HOSTNAME_VERIFICATION); + auto* server_auth_check = new ServerAuthCheck(xds_certificate_provider, + std::move(cluster_name)); + tls_credentials_options->set_server_authorization_check_config( + MakeRefCounted<grpc_tls_server_authorization_check_config>( + server_auth_check, ServerAuthCheck::Schedule, nullptr, + ServerAuthCheck::Destroy)); + // TODO(yashkt): Creating a new TlsCreds object each time we create a + // security connector means that the security connector's cmp() method + // returns unequal for each instance, which means that every time an LB + // policy updates, all the subchannels will be recreated. This is + // going to lead to a lot of connection churn. Instead, we should + // either (a) change the TLS security connector's cmp() method to be + // smarter somehow, so that it compares unequal only when the + // tls_credentials_options have changed, or (b) cache the TlsCreds + // objects in the XdsCredentials object so that we can reuse the + // same one when creating new security connectors, swapping out the + // TlsCreds object only when the tls_credentials_options change. + // Option (a) would probably be better, although it may require some + // structural changes to the security connector API. + auto tls_credentials = + MakeRefCounted<TlsCredentials>(std::move(tls_credentials_options)); + return tls_credentials->create_security_connector( + std::move(call_creds), target_name, temp_args.args, new_args); } - tls_credentials_options->set_server_verification_option( - GRPC_TLS_SKIP_HOSTNAME_VERIFICATION); - tls_credentials_options->set_server_authorization_check_config( - MakeRefCounted<grpc_tls_server_authorization_check_config>( - xds_certificate_provider->Ref().release(), ServerAuthCheckSchedule, - nullptr, ServerAuthCheckDestroy)); - auto tls_credentials = - MakeRefCounted<TlsCredentials>(std::move(tls_credentials_options)); - security_connector = tls_credentials->create_security_connector( - std::move(call_creds), target_name, temp_args, new_args); - } else { - GPR_ASSERT(fallback_credentials_ != nullptr); - security_connector = fallback_credentials_->create_security_connector( - std::move(call_creds), target_name, temp_args, new_args); } - if (temp_args != args) { - grpc_channel_args_destroy(temp_args); - } - return security_connector; + GPR_ASSERT(fallback_credentials_ != nullptr); + return fallback_credentials_->create_security_connector( + std::move(call_creds), target_name, temp_args.args, new_args); } // @@ -155,9 +198,35 @@ XdsCredentials::create_security_connector( // RefCountedPtr<grpc_server_security_connector> -XdsServerCredentials::create_security_connector() { - // TODO(yashkt): Fill this - return fallback_credentials_->create_security_connector(); +XdsServerCredentials::create_security_connector(const grpc_channel_args* args) { + auto xds_certificate_provider = + XdsCertificateProvider::GetFromChannelArgs(args); + // Identity certs are a must for TLS. + if (xds_certificate_provider != nullptr && + xds_certificate_provider->ProvidesIdentityCerts("")) { + auto tls_credentials_options = + MakeRefCounted<grpc_tls_credentials_options>(); + tls_credentials_options->set_watch_identity_pair(true); + tls_credentials_options->set_certificate_provider(xds_certificate_provider); + if (xds_certificate_provider->ProvidesRootCerts("")) { + tls_credentials_options->set_watch_root_cert(true); + if (xds_certificate_provider->GetRequireClientCertificate("")) { + tls_credentials_options->set_cert_request_type( + GRPC_SSL_REQUEST_AND_REQUIRE_CLIENT_CERTIFICATE_AND_VERIFY); + } else { + tls_credentials_options->set_cert_request_type( + GRPC_SSL_REQUEST_CLIENT_CERTIFICATE_AND_VERIFY); + } + } else { + // Do not request client certificate if there is no way to verify. + tls_credentials_options->set_cert_request_type( + GRPC_SSL_DONT_REQUEST_CLIENT_CERTIFICATE); + } + auto tls_credentials = MakeRefCounted<TlsServerCredentials>( + std::move(tls_credentials_options)); + return tls_credentials->create_security_connector(args); + } + return fallback_credentials_->create_security_connector(args); } } // namespace grpc_core diff --git a/grpc/src/core/lib/security/credentials/xds/xds_credentials.h b/grpc/src/core/lib/security/credentials/xds/xds_credentials.h index e12608c9..ee2e71c5 100644 --- a/grpc/src/core/lib/security/credentials/xds/xds_credentials.h +++ b/grpc/src/core/lib/security/credentials/xds/xds_credentials.h @@ -52,8 +52,8 @@ class XdsServerCredentials final : public grpc_server_credentials { : grpc_server_credentials(kCredentialsTypeXds), fallback_credentials_(std::move(fallback_credentials)) {} - RefCountedPtr<grpc_server_security_connector> create_security_connector() - override; + RefCountedPtr<grpc_server_security_connector> create_security_connector( + const grpc_channel_args* /* args */) override; private: RefCountedPtr<grpc_server_credentials> fallback_credentials_; @@ -62,7 +62,7 @@ class XdsServerCredentials final : public grpc_server_credentials { bool TestOnlyXdsVerifySubjectAlternativeNames( const char* const* subject_alternative_names, size_t subject_alternative_names_size, - const std::vector<XdsApi::StringMatcher>& matchers); + const std::vector<StringMatcher>& matchers); } // namespace grpc_core diff --git a/grpc/src/core/lib/security/security_connector/alts/alts_security_connector.cc b/grpc/src/core/lib/security/security_connector/alts/alts_security_connector.cc index 64c39e6d..131436df 100644 --- a/grpc/src/core/lib/security/security_connector/alts/alts_security_connector.cc +++ b/grpc/src/core/lib/security/security_connector/alts/alts_security_connector.cc @@ -54,7 +54,7 @@ void alts_check_peer(tsi_peer peer, *auth_context = grpc_core::internal::grpc_alts_auth_context_from_tsi_peer(&peer); tsi_peer_destruct(&peer); - grpc_error* error = + grpc_error_handle error = *auth_context != nullptr ? GRPC_ERROR_NONE : GRPC_ERROR_CREATE_FROM_STATIC_STRING( @@ -103,6 +103,11 @@ class grpc_alts_channel_security_connector final alts_check_peer(peer, auth_context, on_peer_checked); } + void cancel_check_peer(grpc_closure* /*on_peer_checked*/, + grpc_error_handle error) override { + GRPC_ERROR_UNREF(error); + } + int cmp(const grpc_security_connector* other_sc) const override { auto* other = reinterpret_cast<const grpc_alts_channel_security_connector*>(other_sc); @@ -114,7 +119,7 @@ class grpc_alts_channel_security_connector final bool check_call_host(absl::string_view host, grpc_auth_context* /*auth_context*/, grpc_closure* /*on_call_host_checked*/, - grpc_error** error) override { + grpc_error_handle* error) override { if (host.empty() || host != target_name_) { *error = GRPC_ERROR_CREATE_FROM_STATIC_STRING( "ALTS call host does not match target name"); @@ -123,7 +128,7 @@ class grpc_alts_channel_security_connector final } void cancel_check_call_host(grpc_closure* /*on_call_host_checked*/, - grpc_error* error) override { + grpc_error_handle error) override { GRPC_ERROR_UNREF(error); } @@ -168,6 +173,11 @@ class grpc_alts_server_security_connector final alts_check_peer(peer, auth_context, on_peer_checked); } + void cancel_check_peer(grpc_closure* /*on_peer_checked*/, + grpc_error_handle error) override { + GRPC_ERROR_UNREF(error); + } + int cmp(const grpc_security_connector* other) const override { return server_security_connector_cmp( static_cast<const grpc_server_security_connector*>(other)); diff --git a/grpc/src/core/lib/security/security_connector/fake/fake_security_connector.cc b/grpc/src/core/lib/security/security_connector/fake/fake_security_connector.cc index fdf750f4..0e25fb02 100644 --- a/grpc/src/core/lib/security/security_connector/fake/fake_security_connector.cc +++ b/grpc/src/core/lib/security/security_connector/fake/fake_security_connector.cc @@ -79,6 +79,11 @@ class grpc_fake_channel_security_connector final grpc_core::RefCountedPtr<grpc_auth_context>* auth_context, grpc_closure* on_peer_checked) override; + void cancel_check_peer(grpc_closure* /*on_peer_checked*/, + grpc_error_handle error) override { + GRPC_ERROR_UNREF(error); + } + int cmp(const grpc_security_connector* other_sc) const override { auto* other = reinterpret_cast<const grpc_fake_channel_security_connector*>(other_sc); @@ -105,7 +110,7 @@ class grpc_fake_channel_security_connector final bool check_call_host(absl::string_view host, grpc_auth_context* /*auth_context*/, grpc_closure* /*on_call_host_checked*/, - grpc_error** /*error*/) override { + grpc_error_handle* /*error*/) override { absl::string_view authority_hostname; absl::string_view authority_ignored_port; absl::string_view target_hostname; @@ -135,7 +140,7 @@ class grpc_fake_channel_security_connector final } void cancel_check_call_host(grpc_closure* /*on_call_host_checked*/, - grpc_error* error) override { + grpc_error_handle error) override { GRPC_ERROR_UNREF(error); } @@ -214,7 +219,7 @@ static void fake_check_peer( grpc_core::RefCountedPtr<grpc_auth_context>* auth_context, grpc_closure* on_peer_checked) { const char* prop_name; - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; *auth_context = nullptr; if (peer.property_count != 2) { error = GRPC_ERROR_CREATE_FROM_STATIC_STRING( @@ -287,6 +292,11 @@ class grpc_fake_server_security_connector fake_check_peer(this, peer, auth_context, on_peer_checked); } + void cancel_check_peer(grpc_closure* /*on_peer_checked*/, + grpc_error_handle error) override { + GRPC_ERROR_UNREF(error); + } + void add_handshakers(const grpc_channel_args* args, grpc_pollset_set* /*interested_parties*/, grpc_core::HandshakeManager* handshake_mgr) override { diff --git a/grpc/src/core/lib/security/security_connector/insecure/insecure_security_connector.cc b/grpc/src/core/lib/security/security_connector/insecure/insecure_security_connector.cc index 4cb7d21b..360764e1 100644 --- a/grpc/src/core/lib/security/security_connector/insecure/insecure_security_connector.cc +++ b/grpc/src/core/lib/security/security_connector/insecure/insecure_security_connector.cc @@ -51,14 +51,14 @@ RefCountedPtr<grpc_auth_context> TestOnlyMakeInsecureAuthContext() { // check_call_host and cancel_check_call_host are no-ops since we want to // provide an insecure channel. bool InsecureChannelSecurityConnector::check_call_host( - absl::string_view host, grpc_auth_context* auth_context, - grpc_closure* on_call_host_checked, grpc_error** error) { + absl::string_view /*host*/, grpc_auth_context* /*auth_context*/, + grpc_closure* /*on_call_host_checked*/, grpc_error_handle* error) { *error = GRPC_ERROR_NONE; return true; } void InsecureChannelSecurityConnector::cancel_check_call_host( - grpc_closure* on_call_host_checked, grpc_error* error) { + grpc_closure* /*on_call_host_checked*/, grpc_error_handle error) { GRPC_ERROR_UNREF(error); } @@ -76,7 +76,7 @@ void InsecureChannelSecurityConnector::add_handshakers( } void InsecureChannelSecurityConnector::check_peer( - tsi_peer peer, grpc_endpoint* ep, + tsi_peer peer, grpc_endpoint* /*ep*/, RefCountedPtr<grpc_auth_context>* auth_context, grpc_closure* on_peer_checked) { *auth_context = MakeAuthContext(); @@ -104,7 +104,7 @@ void InsecureServerSecurityConnector::add_handshakers( } void InsecureServerSecurityConnector::check_peer( - tsi_peer peer, grpc_endpoint* ep, + tsi_peer peer, grpc_endpoint* /*ep*/, grpc_core::RefCountedPtr<grpc_auth_context>* auth_context, grpc_closure* on_peer_checked) { *auth_context = MakeAuthContext(); diff --git a/grpc/src/core/lib/security/security_connector/insecure/insecure_security_connector.h b/grpc/src/core/lib/security/security_connector/insecure/insecure_security_connector.h index 7d0f79e9..352e346c 100644 --- a/grpc/src/core/lib/security/security_connector/insecure/insecure_security_connector.h +++ b/grpc/src/core/lib/security/security_connector/insecure/insecure_security_connector.h @@ -47,10 +47,10 @@ class InsecureChannelSecurityConnector bool check_call_host(absl::string_view host, grpc_auth_context* auth_context, grpc_closure* on_call_host_checked, - grpc_error** error) override; + grpc_error_handle* error) override; void cancel_check_call_host(grpc_closure* on_call_host_checked, - grpc_error* error) override; + grpc_error_handle error) override; void add_handshakers(const grpc_channel_args* args, grpc_pollset_set* /* interested_parties */, @@ -60,6 +60,11 @@ class InsecureChannelSecurityConnector grpc_core::RefCountedPtr<grpc_auth_context>* auth_context, grpc_closure* on_peer_checked) override; + void cancel_check_peer(grpc_closure* /*on_peer_checked*/, + grpc_error_handle error) override { + GRPC_ERROR_UNREF(error); + } + int cmp(const grpc_security_connector* other_sc) const override; }; @@ -78,6 +83,11 @@ class InsecureServerSecurityConnector : public grpc_server_security_connector { grpc_core::RefCountedPtr<grpc_auth_context>* auth_context, grpc_closure* on_peer_checked) override; + void cancel_check_peer(grpc_closure* /*on_peer_checked*/, + grpc_error_handle error) override { + GRPC_ERROR_UNREF(error); + } + int cmp(const grpc_security_connector* other) const override; }; diff --git a/grpc/src/core/lib/security/security_connector/load_system_roots_linux.cc b/grpc/src/core/lib/security/security_connector/load_system_roots_linux.cc index f7c6c2ce..4cd709f7 100644 --- a/grpc/src/core/lib/security/security_connector/load_system_roots_linux.cc +++ b/grpc/src/core/lib/security/security_connector/load_system_roots_linux.cc @@ -63,7 +63,7 @@ grpc_slice GetSystemRootCerts() { grpc_slice valid_bundle_slice = grpc_empty_slice(); size_t num_cert_files_ = GPR_ARRAY_SIZE(kLinuxCertFiles); for (size_t i = 0; i < num_cert_files_; i++) { - grpc_error* error = + grpc_error_handle error = grpc_load_file(kLinuxCertFiles[i], 1, &valid_bundle_slice); if (error == GRPC_ERROR_NONE) { return valid_bundle_slice; diff --git a/grpc/src/core/lib/security/security_connector/local/local_security_connector.cc b/grpc/src/core/lib/security/security_connector/local/local_security_connector.cc index 2cec0dbb..1c1cfe92 100644 --- a/grpc/src/core/lib/security/security_connector/local/local_security_connector.cc +++ b/grpc/src/core/lib/security/security_connector/local/local_security_connector.cc @@ -29,12 +29,12 @@ #include <grpc/support/string_util.h> #include "src/core/ext/filters/client_channel/client_channel.h" +#include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/pollset.h" #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/sockaddr.h" -#include "src/core/lib/iomgr/sockaddr_utils.h" #include "src/core/lib/iomgr/socket_utils.h" #include "src/core/lib/iomgr/unix_sockets_posix.h" #include "src/core/lib/security/credentials/local/local_credentials.h" @@ -103,7 +103,7 @@ void local_check_peer(tsi_peer peer, grpc_endpoint* ep, } } } - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; if (!is_endpoint_local) { error = GRPC_ERROR_CREATE_FROM_STATIC_STRING( "Endpoint is neither UDS or TCP loopback address."); @@ -181,10 +181,15 @@ class grpc_local_channel_security_connector final creds->connect_type()); } + void cancel_check_peer(grpc_closure* /*on_peer_checked*/, + grpc_error_handle error) override { + GRPC_ERROR_UNREF(error); + } + bool check_call_host(absl::string_view host, grpc_auth_context* /*auth_context*/, grpc_closure* /*on_call_host_checked*/, - grpc_error** error) override { + grpc_error_handle* error) override { if (host.empty() || host != target_name_) { *error = GRPC_ERROR_CREATE_FROM_STATIC_STRING( "local call host does not match target name"); @@ -193,7 +198,7 @@ class grpc_local_channel_security_connector final } void cancel_check_call_host(grpc_closure* /*on_call_host_checked*/, - grpc_error* error) override { + grpc_error_handle error) override { GRPC_ERROR_UNREF(error); } @@ -230,6 +235,11 @@ class grpc_local_server_security_connector final creds->connect_type()); } + void cancel_check_peer(grpc_closure* /*on_peer_checked*/, + grpc_error_handle error) override { + GRPC_ERROR_UNREF(error); + } + int cmp(const grpc_security_connector* other) const override { return server_security_connector_cmp( static_cast<const grpc_server_security_connector*>(other)); diff --git a/grpc/src/core/lib/security/security_connector/security_connector.h b/grpc/src/core/lib/security/security_connector/security_connector.h index 204b6957..50d9af37 100644 --- a/grpc/src/core/lib/security/security_connector/security_connector.h +++ b/grpc/src/core/lib/security/security_connector/security_connector.h @@ -55,13 +55,18 @@ class grpc_security_connector url_scheme_(url_scheme) {} ~grpc_security_connector() override = default; - /* Check the peer. Callee takes ownership of the peer object. - When done, sets *auth_context and invokes on_peer_checked. */ + // Checks the peer. Callee takes ownership of the peer object. + // When done, sets *auth_context and invokes on_peer_checked. virtual void check_peer( tsi_peer peer, grpc_endpoint* ep, grpc_core::RefCountedPtr<grpc_auth_context>* auth_context, grpc_closure* on_peer_checked) = 0; + // Cancels the pending check_peer() request associated with on_peer_checked. + // If there is no such request pending, this is a no-op. + virtual void cancel_check_peer(grpc_closure* on_peer_checked, + grpc_error_handle error) = 0; + /* Compares two security connectors. */ virtual int cmp(const grpc_security_connector* other) const = 0; @@ -103,12 +108,12 @@ class grpc_channel_security_connector : public grpc_security_connector { virtual bool check_call_host(absl::string_view host, grpc_auth_context* auth_context, grpc_closure* on_call_host_checked, - grpc_error** error) = 0; + grpc_error_handle* error) = 0; /// Cancels a pending asynchronous call to /// grpc_channel_security_connector_check_call_host() with /// \a on_call_host_checked as its callback. virtual void cancel_check_call_host(grpc_closure* on_call_host_checked, - grpc_error* error) = 0; + grpc_error_handle error) = 0; /// Registers handshakers with \a handshake_mgr. virtual void add_handshakers(const grpc_channel_args* args, grpc_pollset_set* interested_parties, diff --git a/grpc/src/core/lib/security/security_connector/ssl/ssl_security_connector.cc b/grpc/src/core/lib/security/security_connector/ssl/ssl_security_connector.cc index ee5672b9..3e424e35 100644 --- a/grpc/src/core/lib/security/security_connector/ssl/ssl_security_connector.cc +++ b/grpc/src/core/lib/security/security_connector/ssl/ssl_security_connector.cc @@ -45,10 +45,10 @@ #include "src/core/tsi/transport_security.h" namespace { -grpc_error* ssl_check_peer( +grpc_error_handle ssl_check_peer( const char* peer_name, const tsi_peer* peer, grpc_core::RefCountedPtr<grpc_auth_context>* auth_context) { - grpc_error* error = grpc_ssl_check_alpn(peer); + grpc_error_handle error = grpc_ssl_check_alpn(peer); if (error != GRPC_ERROR_NONE) { return error; } @@ -145,7 +145,7 @@ class grpc_ssl_channel_security_connector final const char* target_name = overridden_target_name_.empty() ? target_name_.c_str() : overridden_target_name_.c_str(); - grpc_error* error = ssl_check_peer(target_name, &peer, auth_context); + grpc_error_handle error = ssl_check_peer(target_name, &peer, auth_context); if (error == GRPC_ERROR_NONE && verify_options_->verify_peer_callback != nullptr) { const tsi_peer_property* p = @@ -173,6 +173,11 @@ class grpc_ssl_channel_security_connector final tsi_peer_destruct(&peer); } + void cancel_check_peer(grpc_closure* /*on_peer_checked*/, + grpc_error_handle error) override { + GRPC_ERROR_UNREF(error); + } + int cmp(const grpc_security_connector* other_sc) const override { auto* other = reinterpret_cast<const grpc_ssl_channel_security_connector*>(other_sc); @@ -185,14 +190,14 @@ class grpc_ssl_channel_security_connector final bool check_call_host(absl::string_view host, grpc_auth_context* auth_context, grpc_closure* /*on_call_host_checked*/, - grpc_error** error) override { + grpc_error_handle* error) override { return grpc_ssl_check_call_host(host, target_name_.c_str(), overridden_target_name_.c_str(), auth_context, error); } void cancel_check_call_host(grpc_closure* /*on_call_host_checked*/, - grpc_error* error) override { + grpc_error_handle error) override { GRPC_ERROR_UNREF(error); } @@ -288,11 +293,16 @@ class grpc_ssl_server_security_connector void check_peer(tsi_peer peer, grpc_endpoint* /*ep*/, grpc_core::RefCountedPtr<grpc_auth_context>* auth_context, grpc_closure* on_peer_checked) override { - grpc_error* error = ssl_check_peer(nullptr, &peer, auth_context); + grpc_error_handle error = ssl_check_peer(nullptr, &peer, auth_context); tsi_peer_destruct(&peer); grpc_core::ExecCtx::Run(DEBUG_LOCATION, on_peer_checked, error); } + void cancel_check_peer(grpc_closure* /*on_peer_checked*/, + grpc_error_handle error) override { + GRPC_ERROR_UNREF(error); + } + int cmp(const grpc_security_connector* other) const override { return server_security_connector_cmp( static_cast<const grpc_server_security_connector*>(other)); diff --git a/grpc/src/core/lib/security/security_connector/ssl_utils.cc b/grpc/src/core/lib/security/security_connector/ssl_utils.cc index f1797d5d..f445be9c 100644 --- a/grpc/src/core/lib/security/security_connector/ssl_utils.cc +++ b/grpc/src/core/lib/security/security_connector/ssl_utils.cc @@ -41,11 +41,13 @@ /* -- Constants. -- */ -#ifndef INSTALL_PREFIX -static const char* installed_roots_path = "/usr/share/grpc/roots.pem"; -#else +#if defined(GRPC_ROOT_PEM_PATH) +static const char* installed_roots_path = GRPC_ROOT_PEM_PATH; +#elif defined(INSTALL_PREFIX) static const char* installed_roots_path = - INSTALL_PREFIX "/share/grpc/roots.pem"; + INSTALL_PREFIX "/usr/share/grpc/roots.pem"; +#else +static const char* installed_roots_path = "/usr/share/grpc/roots.pem"; #endif #ifndef TSI_OPENSSL_ALPN_SUPPORT @@ -150,7 +152,7 @@ tsi_tls_version grpc_get_tsi_tls_version(grpc_tls_version tls_version) { } } -grpc_error* grpc_ssl_check_alpn(const tsi_peer* peer) { +grpc_error_handle grpc_ssl_check_alpn(const tsi_peer* peer) { #if TSI_OPENSSL_ALPN_SUPPORT /* Check the ALPN if ALPN is supported. */ const tsi_peer_property* p = @@ -167,8 +169,8 @@ grpc_error* grpc_ssl_check_alpn(const tsi_peer* peer) { return GRPC_ERROR_NONE; } -grpc_error* grpc_ssl_check_peer_name(absl::string_view peer_name, - const tsi_peer* peer) { +grpc_error_handle grpc_ssl_check_peer_name(absl::string_view peer_name, + const tsi_peer* peer) { /* Check the peer name if specified. */ if (!peer_name.empty() && !grpc_ssl_host_matches_name(peer, peer_name)) { return GRPC_ERROR_CREATE_FROM_COPIED_STRING( @@ -182,7 +184,7 @@ bool grpc_ssl_check_call_host(absl::string_view host, absl::string_view target_name, absl::string_view overridden_target_name, grpc_auth_context* auth_context, - grpc_error** error) { + grpc_error_handle* error) { grpc_security_status status = GRPC_SECURITY_ERROR; tsi_peer peer = grpc_shallow_peer_from_ssl_auth_context(auth_context); if (grpc_ssl_host_matches_name(&peer, host)) status = GRPC_SECURITY_OK; @@ -303,6 +305,9 @@ grpc_core::RefCountedPtr<grpc_auth_context> grpc_ssl_peer_to_auth_context( grpc_auth_context_add_property( ctx.get(), GRPC_TRANSPORT_SECURITY_LEVEL_PROPERTY_NAME, prop->value.data, prop->value.length); + } else if (strcmp(prop->name, TSI_X509_DNS_PEER_PROPERTY) == 0) { + grpc_auth_context_add_property(ctx.get(), GRPC_PEER_DNS_PROPERTY_NAME, + prop->value.data, prop->value.length); } else if (strcmp(prop->name, TSI_X509_URI_PEER_PROPERTY) == 0) { uri_count++; absl::string_view spiffe_id(prop->value.data, prop->value.length); @@ -311,6 +316,12 @@ grpc_core::RefCountedPtr<grpc_auth_context> grpc_ssl_peer_to_auth_context( spiffe_length = prop->value.length; has_spiffe_id = true; } + } else if (strcmp(prop->name, TSI_X509_EMAIL_PEER_PROPERTY) == 0) { + grpc_auth_context_add_property(ctx.get(), GRPC_PEER_EMAIL_PROPERTY_NAME, + prop->value.data, prop->value.length); + } else if (strcmp(prop->name, TSI_X509_IP_PEER_PROPERTY) == 0) { + grpc_auth_context_add_property(ctx.get(), GRPC_PEER_IP_PROPERTY_NAME, + prop->value.data, prop->value.length); } } if (peer_identity_property_name != nullptr) { @@ -374,9 +385,18 @@ tsi_peer grpc_shallow_peer_from_ssl_auth_context( 0) { add_shallow_auth_property_to_peer(&peer, prop, TSI_X509_PEM_CERT_CHAIN_PROPERTY); + } else if (strcmp(prop->name, GRPC_PEER_DNS_PROPERTY_NAME) == 0) { + add_shallow_auth_property_to_peer(&peer, prop, + TSI_X509_DNS_PEER_PROPERTY); } else if (strcmp(prop->name, GRPC_PEER_SPIFFE_ID_PROPERTY_NAME) == 0) { add_shallow_auth_property_to_peer(&peer, prop, TSI_X509_URI_PEER_PROPERTY); + } else if (strcmp(prop->name, GRPC_PEER_EMAIL_PROPERTY_NAME) == 0) { + add_shallow_auth_property_to_peer(&peer, prop, + TSI_X509_EMAIL_PEER_PROPERTY); + } else if (strcmp(prop->name, GRPC_PEER_IP_PROPERTY_NAME) == 0) { + add_shallow_auth_property_to_peer(&peer, prop, + TSI_X509_IP_PEER_PROPERTY); } } } @@ -395,6 +415,9 @@ grpc_security_status grpc_ssl_tsi_client_handshaker_factory_init( const char* root_certs; const tsi_ssl_root_certs_store* root_store; if (pem_root_certs == nullptr) { + gpr_log(GPR_INFO, + "No root certificates specified; use ones stored in system default " + "locations instead"); // Use default root certificates. root_certs = grpc_core::DefaultSslRootStore::GetPemRootCerts(); if (root_certs == nullptr) { diff --git a/grpc/src/core/lib/security/security_connector/ssl_utils.h b/grpc/src/core/lib/security/security_connector/ssl_utils.h index 562a08c9..1c41a543 100644 --- a/grpc/src/core/lib/security/security_connector/ssl_utils.h +++ b/grpc/src/core/lib/security/security_connector/ssl_utils.h @@ -44,11 +44,11 @@ #define GRPC_SSL_URL_SCHEME "https" /* Check ALPN information returned from SSL handshakes. */ -grpc_error* grpc_ssl_check_alpn(const tsi_peer* peer); +grpc_error_handle grpc_ssl_check_alpn(const tsi_peer* peer); /* Check peer name information returned from SSL handshakes. */ -grpc_error* grpc_ssl_check_peer_name(absl::string_view peer_name, - const tsi_peer* peer); +grpc_error_handle grpc_ssl_check_peer_name(absl::string_view peer_name, + const tsi_peer* peer); /* Compare targer_name information extracted from SSL security connectors. */ int grpc_ssl_cmp_target_name(absl::string_view target_name, absl::string_view other_target_name, @@ -59,7 +59,7 @@ bool grpc_ssl_check_call_host(absl::string_view host, absl::string_view target_name, absl::string_view overridden_target_name, grpc_auth_context* auth_context, - grpc_error** error); + grpc_error_handle* error); /* Return HTTP2-compliant cipher suites that gRPC accepts by default. */ const char* grpc_get_ssl_cipher_suites(void); diff --git a/grpc/src/core/lib/security/security_connector/tls/tls_security_connector.cc b/grpc/src/core/lib/security/security_connector/tls/tls_security_connector.cc index a198bb55..ea6b42e0 100644 --- a/grpc/src/core/lib/security/security_connector/tls/tls_security_connector.cc +++ b/grpc/src/core/lib/security/security_connector/tls/tls_security_connector.cc @@ -46,7 +46,7 @@ namespace grpc_core { namespace { tsi_ssl_pem_key_cert_pair* ConvertToTsiPemKeyCertPair( - const grpc_core::PemKeyCertPairList& cert_pair_list) { + const PemKeyCertPairList& cert_pair_list) { tsi_ssl_pem_key_cert_pair* tsi_pairs = nullptr; size_t num_key_cert_pairs = cert_pair_list.size(); if (num_key_cert_pairs > 0) { @@ -68,11 +68,11 @@ tsi_ssl_pem_key_cert_pair* ConvertToTsiPemKeyCertPair( } // namespace // -------------------channel security connector------------------- -grpc_core::RefCountedPtr<grpc_channel_security_connector> +RefCountedPtr<grpc_channel_security_connector> TlsChannelSecurityConnector::CreateTlsChannelSecurityConnector( - grpc_core::RefCountedPtr<grpc_channel_credentials> channel_creds, - grpc_core::RefCountedPtr<grpc_tls_credentials_options> options, - grpc_core::RefCountedPtr<grpc_call_credentials> request_metadata_creds, + RefCountedPtr<grpc_channel_credentials> channel_creds, + RefCountedPtr<grpc_tls_credentials_options> options, + RefCountedPtr<grpc_call_credentials> request_metadata_creds, const char* target_name, const char* overridden_target_name, tsi_ssl_session_cache* ssl_session_cache) { if (channel_creds == nullptr) { @@ -93,18 +93,16 @@ TlsChannelSecurityConnector::CreateTlsChannelSecurityConnector( "TlsChannelSecurityConnectorCreate()"); return nullptr; } - grpc_core::RefCountedPtr<TlsChannelSecurityConnector> c = - grpc_core::MakeRefCounted<TlsChannelSecurityConnector>( - std::move(channel_creds), std::move(options), - std::move(request_metadata_creds), target_name, - overridden_target_name, ssl_session_cache); - return c; + return MakeRefCounted<TlsChannelSecurityConnector>( + std::move(channel_creds), std::move(options), + std::move(request_metadata_creds), target_name, overridden_target_name, + ssl_session_cache); } TlsChannelSecurityConnector::TlsChannelSecurityConnector( - grpc_core::RefCountedPtr<grpc_channel_credentials> channel_creds, - grpc_core::RefCountedPtr<grpc_tls_credentials_options> options, - grpc_core::RefCountedPtr<grpc_call_credentials> request_metadata_creds, + RefCountedPtr<grpc_channel_credentials> channel_creds, + RefCountedPtr<grpc_tls_credentials_options> options, + RefCountedPtr<grpc_call_credentials> request_metadata_creds, const char* target_name, const char* overridden_target_name, tsi_ssl_session_cache* ssl_session_cache) : grpc_channel_security_connector(GRPC_SSL_URL_SCHEME, @@ -120,7 +118,7 @@ TlsChannelSecurityConnector::TlsChannelSecurityConnector( check_arg_ = ServerAuthorizationCheckArgCreate(this); absl::string_view host; absl::string_view port; - grpc_core::SplitHostPort(target_name, &host, &port); + SplitHostPort(target_name, &host, &port); target_name_ = std::string(host); // Create a watcher. auto watcher_ptr = absl::make_unique<TlsChannelCertificateWatcher>(this); @@ -136,9 +134,20 @@ TlsChannelSecurityConnector::TlsChannelSecurityConnector( if (options_->watch_identity_pair()) { watched_identity_cert_name = options_->identity_cert_name(); } - distributor->WatchTlsCertificates(std::move(watcher_ptr), - watched_root_cert_name, - watched_identity_cert_name); + // We will use the root certs stored in system default locations if not + // watching root certs on the client side. We will handle this case + // differently here, because "watching a default roots without the identity + // certs" is a valid case(and hence we will need to call + // OnCertificatesChanged), but it requires nothing from the provider, and + // hence no need to register the watcher. + bool use_default_roots = !options_->watch_root_cert(); + if (use_default_roots && !options_->watch_identity_pair()) { + watcher_ptr->OnCertificatesChanged(absl::nullopt, absl::nullopt); + } else { + distributor->WatchTlsCertificates(std::move(watcher_ptr), + watched_root_cert_name, + watched_identity_cert_name); + } } TlsChannelSecurityConnector::~TlsChannelSecurityConnector() { @@ -148,7 +157,9 @@ TlsChannelSecurityConnector::~TlsChannelSecurityConnector() { // Cancel all the watchers. grpc_tls_certificate_distributor* distributor = options_->certificate_distributor(); - distributor->CancelTlsCertificatesWatch(certificate_watcher_); + if (distributor != nullptr) { + distributor->CancelTlsCertificatesWatch(certificate_watcher_); + } if (client_handshaker_factory_ != nullptr) { tsi_ssl_client_handshaker_factory_unref(client_handshaker_factory_); } @@ -159,8 +170,8 @@ TlsChannelSecurityConnector::~TlsChannelSecurityConnector() { void TlsChannelSecurityConnector::add_handshakers( const grpc_channel_args* args, grpc_pollset_set* /*interested_parties*/, - grpc_core::HandshakeManager* handshake_mgr) { - grpc_core::MutexLock lock(&mu_); + HandshakeManager* handshake_mgr) { + MutexLock lock(&mu_); if (client_handshaker_factory_ != nullptr) { // Instantiate TSI handshaker. tsi_handshaker* tsi_hs = nullptr; @@ -175,7 +186,7 @@ void TlsChannelSecurityConnector::add_handshakers( return; } // Create handshakers. - handshake_mgr->Add(grpc_core::SecurityHandshakerCreate(tsi_hs, this, args)); + handshake_mgr->Add(SecurityHandshakerCreate(tsi_hs, this, args)); return; } // TODO(ZhenLian): Implement the logic(delegation to @@ -186,14 +197,14 @@ void TlsChannelSecurityConnector::add_handshakers( void TlsChannelSecurityConnector::check_peer( tsi_peer peer, grpc_endpoint* /*ep*/, - grpc_core::RefCountedPtr<grpc_auth_context>* auth_context, + RefCountedPtr<grpc_auth_context>* auth_context, grpc_closure* on_peer_checked) { const char* target_name = overridden_target_name_.empty() ? target_name_.c_str() : overridden_target_name_.c_str(); - grpc_error* error = grpc_ssl_check_alpn(&peer); + grpc_error_handle error = grpc_ssl_check_alpn(&peer); if (error != GRPC_ERROR_NONE) { - grpc_core::ExecCtx::Run(DEBUG_LOCATION, on_peer_checked, error); + ExecCtx::Run(DEBUG_LOCATION, on_peer_checked, error); tsi_peer_destruct(&peer); return; } @@ -203,7 +214,7 @@ void TlsChannelSecurityConnector::check_peer( /* Do the default host name check if specifying the target name. */ error = internal::TlsCheckHostName(target_name, &peer); if (error != GRPC_ERROR_NONE) { - grpc_core::ExecCtx::Run(DEBUG_LOCATION, on_peer_checked, error); + ExecCtx::Run(DEBUG_LOCATION, on_peer_checked, error); tsi_peer_destruct(&peer); return; } @@ -286,7 +297,7 @@ void TlsChannelSecurityConnector::check_peer( error = ProcessServerAuthorizationCheckResult(check_arg_); } } - grpc_core::ExecCtx::Run(DEBUG_LOCATION, on_peer_checked, error); + ExecCtx::Run(DEBUG_LOCATION, on_peer_checked, error); tsi_peer_destruct(&peer); } @@ -304,39 +315,40 @@ int TlsChannelSecurityConnector::cmp( bool TlsChannelSecurityConnector::check_call_host( absl::string_view host, grpc_auth_context* auth_context, - grpc_closure* /*on_call_host_checked*/, grpc_error** error) { + grpc_closure* /*on_call_host_checked*/, grpc_error_handle* error) { + if (options_->server_verification_option() == + GRPC_TLS_SKIP_HOSTNAME_VERIFICATION || + options_->server_verification_option() == + GRPC_TLS_SKIP_ALL_SERVER_VERIFICATION) { + return true; + } return grpc_ssl_check_call_host(host, target_name_.c_str(), overridden_target_name_.c_str(), auth_context, error); } void TlsChannelSecurityConnector::cancel_check_call_host( - grpc_closure* /*on_call_host_checked*/, grpc_error* error) { + grpc_closure* /*on_call_host_checked*/, grpc_error_handle error) { GRPC_ERROR_UNREF(error); } void TlsChannelSecurityConnector::TlsChannelCertificateWatcher:: - OnCertificatesChanged( - absl::optional<absl::string_view> root_certs, - absl::optional<grpc_core::PemKeyCertPairList> key_cert_pairs) { + OnCertificatesChanged(absl::optional<absl::string_view> root_certs, + absl::optional<PemKeyCertPairList> key_cert_pairs) { GPR_ASSERT(security_connector_ != nullptr); - grpc_core::MutexLock lock(&security_connector_->mu_); + MutexLock lock(&security_connector_->mu_); if (root_certs.has_value()) { security_connector_->pem_root_certs_ = root_certs; } if (key_cert_pairs.has_value()) { security_connector_->pem_key_cert_pair_list_ = std::move(key_cert_pairs); } - bool root_being_watched = security_connector_->options_->watch_root_cert(); - bool root_has_value = security_connector_->pem_root_certs_.has_value(); - bool identity_being_watched = - security_connector_->options_->watch_identity_pair(); - bool identity_has_value = + const bool root_ready = !security_connector_->options_->watch_root_cert() || + security_connector_->pem_root_certs_.has_value(); + const bool identity_ready = + !security_connector_->options_->watch_identity_pair() || security_connector_->pem_key_cert_pair_list_.has_value(); - if ((root_being_watched && root_has_value && identity_being_watched && - identity_has_value) || - (root_being_watched && root_has_value && !identity_being_watched) || - (!root_being_watched && identity_being_watched && identity_has_value)) { + if (root_ready && identity_ready) { if (security_connector_->UpdateHandshakerFactoryLocked() != GRPC_SECURITY_OK) { gpr_log(GPR_ERROR, "Update handshaker factory failed."); @@ -347,16 +359,16 @@ void TlsChannelSecurityConnector::TlsChannelCertificateWatcher:: // TODO(ZhenLian): implement the logic to signal waiting handshakers once // BlockOnInitialCredentialHandshaker is implemented. void TlsChannelSecurityConnector::TlsChannelCertificateWatcher::OnError( - grpc_error* root_cert_error, grpc_error* identity_cert_error) { + grpc_error_handle root_cert_error, grpc_error_handle identity_cert_error) { if (root_cert_error != GRPC_ERROR_NONE) { gpr_log(GPR_ERROR, "TlsChannelCertificateWatcher getting root_cert_error: %s", - grpc_error_string(root_cert_error)); + grpc_error_std_string(root_cert_error).c_str()); } if (identity_cert_error != GRPC_ERROR_NONE) { gpr_log(GPR_ERROR, "TlsChannelCertificateWatcher getting identity_cert_error: %s", - grpc_error_string(identity_cert_error)); + grpc_error_std_string(identity_cert_error).c_str()); } GRPC_ERROR_UNREF(root_cert_error); GRPC_ERROR_UNREF(identity_cert_error); @@ -383,9 +395,11 @@ TlsChannelSecurityConnector::UpdateHandshakerFactoryLocked() { if (pem_key_cert_pair_list_.has_value()) { pem_key_cert_pair = ConvertToTsiPemKeyCertPair(*pem_key_cert_pair_list_); } + bool use_default_roots = !options_->watch_root_cert(); grpc_security_status status = grpc_ssl_tsi_client_handshaker_factory_init( pem_key_cert_pair, - pem_root_certs.empty() ? nullptr : pem_root_certs.c_str(), + pem_root_certs.empty() || use_default_roots ? nullptr + : pem_root_certs.c_str(), skip_server_certificate_verification, grpc_get_tsi_tls_version(options_->min_tls_version()), grpc_get_tsi_tls_version(options_->max_tls_version()), ssl_session_cache_, @@ -400,16 +414,17 @@ TlsChannelSecurityConnector::UpdateHandshakerFactoryLocked() { void TlsChannelSecurityConnector::ServerAuthorizationCheckDone( grpc_tls_server_authorization_check_arg* arg) { GPR_ASSERT(arg != nullptr); - grpc_core::ExecCtx exec_ctx; - grpc_error* error = ProcessServerAuthorizationCheckResult(arg); + ExecCtx exec_ctx; + grpc_error_handle error = ProcessServerAuthorizationCheckResult(arg); TlsChannelSecurityConnector* connector = static_cast<TlsChannelSecurityConnector*>(arg->cb_user_data); - grpc_core::ExecCtx::Run(DEBUG_LOCATION, connector->on_peer_checked_, error); + ExecCtx::Run(DEBUG_LOCATION, connector->on_peer_checked_, error); } -grpc_error* TlsChannelSecurityConnector::ProcessServerAuthorizationCheckResult( +grpc_error_handle +TlsChannelSecurityConnector::ProcessServerAuthorizationCheckResult( grpc_tls_server_authorization_check_arg* arg) { - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; /* Server authorization check is cancelled by caller. */ if (arg->status == GRPC_STATUS_CANCELLED) { error = GRPC_ERROR_CREATE_FROM_COPIED_STRING( @@ -474,10 +489,10 @@ void TlsChannelSecurityConnector::ServerAuthorizationCheckArgDestroy( } // -------------------server security connector------------------- -grpc_core::RefCountedPtr<grpc_server_security_connector> +RefCountedPtr<grpc_server_security_connector> TlsServerSecurityConnector::CreateTlsServerSecurityConnector( - grpc_core::RefCountedPtr<grpc_server_credentials> server_creds, - grpc_core::RefCountedPtr<grpc_tls_credentials_options> options) { + RefCountedPtr<grpc_server_credentials> server_creds, + RefCountedPtr<grpc_tls_credentials_options> options) { if (server_creds == nullptr) { gpr_log(GPR_ERROR, "server_creds is nullptr in " @@ -490,15 +505,13 @@ TlsServerSecurityConnector::CreateTlsServerSecurityConnector( "TlsServerSecurityConnectorCreate()"); return nullptr; } - grpc_core::RefCountedPtr<TlsServerSecurityConnector> c = - grpc_core::MakeRefCounted<TlsServerSecurityConnector>( - std::move(server_creds), std::move(options)); - return c; + return MakeRefCounted<TlsServerSecurityConnector>(std::move(server_creds), + std::move(options)); } TlsServerSecurityConnector::TlsServerSecurityConnector( - grpc_core::RefCountedPtr<grpc_server_credentials> server_creds, - grpc_core::RefCountedPtr<grpc_tls_credentials_options> options) + RefCountedPtr<grpc_server_credentials> server_creds, + RefCountedPtr<grpc_tls_credentials_options> options) : grpc_server_security_connector(GRPC_SSL_URL_SCHEME, std::move(server_creds)), options_(std::move(options)) { @@ -516,6 +529,7 @@ TlsServerSecurityConnector::TlsServerSecurityConnector( if (options_->watch_identity_pair()) { watched_identity_cert_name = options_->identity_cert_name(); } + // Server side won't use default system roots at any time. distributor->WatchTlsCertificates(std::move(watcher_ptr), watched_root_cert_name, watched_identity_cert_name); @@ -533,8 +547,8 @@ TlsServerSecurityConnector::~TlsServerSecurityConnector() { void TlsServerSecurityConnector::add_handshakers( const grpc_channel_args* args, grpc_pollset_set* /*interested_parties*/, - grpc_core::HandshakeManager* handshake_mgr) { - grpc_core::MutexLock lock(&mu_); + HandshakeManager* handshake_mgr) { + MutexLock lock(&mu_); if (server_handshaker_factory_ != nullptr) { // Instantiate TSI handshaker. tsi_handshaker* tsi_hs = nullptr; @@ -546,7 +560,7 @@ void TlsServerSecurityConnector::add_handshakers( return; } // Create handshakers. - handshake_mgr->Add(grpc_core::SecurityHandshakerCreate(tsi_hs, this, args)); + handshake_mgr->Add(SecurityHandshakerCreate(tsi_hs, this, args)); return; } // TODO(ZhenLian): Implement the logic(delegation to @@ -557,13 +571,13 @@ void TlsServerSecurityConnector::add_handshakers( void TlsServerSecurityConnector::check_peer( tsi_peer peer, grpc_endpoint* /*ep*/, - grpc_core::RefCountedPtr<grpc_auth_context>* auth_context, + RefCountedPtr<grpc_auth_context>* auth_context, grpc_closure* on_peer_checked) { - grpc_error* error = grpc_ssl_check_alpn(&peer); + grpc_error_handle error = grpc_ssl_check_alpn(&peer); *auth_context = grpc_ssl_peer_to_auth_context(&peer, GRPC_TLS_TRANSPORT_SECURITY_TYPE); tsi_peer_destruct(&peer); - grpc_core::ExecCtx::Run(DEBUG_LOCATION, on_peer_checked, error); + ExecCtx::Run(DEBUG_LOCATION, on_peer_checked, error); } int TlsServerSecurityConnector::cmp( @@ -573,11 +587,10 @@ int TlsServerSecurityConnector::cmp( } void TlsServerSecurityConnector::TlsServerCertificateWatcher:: - OnCertificatesChanged( - absl::optional<absl::string_view> root_certs, - absl::optional<grpc_core::PemKeyCertPairList> key_cert_pairs) { + OnCertificatesChanged(absl::optional<absl::string_view> root_certs, + absl::optional<PemKeyCertPairList> key_cert_pairs) { GPR_ASSERT(security_connector_ != nullptr); - grpc_core::MutexLock lock(&security_connector_->mu_); + MutexLock lock(&security_connector_->mu_); if (root_certs.has_value()) { security_connector_->pem_root_certs_ = root_certs; } @@ -604,16 +617,16 @@ void TlsServerSecurityConnector::TlsServerCertificateWatcher:: // TODO(ZhenLian): implement the logic to signal waiting handshakers once // BlockOnInitialCredentialHandshaker is implemented. void TlsServerSecurityConnector::TlsServerCertificateWatcher::OnError( - grpc_error* root_cert_error, grpc_error* identity_cert_error) { + grpc_error_handle root_cert_error, grpc_error_handle identity_cert_error) { if (root_cert_error != GRPC_ERROR_NONE) { gpr_log(GPR_ERROR, "TlsServerCertificateWatcher getting root_cert_error: %s", - grpc_error_string(root_cert_error)); + grpc_error_std_string(root_cert_error).c_str()); } if (identity_cert_error != GRPC_ERROR_NONE) { gpr_log(GPR_ERROR, "TlsServerCertificateWatcher getting identity_cert_error: %s", - grpc_error_string(identity_cert_error)); + grpc_error_std_string(identity_cert_error).c_str()); } GRPC_ERROR_UNREF(root_cert_error); GRPC_ERROR_UNREF(identity_cert_error); @@ -654,7 +667,8 @@ TlsServerSecurityConnector::UpdateHandshakerFactoryLocked() { namespace internal { -grpc_error* TlsCheckHostName(const char* peer_name, const tsi_peer* peer) { +grpc_error_handle TlsCheckHostName(const char* peer_name, + const tsi_peer* peer) { /* Check the peer name if specified. */ if (peer_name != nullptr && !grpc_ssl_host_matches_name(peer, peer_name)) { return GRPC_ERROR_CREATE_FROM_COPIED_STRING( diff --git a/grpc/src/core/lib/security/security_connector/tls/tls_security_connector.h b/grpc/src/core/lib/security/security_connector/tls/tls_security_connector.h index 453c5319..80c26954 100644 --- a/grpc/src/core/lib/security/security_connector/tls/tls_security_connector.h +++ b/grpc/src/core/lib/security/security_connector/tls/tls_security_connector.h @@ -35,18 +35,18 @@ class TlsChannelSecurityConnector final : public grpc_channel_security_connector { public: // static factory method to create a TLS channel security connector. - static grpc_core::RefCountedPtr<grpc_channel_security_connector> + static RefCountedPtr<grpc_channel_security_connector> CreateTlsChannelSecurityConnector( - grpc_core::RefCountedPtr<grpc_channel_credentials> channel_creds, - grpc_core::RefCountedPtr<grpc_tls_credentials_options> options, - grpc_core::RefCountedPtr<grpc_call_credentials> request_metadata_creds, + RefCountedPtr<grpc_channel_credentials> channel_creds, + RefCountedPtr<grpc_tls_credentials_options> options, + RefCountedPtr<grpc_call_credentials> request_metadata_creds, const char* target_name, const char* overridden_target_name, tsi_ssl_session_cache* ssl_session_cache); TlsChannelSecurityConnector( - grpc_core::RefCountedPtr<grpc_channel_credentials> channel_creds, - grpc_core::RefCountedPtr<grpc_tls_credentials_options> options, - grpc_core::RefCountedPtr<grpc_call_credentials> request_metadata_creds, + RefCountedPtr<grpc_channel_credentials> channel_creds, + RefCountedPtr<grpc_tls_credentials_options> options, + RefCountedPtr<grpc_call_credentials> request_metadata_creds, const char* target_name, const char* overridden_target_name, tsi_ssl_session_cache* ssl_session_cache); @@ -54,33 +54,39 @@ class TlsChannelSecurityConnector final void add_handshakers(const grpc_channel_args* args, grpc_pollset_set* interested_parties, - grpc_core::HandshakeManager* handshake_mgr) override; + HandshakeManager* handshake_mgr) override; void check_peer(tsi_peer peer, grpc_endpoint* ep, - grpc_core::RefCountedPtr<grpc_auth_context>* auth_context, + RefCountedPtr<grpc_auth_context>* auth_context, grpc_closure* on_peer_checked) override; + void cancel_check_peer(grpc_closure* /*on_peer_checked*/, + grpc_error_handle error) override { + // TODO(ZhenLian): call verifier->cancel() once the verifier is ready. + GRPC_ERROR_UNREF(error); + } + int cmp(const grpc_security_connector* other_sc) const override; bool check_call_host(absl::string_view host, grpc_auth_context* auth_context, grpc_closure* on_call_host_checked, - grpc_error** error) override; + grpc_error_handle* error) override; void cancel_check_call_host(grpc_closure* on_call_host_checked, - grpc_error* error) override; + grpc_error_handle error) override; tsi_ssl_client_handshaker_factory* ClientHandshakerFactoryForTesting() { - grpc_core::MutexLock lock(&mu_); + MutexLock lock(&mu_); return client_handshaker_factory_; }; absl::optional<absl::string_view> RootCertsForTesting() { - grpc_core::MutexLock lock(&mu_); + MutexLock lock(&mu_); return pem_root_certs_; } - absl::optional<grpc_core::PemKeyCertPairList> KeyCertPairListForTesting() { - grpc_core::MutexLock lock(&mu_); + absl::optional<PemKeyCertPairList> KeyCertPairListForTesting() { + MutexLock lock(&mu_); return pem_key_cert_pair_list_; } @@ -96,9 +102,9 @@ class TlsChannelSecurityConnector final : security_connector_(security_connector) {} void OnCertificatesChanged( absl::optional<absl::string_view> root_certs, - absl::optional<grpc_core::PemKeyCertPairList> key_cert_pairs) override; - void OnError(grpc_error* root_cert_error, - grpc_error* identity_cert_error) override; + absl::optional<PemKeyCertPairList> key_cert_pairs) override; + void OnError(grpc_error_handle root_cert_error, + grpc_error_handle identity_cert_error) override; private: TlsChannelSecurityConnector* security_connector_ = nullptr; @@ -106,7 +112,8 @@ class TlsChannelSecurityConnector final // Updates |client_handshaker_factory_| when the certificates that // |certificate_watcher_| is watching get updated. - grpc_security_status UpdateHandshakerFactoryLocked(); + grpc_security_status UpdateHandshakerFactoryLocked() + ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_); // gRPC-provided callback executed by application, which servers to bring the // control back to gRPC core. @@ -114,7 +121,7 @@ class TlsChannelSecurityConnector final grpc_tls_server_authorization_check_arg* arg); // A util function to process server authorization check result. - static grpc_error* ProcessServerAuthorizationCheckResult( + static grpc_error_handle ProcessServerAuthorizationCheckResult( grpc_tls_server_authorization_check_arg* arg); // A util function to create a server authorization check arg instance. @@ -125,57 +132,65 @@ class TlsChannelSecurityConnector final static void ServerAuthorizationCheckArgDestroy( grpc_tls_server_authorization_check_arg* arg); - grpc_core::Mutex mu_; - grpc_core::RefCountedPtr<grpc_tls_credentials_options> options_; + RefCountedPtr<grpc_tls_credentials_options> options_; grpc_tls_certificate_distributor::TlsCertificatesWatcherInterface* certificate_watcher_ = nullptr; grpc_closure* on_peer_checked_ = nullptr; std::string target_name_; std::string overridden_target_name_; - tsi_ssl_client_handshaker_factory* client_handshaker_factory_ = nullptr; grpc_tls_server_authorization_check_arg* check_arg_ = nullptr; - tsi_ssl_session_cache* ssl_session_cache_ = nullptr; - absl::optional<absl::string_view> pem_root_certs_; - absl::optional<grpc_core::PemKeyCertPairList> pem_key_cert_pair_list_; + + Mutex mu_; + tsi_ssl_client_handshaker_factory* client_handshaker_factory_ + ABSL_GUARDED_BY(mu_) = nullptr; + tsi_ssl_session_cache* ssl_session_cache_ ABSL_GUARDED_BY(mu_) = nullptr; + absl::optional<absl::string_view> pem_root_certs_ ABSL_GUARDED_BY(mu_); + absl::optional<PemKeyCertPairList> pem_key_cert_pair_list_ + ABSL_GUARDED_BY(mu_); }; // Server security connector using TLS as transport security protocol. class TlsServerSecurityConnector final : public grpc_server_security_connector { public: // static factory method to create a TLS server security connector. - static grpc_core::RefCountedPtr<grpc_server_security_connector> + static RefCountedPtr<grpc_server_security_connector> CreateTlsServerSecurityConnector( - grpc_core::RefCountedPtr<grpc_server_credentials> server_creds, - grpc_core::RefCountedPtr<grpc_tls_credentials_options> options); + RefCountedPtr<grpc_server_credentials> server_creds, + RefCountedPtr<grpc_tls_credentials_options> options); TlsServerSecurityConnector( - grpc_core::RefCountedPtr<grpc_server_credentials> server_creds, - grpc_core::RefCountedPtr<grpc_tls_credentials_options> options); + RefCountedPtr<grpc_server_credentials> server_creds, + RefCountedPtr<grpc_tls_credentials_options> options); ~TlsServerSecurityConnector() override; void add_handshakers(const grpc_channel_args* args, grpc_pollset_set* interested_parties, - grpc_core::HandshakeManager* handshake_mgr) override; + HandshakeManager* handshake_mgr) override; void check_peer(tsi_peer peer, grpc_endpoint* ep, - grpc_core::RefCountedPtr<grpc_auth_context>* auth_context, + RefCountedPtr<grpc_auth_context>* auth_context, grpc_closure* on_peer_checked) override; + void cancel_check_peer(grpc_closure* /*on_peer_checked*/, + grpc_error_handle error) override { + // TODO(ZhenLian): call verifier->cancel() once the verifier is ready. + GRPC_ERROR_UNREF(error); + } + int cmp(const grpc_security_connector* other) const override; tsi_ssl_server_handshaker_factory* ServerHandshakerFactoryForTesting() { - grpc_core::MutexLock lock(&mu_); + MutexLock lock(&mu_); return server_handshaker_factory_; }; const absl::optional<absl::string_view>& RootCertsForTesting() { - grpc_core::MutexLock lock(&mu_); + MutexLock lock(&mu_); return pem_root_certs_; } - const absl::optional<grpc_core::PemKeyCertPairList>& - KeyCertPairListForTesting() { - grpc_core::MutexLock lock(&mu_); + const absl::optional<PemKeyCertPairList>& KeyCertPairListForTesting() { + MutexLock lock(&mu_); return pem_key_cert_pair_list_; } @@ -191,9 +206,9 @@ class TlsServerSecurityConnector final : public grpc_server_security_connector { : security_connector_(security_connector) {} void OnCertificatesChanged( absl::optional<absl::string_view> root_certs, - absl::optional<grpc_core::PemKeyCertPairList> key_cert_pairs) override; - void OnError(grpc_error* root_cert_error, - grpc_error* identity_cert_error) override; + absl::optional<PemKeyCertPairList> key_cert_pairs) override; + void OnError(grpc_error_handle root_cert_error, + grpc_error_handle identity_cert_error) override; private: TlsServerSecurityConnector* security_connector_ = nullptr; @@ -201,16 +216,19 @@ class TlsServerSecurityConnector final : public grpc_server_security_connector { // Updates |server_handshaker_factory_| when the certificates that // |certificate_watcher_| is watching get updated. - grpc_security_status UpdateHandshakerFactoryLocked(); + grpc_security_status UpdateHandshakerFactoryLocked() + ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_); - grpc_core::Mutex mu_; - grpc_core::RefCountedPtr<grpc_tls_credentials_options> options_; + RefCountedPtr<grpc_tls_credentials_options> options_; grpc_tls_certificate_distributor::TlsCertificatesWatcherInterface* certificate_watcher_ = nullptr; - tsi_ssl_server_handshaker_factory* server_handshaker_factory_ = nullptr; - absl::optional<absl::string_view> pem_root_certs_; - absl::optional<grpc_core::PemKeyCertPairList> pem_key_cert_pair_list_; + Mutex mu_; + tsi_ssl_server_handshaker_factory* server_handshaker_factory_ + ABSL_GUARDED_BY(mu_) = nullptr; + absl::optional<absl::string_view> pem_root_certs_ ABSL_GUARDED_BY(mu_); + absl::optional<PemKeyCertPairList> pem_key_cert_pair_list_ + ABSL_GUARDED_BY(mu_); }; // ---- Functions below are exposed for testing only ----------------------- @@ -218,7 +236,7 @@ namespace internal { // TlsCheckHostName checks if |peer_name| matches the identity information // contained in |peer|. This is AKA hostname check. -grpc_error* TlsCheckHostName(const char* peer_name, const tsi_peer* peer); +grpc_error_handle TlsCheckHostName(const char* peer_name, const tsi_peer* peer); } // namespace internal diff --git a/grpc/src/core/lib/security/transport/client_auth_filter.cc b/grpc/src/core/lib/security/transport/client_auth_filter.cc index c155be81..babc90fb 100644 --- a/grpc/src/core/lib/security/transport/client_auth_filter.cc +++ b/grpc/src/core/lib/security/transport/client_auth_filter.cc @@ -146,7 +146,7 @@ void grpc_auth_metadata_context_reset( } } -static void add_error(grpc_error** combined, grpc_error* error) { +static void add_error(grpc_error_handle* combined, grpc_error_handle error) { if (error == GRPC_ERROR_NONE) return; if (*combined == GRPC_ERROR_NONE) { *combined = GRPC_ERROR_CREATE_FROM_STATIC_STRING( @@ -155,14 +155,14 @@ static void add_error(grpc_error** combined, grpc_error* error) { *combined = grpc_error_add_child(*combined, error); } -static void on_credentials_metadata(void* arg, grpc_error* input_error) { +static void on_credentials_metadata(void* arg, grpc_error_handle input_error) { grpc_transport_stream_op_batch* batch = static_cast<grpc_transport_stream_op_batch*>(arg); grpc_call_element* elem = static_cast<grpc_call_element*>(batch->handler_private.extra_arg); call_data* calld = static_cast<call_data*>(elem->call_data); grpc_auth_metadata_context_reset(&calld->auth_md_context); - grpc_error* error = GRPC_ERROR_REF(input_error); + grpc_error_handle error = GRPC_ERROR_REF(input_error); if (error == GRPC_ERROR_NONE) { GPR_ASSERT(calld->md_array.size <= MAX_CREDENTIALS_METADATA_COUNT); GPR_ASSERT(batch->send_initial_metadata); @@ -225,13 +225,14 @@ void grpc_auth_metadata_context_build( gpr_free(host_and_port); } -static void cancel_get_request_metadata(void* arg, grpc_error* error) { +static void cancel_get_request_metadata(void* arg, grpc_error_handle error) { grpc_call_element* elem = static_cast<grpc_call_element*>(arg); call_data* calld = static_cast<call_data*>(elem->call_data); if (error != GRPC_ERROR_NONE) { calld->creds->cancel_get_request_metadata(&calld->md_array, GRPC_ERROR_REF(error)); } + GRPC_CALL_STACK_UNREF(calld->owning_call, "cancel_get_request_metadata"); } static void send_security_metadata(grpc_call_element* elem, @@ -311,7 +312,7 @@ static void send_security_metadata(grpc_call_element* elem, GRPC_CALL_STACK_REF(calld->owning_call, "get_request_metadata"); GRPC_CLOSURE_INIT(&calld->async_result_closure, on_credentials_metadata, batch, grpc_schedule_on_exec_ctx); - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; if (calld->creds->get_request_metadata( calld->pollent, calld->auth_md_context, &calld->md_array, &calld->async_result_closure, &error)) { @@ -320,13 +321,16 @@ static void send_security_metadata(grpc_call_element* elem, GRPC_ERROR_UNREF(error); } else { // Async return; register cancellation closure with call combiner. + // TODO(yashykt): We would not need this ref if call combiners used + // Closure::Run() instead of ExecCtx::Run() + GRPC_CALL_STACK_REF(calld->owning_call, "cancel_get_request_metadata"); calld->call_combiner->SetNotifyOnCancel(GRPC_CLOSURE_INIT( &calld->get_request_metadata_cancel_closure, cancel_get_request_metadata, elem, grpc_schedule_on_exec_ctx)); } } -static void on_host_checked(void* arg, grpc_error* error) { +static void on_host_checked(void* arg, grpc_error_handle error) { grpc_transport_stream_op_batch* batch = static_cast<grpc_transport_stream_op_batch*>(arg); grpc_call_element* elem = @@ -348,7 +352,7 @@ static void on_host_checked(void* arg, grpc_error* error) { GRPC_CALL_STACK_UNREF(calld->owning_call, "check_call_host"); } -static void cancel_check_call_host(void* arg, grpc_error* error) { +static void cancel_check_call_host(void* arg, grpc_error_handle error) { grpc_call_element* elem = static_cast<grpc_call_element*>(arg); call_data* calld = static_cast<call_data*>(elem->call_data); channel_data* chand = static_cast<channel_data*>(elem->channel_data); @@ -356,6 +360,7 @@ static void cancel_check_call_host(void* arg, grpc_error* error) { chand->security_connector->cancel_check_call_host( &calld->async_result_closure, GRPC_ERROR_REF(error)); } + GRPC_CALL_STACK_UNREF(calld->owning_call, "cancel_check_call_host"); } static void client_auth_start_transport_stream_op_batch( @@ -381,7 +386,7 @@ static void client_auth_start_transport_stream_op_batch( GRPC_CLOSURE_INIT(&calld->async_result_closure, on_host_checked, batch, grpc_schedule_on_exec_ctx); absl::string_view call_host(grpc_core::StringViewFromSlice(calld->host)); - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; if (chand->security_connector->check_call_host( call_host, chand->auth_context.get(), &calld->async_result_closure, &error)) { @@ -390,6 +395,9 @@ static void client_auth_start_transport_stream_op_batch( GRPC_ERROR_UNREF(error); } else { // Async return; register cancellation closure with call combiner. + // TODO(yashykt): We would not need this ref if call combiners used + // Closure::Run() instead of ExecCtx::Run() + GRPC_CALL_STACK_REF(calld->owning_call, "cancel_check_call_host"); calld->call_combiner->SetNotifyOnCancel(GRPC_CLOSURE_INIT( &calld->check_call_host_cancel_closure, cancel_check_call_host, elem, grpc_schedule_on_exec_ctx)); @@ -403,7 +411,7 @@ static void client_auth_start_transport_stream_op_batch( } /* Constructor for call_data */ -static grpc_error* client_auth_init_call_elem( +static grpc_error_handle client_auth_init_call_elem( grpc_call_element* elem, const grpc_call_element_args* args) { new (elem->call_data) call_data(elem, *args); return GRPC_ERROR_NONE; @@ -424,7 +432,7 @@ static void client_auth_destroy_call_elem( } /* Constructor for channel_data */ -static grpc_error* client_auth_init_channel_elem( +static grpc_error_handle client_auth_init_channel_elem( grpc_channel_element* elem, grpc_channel_element_args* args) { /* The first and the last filters tend to be implemented differently to handle the case that there's no 'next' filter to call on the up or down diff --git a/grpc/src/core/lib/security/transport/secure_endpoint.cc b/grpc/src/core/lib/security/transport/secure_endpoint.cc index 7ab4d7b7..fc1fb7e8 100644 --- a/grpc/src/core/lib/security/transport/secure_endpoint.cc +++ b/grpc/src/core/lib/security/transport/secure_endpoint.cc @@ -43,7 +43,7 @@ #define STAGING_BUFFER_SIZE 8192 -static void on_read(void* user_data, grpc_error* error); +static void on_read(void* user_data, grpc_error_handle error); namespace { struct secure_endpoint { @@ -154,7 +154,7 @@ static void flush_read_staging_buffer(secure_endpoint* ep, uint8_t** cur, *end = GRPC_SLICE_END_PTR(ep->read_staging_buffer); } -static void call_read_cb(secure_endpoint* ep, grpc_error* error) { +static void call_read_cb(secure_endpoint* ep, grpc_error_handle error) { if (GRPC_TRACE_FLAG_ENABLED(grpc_trace_secure_endpoint)) { size_t i; for (i = 0; i < ep->read_buffer->count; i++) { @@ -169,7 +169,7 @@ static void call_read_cb(secure_endpoint* ep, grpc_error* error) { SECURE_ENDPOINT_UNREF(ep, "read"); } -static void on_read(void* user_data, grpc_error* error) { +static void on_read(void* user_data, grpc_error_handle error) { unsigned i; uint8_t keep_looping = 0; tsi_result result = TSI_OK; @@ -373,7 +373,7 @@ static void endpoint_write(grpc_endpoint* secure_ep, grpc_slice_buffer* slices, grpc_endpoint_write(ep->wrapped_ep, &ep->output_buffer, cb, arg); } -static void endpoint_shutdown(grpc_endpoint* secure_ep, grpc_error* why) { +static void endpoint_shutdown(grpc_endpoint* secure_ep, grpc_error_handle why) { secure_endpoint* ep = reinterpret_cast<secure_endpoint*>(secure_ep); grpc_endpoint_shutdown(ep->wrapped_ep, why); } diff --git a/grpc/src/core/lib/security/transport/security_handshaker.cc b/grpc/src/core/lib/security/transport/security_handshaker.cc index e7b98850..6d05c970 100644 --- a/grpc/src/core/lib/security/transport/security_handshaker.cc +++ b/grpc/src/core/lib/security/transport/security_handshaker.cc @@ -29,6 +29,7 @@ #include <grpc/support/log.h> #include "src/core/lib/channel/channel_args.h" +#include "src/core/lib/channel/channelz.h" #include "src/core/lib/channel/handshaker.h" #include "src/core/lib/channel/handshaker_registry.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" @@ -50,41 +51,42 @@ class SecurityHandshaker : public Handshaker { grpc_security_connector* connector, const grpc_channel_args* args); ~SecurityHandshaker() override; - void Shutdown(grpc_error* why) override; + void Shutdown(grpc_error_handle why) override; void DoHandshake(grpc_tcp_server_acceptor* acceptor, grpc_closure* on_handshake_done, HandshakerArgs* args) override; const char* name() const override { return "security"; } private: - grpc_error* DoHandshakerNextLocked(const unsigned char* bytes_received, - size_t bytes_received_size); + grpc_error_handle DoHandshakerNextLocked(const unsigned char* bytes_received, + size_t bytes_received_size); - grpc_error* OnHandshakeNextDoneLocked( + grpc_error_handle OnHandshakeNextDoneLocked( tsi_result result, const unsigned char* bytes_to_send, size_t bytes_to_send_size, tsi_handshaker_result* handshaker_result); - void HandshakeFailedLocked(grpc_error* error); + void HandshakeFailedLocked(grpc_error_handle error); void CleanupArgsForFailureLocked(); - static void OnHandshakeDataReceivedFromPeerFn(void* arg, grpc_error* error); - static void OnHandshakeDataSentToPeerFn(void* arg, grpc_error* error); - static void OnHandshakeDataReceivedFromPeerFnScheduler(void* arg, - grpc_error* error); + static void OnHandshakeDataReceivedFromPeerFn(void* arg, + grpc_error_handle error); + static void OnHandshakeDataSentToPeerFn(void* arg, grpc_error_handle error); + static void OnHandshakeDataReceivedFromPeerFnScheduler( + void* arg, grpc_error_handle error); static void OnHandshakeDataSentToPeerFnScheduler(void* arg, - grpc_error* error); + grpc_error_handle error); static void OnHandshakeNextDoneGrpcWrapper( tsi_result result, void* user_data, const unsigned char* bytes_to_send, size_t bytes_to_send_size, tsi_handshaker_result* handshaker_result); - static void OnPeerCheckedFn(void* arg, grpc_error* error); - void OnPeerCheckedInner(grpc_error* error); + static void OnPeerCheckedFn(void* arg, grpc_error_handle error); + void OnPeerCheckedInner(grpc_error_handle error); size_t MoveReadBufferIntoHandshakeBuffer(); - grpc_error* CheckPeerLocked(); + grpc_error_handle CheckPeerLocked(); // State set at creation time. tsi_handshaker* handshaker_; RefCountedPtr<grpc_security_connector> connector_; - gpr_mu mu_; + Mutex mu_; bool is_shutdown_ = false; // Endpoint and read buffer to destroy after a shutdown. @@ -120,14 +122,12 @@ SecurityHandshaker::SecurityHandshaker(tsi_handshaker* handshaker, max_frame_size_ = grpc_channel_arg_get_integer( arg, {0, 0, std::numeric_limits<int>::max()}); } - gpr_mu_init(&mu_); grpc_slice_buffer_init(&outgoing_); GRPC_CLOSURE_INIT(&on_peer_checked_, &SecurityHandshaker::OnPeerCheckedFn, this, grpc_schedule_on_exec_ctx); } SecurityHandshaker::~SecurityHandshaker() { - gpr_mu_destroy(&mu_); tsi_handshaker_destroy(handshaker_); tsi_handshaker_result_destroy(handshaker_result_); if (endpoint_to_destroy_ != nullptr) { @@ -174,15 +174,14 @@ void SecurityHandshaker::CleanupArgsForFailureLocked() { // If the handshake failed or we're shutting down, clean up and invoke the // callback with the error. -void SecurityHandshaker::HandshakeFailedLocked(grpc_error* error) { +void SecurityHandshaker::HandshakeFailedLocked(grpc_error_handle error) { if (error == GRPC_ERROR_NONE) { // If we were shut down after the handshake succeeded but before an // endpoint callback was invoked, we need to generate our own error. error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("Handshaker shutdown"); } - const char* msg = grpc_error_string(error); - gpr_log(GPR_DEBUG, "Security handshake failed: %s", msg); - + gpr_log(GPR_DEBUG, "Security handshake failed: %s", + grpc_error_std_string(error).c_str()); if (!is_shutdown_) { tsi_handshaker_shutdown(handshaker_); // TODO(ctiller): It is currently necessary to shutdown endpoints @@ -201,7 +200,32 @@ void SecurityHandshaker::HandshakeFailedLocked(grpc_error* error) { ExecCtx::Run(DEBUG_LOCATION, on_handshake_done_, error); } -void SecurityHandshaker::OnPeerCheckedInner(grpc_error* error) { +namespace { + +RefCountedPtr<channelz::SocketNode::Security> +MakeChannelzSecurityFromAuthContext(grpc_auth_context* auth_context) { + RefCountedPtr<channelz::SocketNode::Security> security = + MakeRefCounted<channelz::SocketNode::Security>(); + // TODO(yashykt): Currently, we are assuming TLS by default and are only able + // to fill in the remote certificate but we should ideally be able to fill in + // other fields in + // https://github.com/grpc/grpc/blob/fcd43e90304862a823316b224ee733d17a8cfd90/src/proto/grpc/channelz/channelz.proto#L326 + // from grpc_auth_context. + security->type = channelz::SocketNode::Security::ModelType::kTls; + security->tls = absl::make_optional<channelz::SocketNode::Security::Tls>(); + grpc_auth_property_iterator it = grpc_auth_context_find_properties_by_name( + auth_context, GRPC_X509_PEM_CERT_PROPERTY_NAME); + const grpc_auth_property* prop = grpc_auth_property_iterator_next(&it); + if (prop != nullptr) { + security->tls->remote_certificate = + std::string(prop->value, prop->value_length); + } + return security; +} + +} // namespace + +void SecurityHandshaker::OnPeerCheckedInner(grpc_error_handle error) { MutexLock lock(&mu_); if (error != GRPC_ERROR_NONE || is_shutdown_) { HandshakeFailedLocked(error); @@ -253,9 +277,13 @@ void SecurityHandshaker::OnPeerCheckedInner(grpc_error* error) { tsi_handshaker_result_destroy(handshaker_result_); handshaker_result_ = nullptr; // Add auth context to channel args. - grpc_arg auth_context_arg = grpc_auth_context_to_arg(auth_context_.get()); + absl::InlinedVector<grpc_arg, 2> args_to_add; + args_to_add.push_back(grpc_auth_context_to_arg(auth_context_.get())); + auto security = MakeChannelzSecurityFromAuthContext(auth_context_.get()); + args_to_add.push_back(security->MakeChannelArg()); grpc_channel_args* tmp_args = args_->args; - args_->args = grpc_channel_args_copy_and_add(tmp_args, &auth_context_arg, 1); + args_->args = grpc_channel_args_copy_and_add(tmp_args, args_to_add.data(), + args_to_add.size()); grpc_channel_args_destroy(tmp_args); // Invoke callback. ExecCtx::Run(DEBUG_LOCATION, on_handshake_done_, GRPC_ERROR_NONE); @@ -264,12 +292,12 @@ void SecurityHandshaker::OnPeerCheckedInner(grpc_error* error) { is_shutdown_ = true; } -void SecurityHandshaker::OnPeerCheckedFn(void* arg, grpc_error* error) { +void SecurityHandshaker::OnPeerCheckedFn(void* arg, grpc_error_handle error) { RefCountedPtr<SecurityHandshaker>(static_cast<SecurityHandshaker*>(arg)) ->OnPeerCheckedInner(GRPC_ERROR_REF(error)); } -grpc_error* SecurityHandshaker::CheckPeerLocked() { +grpc_error_handle SecurityHandshaker::CheckPeerLocked() { tsi_peer peer; tsi_result result = tsi_handshaker_result_extract_peer(handshaker_result_, &peer); @@ -282,10 +310,10 @@ grpc_error* SecurityHandshaker::CheckPeerLocked() { return GRPC_ERROR_NONE; } -grpc_error* SecurityHandshaker::OnHandshakeNextDoneLocked( +grpc_error_handle SecurityHandshaker::OnHandshakeNextDoneLocked( tsi_result result, const unsigned char* bytes_to_send, size_t bytes_to_send_size, tsi_handshaker_result* handshaker_result) { - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; // Handshaker was shutdown. if (is_shutdown_) { return GRPC_ERROR_CREATE_FROM_STATIC_STRING("Handshaker shutdown"); @@ -346,7 +374,7 @@ void SecurityHandshaker::OnHandshakeNextDoneGrpcWrapper( RefCountedPtr<SecurityHandshaker> h( static_cast<SecurityHandshaker*>(user_data)); MutexLock lock(&h->mu_); - grpc_error* error = h->OnHandshakeNextDoneLocked( + grpc_error_handle error = h->OnHandshakeNextDoneLocked( result, bytes_to_send, bytes_to_send_size, handshaker_result); if (error != GRPC_ERROR_NONE) { h->HandshakeFailedLocked(error); @@ -355,7 +383,7 @@ void SecurityHandshaker::OnHandshakeNextDoneGrpcWrapper( } } -grpc_error* SecurityHandshaker::DoHandshakerNextLocked( +grpc_error_handle SecurityHandshaker::DoHandshakerNextLocked( const unsigned char* bytes_received, size_t bytes_received_size) { // Invoke TSI handshaker. const unsigned char* bytes_to_send = nullptr; @@ -378,7 +406,7 @@ grpc_error* SecurityHandshaker::DoHandshakerNextLocked( // This callback might be run inline while we are still holding on to the mutex, // so schedule OnHandshakeDataReceivedFromPeerFn on ExecCtx to avoid a deadlock. void SecurityHandshaker::OnHandshakeDataReceivedFromPeerFnScheduler( - void* arg, grpc_error* error) { + void* arg, grpc_error_handle error) { SecurityHandshaker* h = static_cast<SecurityHandshaker*>(arg); grpc_core::ExecCtx::Run( DEBUG_LOCATION, @@ -388,8 +416,8 @@ void SecurityHandshaker::OnHandshakeDataReceivedFromPeerFnScheduler( GRPC_ERROR_REF(error)); } -void SecurityHandshaker::OnHandshakeDataReceivedFromPeerFn(void* arg, - grpc_error* error) { +void SecurityHandshaker::OnHandshakeDataReceivedFromPeerFn( + void* arg, grpc_error_handle error) { RefCountedPtr<SecurityHandshaker> h(static_cast<SecurityHandshaker*>(arg)); MutexLock lock(&h->mu_); if (error != GRPC_ERROR_NONE || h->is_shutdown_) { @@ -412,7 +440,7 @@ void SecurityHandshaker::OnHandshakeDataReceivedFromPeerFn(void* arg, // This callback might be run inline while we are still holding on to the mutex, // so schedule OnHandshakeDataSentToPeerFn on ExecCtx to avoid a deadlock. void SecurityHandshaker::OnHandshakeDataSentToPeerFnScheduler( - void* arg, grpc_error* error) { + void* arg, grpc_error_handle error) { SecurityHandshaker* h = static_cast<SecurityHandshaker*>(arg); grpc_core::ExecCtx::Run( DEBUG_LOCATION, @@ -423,7 +451,7 @@ void SecurityHandshaker::OnHandshakeDataSentToPeerFnScheduler( } void SecurityHandshaker::OnHandshakeDataSentToPeerFn(void* arg, - grpc_error* error) { + grpc_error_handle error) { RefCountedPtr<SecurityHandshaker> h(static_cast<SecurityHandshaker*>(arg)); MutexLock lock(&h->mu_); if (error != GRPC_ERROR_NONE || h->is_shutdown_) { @@ -454,10 +482,11 @@ void SecurityHandshaker::OnHandshakeDataSentToPeerFn(void* arg, // public handshaker API // -void SecurityHandshaker::Shutdown(grpc_error* why) { +void SecurityHandshaker::Shutdown(grpc_error_handle why) { MutexLock lock(&mu_); if (!is_shutdown_) { is_shutdown_ = true; + connector_->cancel_check_peer(&on_peer_checked_, GRPC_ERROR_REF(why)); tsi_handshaker_shutdown(handshaker_); grpc_endpoint_shutdown(args_->endpoint, GRPC_ERROR_REF(why)); CleanupArgsForFailureLocked(); @@ -473,7 +502,7 @@ void SecurityHandshaker::DoHandshake(grpc_tcp_server_acceptor* /*acceptor*/, args_ = args; on_handshake_done_ = on_handshake_done; size_t bytes_received_size = MoveReadBufferIntoHandshakeBuffer(); - grpc_error* error = + grpc_error_handle error = DoHandshakerNextLocked(handshake_buffer_, bytes_received_size); if (error != GRPC_ERROR_NONE) { HandshakeFailedLocked(error); @@ -489,7 +518,7 @@ void SecurityHandshaker::DoHandshake(grpc_tcp_server_acceptor* /*acceptor*/, class FailHandshaker : public Handshaker { public: const char* name() const override { return "security_fail"; } - void Shutdown(grpc_error* why) override { GRPC_ERROR_UNREF(why); } + void Shutdown(grpc_error_handle why) override { GRPC_ERROR_UNREF(why); } void DoHandshake(grpc_tcp_server_acceptor* /*acceptor*/, grpc_closure* on_handshake_done, HandshakerArgs* /*args*/) override { diff --git a/grpc/src/core/lib/security/transport/server_auth_filter.cc b/grpc/src/core/lib/security/transport/server_auth_filter.cc index 67351892..65a7e405 100644 --- a/grpc/src/core/lib/security/transport/server_auth_filter.cc +++ b/grpc/src/core/lib/security/transport/server_auth_filter.cc @@ -28,8 +28,9 @@ #include "src/core/lib/security/transport/auth_filters.h" #include "src/core/lib/slice/slice_internal.h" -static void recv_initial_metadata_ready(void* arg, grpc_error* error); -static void recv_trailing_metadata_ready(void* user_data, grpc_error* error); +static void recv_initial_metadata_ready(void* arg, grpc_error_handle error); +static void recv_trailing_metadata_ready(void* user_data, + grpc_error_handle error); namespace { enum async_state { @@ -79,10 +80,10 @@ struct call_data { grpc_transport_stream_op_batch* recv_initial_metadata_batch; grpc_closure* original_recv_initial_metadata_ready; grpc_closure recv_initial_metadata_ready; - grpc_error* recv_initial_metadata_error = GRPC_ERROR_NONE; + grpc_error_handle recv_initial_metadata_error = GRPC_ERROR_NONE; grpc_closure recv_trailing_metadata_ready; grpc_closure* original_recv_trailing_metadata_ready; - grpc_error* recv_trailing_metadata_error; + grpc_error_handle recv_trailing_metadata_error; bool seen_recv_trailing_metadata_ready = false; grpc_metadata_array md; const grpc_metadata* consumed_md; @@ -135,7 +136,7 @@ static void on_md_processing_done_inner(grpc_call_element* elem, size_t num_consumed_md, const grpc_metadata* response_md, size_t num_response_md, - grpc_error* error) { + grpc_error_handle error) { call_data* calld = static_cast<call_data*>(elem->call_data); grpc_transport_stream_op_batch* batch = calld->recv_initial_metadata_batch; /* TODO(jboeuf): Implement support for response_md. */ @@ -175,7 +176,7 @@ static void on_md_processing_done( // If the call was not cancelled while we were in flight, process the result. if (gpr_atm_full_cas(&calld->state, static_cast<gpr_atm>(STATE_INIT), static_cast<gpr_atm>(STATE_DONE))) { - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; if (status != GRPC_STATUS_OK) { if (error_details == nullptr) { error_details = "Authentication metadata processing failed."; @@ -196,7 +197,7 @@ static void on_md_processing_done( GRPC_CALL_STACK_UNREF(calld->owning_call, "server_auth_metadata"); } -static void cancel_call(void* arg, grpc_error* error) { +static void cancel_call(void* arg, grpc_error_handle error) { grpc_call_element* elem = static_cast<grpc_call_element*>(arg); call_data* calld = static_cast<call_data*>(elem->call_data); // If the result was not already processed, invoke the callback now. @@ -206,9 +207,10 @@ static void cancel_call(void* arg, grpc_error* error) { on_md_processing_done_inner(elem, nullptr, 0, nullptr, 0, GRPC_ERROR_REF(error)); } + GRPC_CALL_STACK_UNREF(calld->owning_call, "cancel_call"); } -static void recv_initial_metadata_ready(void* arg, grpc_error* error) { +static void recv_initial_metadata_ready(void* arg, grpc_error_handle error) { grpc_call_element* elem = static_cast<grpc_call_element*>(arg); channel_data* chand = static_cast<channel_data*>(elem->channel_data); call_data* calld = static_cast<call_data*>(elem->call_data); @@ -218,6 +220,9 @@ static void recv_initial_metadata_ready(void* arg, grpc_error* error) { chand->creds->auth_metadata_processor().process != nullptr) { // We're calling out to the application, so we need to make sure // to drop the call combiner early if we get cancelled. + // TODO(yashykt): We would not need this ref if call combiners used + // Closure::Run() instead of ExecCtx::Run() + GRPC_CALL_STACK_REF(calld->owning_call, "cancel_call"); GRPC_CLOSURE_INIT(&calld->cancel_closure, cancel_call, elem, grpc_schedule_on_exec_ctx); calld->call_combiner->SetNotifyOnCancel(&calld->cancel_closure); @@ -242,7 +247,8 @@ static void recv_initial_metadata_ready(void* arg, grpc_error* error) { grpc_core::Closure::Run(DEBUG_LOCATION, closure, GRPC_ERROR_REF(error)); } -static void recv_trailing_metadata_ready(void* user_data, grpc_error* err) { +static void recv_trailing_metadata_ready(void* user_data, + grpc_error_handle err) { grpc_call_element* elem = static_cast<grpc_call_element*>(user_data); call_data* calld = static_cast<call_data*>(elem->call_data); if (calld->original_recv_initial_metadata_ready != nullptr) { @@ -280,7 +286,7 @@ static void server_auth_start_transport_stream_op_batch( } /* Constructor for call_data */ -static grpc_error* server_auth_init_call_elem( +static grpc_error_handle server_auth_init_call_elem( grpc_call_element* elem, const grpc_call_element_args* args) { new (elem->call_data) call_data(elem, *args); return GRPC_ERROR_NONE; @@ -295,11 +301,18 @@ static void server_auth_destroy_call_elem( } /* Constructor for channel_data */ -static grpc_error* server_auth_init_channel_elem( +static grpc_error_handle server_auth_init_channel_elem( grpc_channel_element* elem, grpc_channel_element_args* args) { GPR_ASSERT(!args->is_last); grpc_auth_context* auth_context = grpc_find_auth_context_in_args(args->channel_args); + if (auth_context == nullptr) { + grpc_error_handle error = GRPC_ERROR_CREATE_FROM_STATIC_STRING( + "No authorization context found. This might be a TRANSIENT failure due " + "to certificates not having been loaded yet."); + gpr_log(GPR_DEBUG, "%s", grpc_error_std_string(error).c_str()); + return error; + } GPR_ASSERT(auth_context != nullptr); grpc_server_credentials* creds = grpc_find_server_credentials_in_args(args->channel_args); diff --git a/grpc/src/core/lib/security/transport/tsi_error.cc b/grpc/src/core/lib/security/transport/tsi_error.cc index f78bb8df..4d337b46 100644 --- a/grpc/src/core/lib/security/transport/tsi_error.cc +++ b/grpc/src/core/lib/security/transport/tsi_error.cc @@ -20,7 +20,8 @@ #include "src/core/lib/security/transport/tsi_error.h" -grpc_error* grpc_set_tsi_error_result(grpc_error* error, tsi_result result) { +grpc_error_handle grpc_set_tsi_error_result(grpc_error_handle error, + tsi_result result) { return grpc_error_set_int( grpc_error_set_str( error, GRPC_ERROR_STR_TSI_ERROR, diff --git a/grpc/src/core/lib/security/transport/tsi_error.h b/grpc/src/core/lib/security/transport/tsi_error.h index 16e04f70..26b8806d 100644 --- a/grpc/src/core/lib/security/transport/tsi_error.h +++ b/grpc/src/core/lib/security/transport/tsi_error.h @@ -24,6 +24,7 @@ #include "src/core/lib/iomgr/error.h" #include "src/core/tsi/transport_security_interface.h" -grpc_error* grpc_set_tsi_error_result(grpc_error* error, tsi_result result); +grpc_error_handle grpc_set_tsi_error_result(grpc_error_handle error, + tsi_result result); #endif /* GRPC_CORE_LIB_SECURITY_TRANSPORT_TSI_ERROR_H */ diff --git a/grpc/src/core/lib/security/util/json_util.cc b/grpc/src/core/lib/security/util/json_util.cc index ff2fbc80..34bf88f4 100644 --- a/grpc/src/core/lib/security/util/json_util.cc +++ b/grpc/src/core/lib/security/util/json_util.cc @@ -30,7 +30,7 @@ const char* grpc_json_get_string_property(const grpc_core::Json& json, const char* prop_name, - grpc_error** error) { + grpc_error_handle* error) { if (json.type() != grpc_core::Json::Type::OBJECT) { if (error != nullptr) { *error = @@ -62,7 +62,7 @@ const char* grpc_json_get_string_property(const grpc_core::Json& json, bool grpc_copy_json_string_property(const grpc_core::Json& json, const char* prop_name, char** copied_value) { - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; const char* prop_value = grpc_json_get_string_property(json, prop_name, &error); GRPC_LOG_IF_ERROR("Could not copy JSON property", error); diff --git a/grpc/src/core/lib/security/util/json_util.h b/grpc/src/core/lib/security/util/json_util.h index cde9ca97..d3c6ec31 100644 --- a/grpc/src/core/lib/security/util/json_util.h +++ b/grpc/src/core/lib/security/util/json_util.h @@ -35,7 +35,7 @@ // Gets a child property from a json node. const char* grpc_json_get_string_property(const grpc_core::Json& json, const char* prop_name, - grpc_error** error); + grpc_error_handle* error); // Copies the value of the json child property specified by prop_name. // Returns false if the property was not found. diff --git a/grpc/src/core/lib/slice/slice_intern.cc b/grpc/src/core/lib/slice/slice_intern.cc index 6e03f480..04681304 100644 --- a/grpc/src/core/lib/slice/slice_intern.cc +++ b/grpc/src/core/lib/slice/slice_intern.cc @@ -44,13 +44,13 @@ using grpc_core::InternedSliceRefcount; typedef struct slice_shard { - gpr_mu mu; + grpc_core::Mutex mu; InternedSliceRefcount** strs; size_t count; size_t capacity; } slice_shard; -static slice_shard g_shards[SHARD_COUNT]; +static slice_shard* g_shards; struct static_metadata_hash_ent { uint32_t hash; @@ -259,13 +259,12 @@ template <typename SliceArgs> static InternedSliceRefcount* FindOrCreateInternedSlice(uint32_t hash, const SliceArgs& args) { slice_shard* shard = &g_shards[SHARD_IDX(hash)]; - gpr_mu_lock(&shard->mu); + grpc_core::MutexLock lock(&shard->mu); const size_t idx = TABLE_IDX(hash, shard->capacity); InternedSliceRefcount* s = MatchInternedSliceLocked(hash, idx, args); if (s == nullptr) { s = InternNewStringLocked(shard, idx, hash, args); } - gpr_mu_unlock(&shard->mu); return s; } @@ -312,9 +311,9 @@ void grpc_slice_intern_init(void) { grpc_core::g_hash_seed = static_cast<uint32_t>(gpr_now(GPR_CLOCK_REALTIME).tv_nsec); } + g_shards = new slice_shard[SHARD_COUNT]; for (size_t i = 0; i < SHARD_COUNT; i++) { slice_shard* shard = &g_shards[i]; - gpr_mu_init(&shard->mu); shard->count = 0; shard->capacity = INITIAL_SHARD_CAPACITY; shard->strs = static_cast<InternedSliceRefcount**>( @@ -352,7 +351,6 @@ void grpc_slice_intern_init(void) { void grpc_slice_intern_shutdown(void) { for (size_t i = 0; i < SHARD_COUNT; i++) { slice_shard* shard = &g_shards[i]; - gpr_mu_destroy(&shard->mu); /* TODO(ctiller): GPR_ASSERT(shard->count == 0); */ if (shard->count != 0) { gpr_log(GPR_DEBUG, "WARNING: %" PRIuPTR " metadata strings were leaked", @@ -371,4 +369,5 @@ void grpc_slice_intern_shutdown(void) { } gpr_free(shard->strs); } + delete[] g_shards; } diff --git a/grpc/src/core/lib/surface/call.cc b/grpc/src/core/lib/surface/call.cc index d749d396..ac0854c2 100644 --- a/grpc/src/core/lib/surface/call.cc +++ b/grpc/src/core/lib/surface/call.cc @@ -290,14 +290,15 @@ static void execute_batch(grpc_call* call, static void cancel_with_status(grpc_call* c, grpc_status_code status, const char* description); -static void cancel_with_error(grpc_call* c, grpc_error* error); -static void destroy_call(void* call_stack, grpc_error* error); -static void receiving_slice_ready(void* bctlp, grpc_error* error); -static void set_final_status(grpc_call* call, grpc_error* error); +static void cancel_with_error(grpc_call* c, grpc_error_handle error); +static void destroy_call(void* call_stack, grpc_error_handle error); +static void receiving_slice_ready(void* bctlp, grpc_error_handle error); +static void set_final_status(grpc_call* call, grpc_error_handle error); static void process_data_after_md(batch_control* bctl); static void post_batch_completion(batch_control* bctl); -static void add_init_error(grpc_error** composite, grpc_error* new_err) { +static void add_init_error(grpc_error_handle* composite, + grpc_error_handle new_err) { if (new_err == GRPC_ERROR_NONE) return; if (*composite == GRPC_ERROR_NONE) { *composite = GRPC_ERROR_CREATE_FROM_STATIC_STRING("Call creation failed"); @@ -335,15 +336,15 @@ size_t grpc_call_get_initial_size_estimate() { sizeof(grpc_linked_mdelem) * ESTIMATED_MDELEM_COUNT; } -grpc_error* grpc_call_create(const grpc_call_create_args* args, - grpc_call** out_call) { +grpc_error_handle grpc_call_create(const grpc_call_create_args* args, + grpc_call** out_call) { GPR_TIMER_SCOPE("grpc_call_create", 0); GRPC_CHANNEL_INTERNAL_REF(args->channel, "call"); grpc_core::Arena* arena; grpc_call* call; - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; grpc_channel_stack* channel_stack = grpc_channel_get_channel_stack(args->channel); size_t initial_size = grpc_channel_get_call_size_estimate(args->channel); @@ -524,7 +525,7 @@ void grpc_call_internal_unref(grpc_call* c REF_ARG) { GRPC_CALL_STACK_UNREF(CALL_STACK_FROM_CALL(c), REF_REASON); } -static void release_call(void* call, grpc_error* /*error*/) { +static void release_call(void* call, grpc_error_handle /*error*/) { grpc_call* c = static_cast<grpc_call*>(call); grpc_channel* channel = c->channel; grpc_core::Arena* arena = c->arena; @@ -533,7 +534,7 @@ static void release_call(void* call, grpc_error* /*error*/) { GRPC_CHANNEL_INTERNAL_UNREF(channel, "call"); } -static void destroy_call(void* call, grpc_error* /*error*/) { +static void destroy_call(void* call, grpc_error_handle /*error*/) { GPR_TIMER_SCOPE("destroy_call", 0); size_t i; int ii; @@ -559,8 +560,8 @@ static void destroy_call(void* call, grpc_error* /*error*/) { GRPC_CQ_INTERNAL_UNREF(c->cq, "bind"); } - grpc_error* status_error = - reinterpret_cast<grpc_error*>(gpr_atm_acq_load(&c->status_error)); + grpc_error_handle status_error = + reinterpret_cast<grpc_error_handle>(gpr_atm_acq_load(&c->status_error)); grpc_error_get_status(status_error, c->send_deadline, &c->final_info.final_status, nullptr, nullptr, &(c->final_info.error_string)); @@ -610,11 +611,8 @@ void grpc_call_unref(grpc_call* c) { // Unset the call combiner cancellation closure. This has the // effect of scheduling the previously set cancellation closure, if // any, so that it can release any internal references it may be - // holding to the call stack. Also flush the closures on exec_ctx so that - // filters that schedule cancel notification closures on exec_ctx do not - // need to take a ref of the call stack to guarantee closure liveness. + // holding to the call stack. c->call_combiner.SetNotifyOnCancel(nullptr); - grpc_core::ExecCtx::Get()->Flush(); } GRPC_CALL_INTERNAL_UNREF(c, "destroy"); } @@ -630,7 +628,8 @@ grpc_call_error grpc_call_cancel(grpc_call* call, void* reserved) { // This is called via the call combiner to start sending a batch down // the filter stack. -static void execute_batch_in_call_combiner(void* arg, grpc_error* /*ignored*/) { +static void execute_batch_in_call_combiner(void* arg, + grpc_error_handle /*ignored*/) { GPR_TIMER_SCOPE("execute_batch_in_call_combiner", 0); grpc_transport_stream_op_batch* batch = static_cast<grpc_transport_stream_op_batch*>(arg); @@ -691,7 +690,7 @@ struct cancel_state { }; // The on_complete callback used when sending a cancel_stream batch down // the filter stack. Yields the call combiner when the batch is done. -static void done_termination(void* arg, grpc_error* /*error*/) { +static void done_termination(void* arg, grpc_error_handle /*error*/) { cancel_state* state = static_cast<cancel_state*>(arg); GRPC_CALL_COMBINER_STOP(&state->call->call_combiner, "on_complete for cancel_stream op"); @@ -699,7 +698,7 @@ static void done_termination(void* arg, grpc_error* /*error*/) { gpr_free(state); } -static void cancel_with_error(grpc_call* c, grpc_error* error) { +static void cancel_with_error(grpc_call* c, grpc_error_handle error) { if (!gpr_atm_rel_cas(&c->cancelled_with_error, 0, 1)) { GRPC_ERROR_UNREF(error); return; @@ -725,8 +724,8 @@ void grpc_call_cancel_internal(grpc_call* call) { cancel_with_error(call, GRPC_ERROR_CANCELLED); } -static grpc_error* error_from_status(grpc_status_code status, - const char* description) { +static grpc_error_handle error_from_status(grpc_status_code status, + const char* description) { // copying 'description' is needed to ensure the grpc_call_cancel_with_status // guarantee that can be short-lived. return grpc_error_set_int( @@ -741,10 +740,10 @@ static void cancel_with_status(grpc_call* c, grpc_status_code status, cancel_with_error(c, error_from_status(status, description)); } -static void set_final_status(grpc_call* call, grpc_error* error) { +static void set_final_status(grpc_call* call, grpc_error_handle error) { if (GRPC_TRACE_FLAG_ENABLED(grpc_call_error_trace)) { gpr_log(GPR_DEBUG, "set_final_status %s", call->is_client ? "CLI" : "SVR"); - gpr_log(GPR_DEBUG, "%s", grpc_error_string(error)); + gpr_log(GPR_DEBUG, "%s", grpc_error_std_string(error).c_str()); } if (call->is_client) { grpc_error_get_status(error, call->send_deadline, @@ -770,7 +769,7 @@ static void set_final_status(grpc_call* call, grpc_error* error) { call->final_op.server.core_server->channelz_node(); if (channelz_node != nullptr) { if (*call->final_op.server.cancelled || - reinterpret_cast<grpc_error*>( + reinterpret_cast<grpc_error_handle>( gpr_atm_acq_load(&call->status_error)) != GRPC_ERROR_NONE) { channelz_node->RecordCallFailed(); } else { @@ -952,7 +951,7 @@ static int prepare_application_metadata(grpc_call* call, int count, for (i = 0; i < total_count; i++) { grpc_metadata* md = get_md_elem(metadata, additional_metadata, i, count); grpc_linked_mdelem* l = linked_from_md(md); - grpc_error* error = grpc_metadata_batch_link_tail(batch, l); + grpc_error_handle error = grpc_metadata_batch_link_tail(batch, l); if (error != GRPC_ERROR_NONE) { GRPC_MDELEM_UNREF(l->md); } @@ -1053,14 +1052,14 @@ static void recv_initial_filter(grpc_call* call, grpc_metadata_batch* b) { } static void recv_trailing_filter(void* args, grpc_metadata_batch* b, - grpc_error* batch_error) { + grpc_error_handle batch_error) { grpc_call* call = static_cast<grpc_call*>(args); if (batch_error != GRPC_ERROR_NONE) { set_final_status(call, batch_error); } else if (b->idx.named.grpc_status != nullptr) { grpc_status_code status_code = grpc_get_status_code_from_metadata(b->idx.named.grpc_status->md); - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; if (status_code != GRPC_STATUS_OK) { char* peer = grpc_call_get_peer(call); error = grpc_error_set_int( @@ -1171,8 +1170,8 @@ static void finish_batch_completion(void* user_data, } static void reset_batch_errors(batch_control* bctl) { - GRPC_ERROR_UNREF( - reinterpret_cast<grpc_error*>(gpr_atm_acq_load(&bctl->batch_error))); + GRPC_ERROR_UNREF(reinterpret_cast<grpc_error_handle>( + gpr_atm_acq_load(&bctl->batch_error))); gpr_atm_rel_store(&bctl->batch_error, reinterpret_cast<gpr_atm>(GRPC_ERROR_NONE)); } @@ -1180,8 +1179,8 @@ static void reset_batch_errors(batch_control* bctl) { static void post_batch_completion(batch_control* bctl) { grpc_call* next_child_call; grpc_call* call = bctl->call; - grpc_error* error = GRPC_ERROR_REF( - reinterpret_cast<grpc_error*>(gpr_atm_acq_load(&bctl->batch_error))); + grpc_error_handle error = GRPC_ERROR_REF(reinterpret_cast<grpc_error_handle>( + gpr_atm_acq_load(&bctl->batch_error))); if (bctl->op.send_initial_metadata) { grpc_metadata_batch_destroy( @@ -1254,7 +1253,7 @@ static void finish_batch_step(batch_control* bctl) { } static void continue_receiving_slices(batch_control* bctl) { - grpc_error* error; + grpc_error_handle error; grpc_call* call = bctl->call; for (;;) { size_t remaining = call->receiving_stream->length() - @@ -1285,7 +1284,7 @@ static void continue_receiving_slices(batch_control* bctl) { } } -static void receiving_slice_ready(void* bctlp, grpc_error* error) { +static void receiving_slice_ready(void* bctlp, grpc_error_handle error) { batch_control* bctl = static_cast<batch_control*>(bctlp); grpc_call* call = bctl->call; bool release_error = false; @@ -1345,13 +1344,13 @@ static void process_data_after_md(batch_control* bctl) { } } -static void receiving_stream_ready(void* bctlp, grpc_error* error) { +static void receiving_stream_ready(void* bctlp, grpc_error_handle error) { batch_control* bctl = static_cast<batch_control*>(bctlp); grpc_call* call = bctl->call; if (error != GRPC_ERROR_NONE) { call->receiving_stream.reset(); - if (reinterpret_cast<grpc_error*>(gpr_atm_acq_load(&bctl->batch_error)) == - GRPC_ERROR_NONE) { + if (reinterpret_cast<grpc_error_handle>( + gpr_atm_acq_load(&bctl->batch_error)) == GRPC_ERROR_NONE) { gpr_atm_rel_store(&bctl->batch_error, reinterpret_cast<gpr_atm>(GRPC_ERROR_REF(error))); } @@ -1371,7 +1370,7 @@ static void receiving_stream_ready(void* bctlp, grpc_error* error) { // a recv_message op down the filter stack. Yields the call combiner // before processing the received message. static void receiving_stream_ready_in_call_combiner(void* bctlp, - grpc_error* error) { + grpc_error_handle error) { batch_control* bctl = static_cast<batch_control*>(bctlp); grpc_call* call = bctl->call; GRPC_CALL_COMBINER_STOP(&call->call_combiner, "recv_message_ready"); @@ -1464,7 +1463,8 @@ static void validate_filtered_metadata(batch_control* bctl) { } } -static void receiving_initial_metadata_ready(void* bctlp, grpc_error* error) { +static void receiving_initial_metadata_ready(void* bctlp, + grpc_error_handle error) { batch_control* bctl = static_cast<batch_control*>(bctlp); grpc_call* call = bctl->call; @@ -1483,8 +1483,8 @@ static void receiving_initial_metadata_ready(void* bctlp, grpc_error* error) { call->send_deadline = md->deadline; } } else { - if (reinterpret_cast<grpc_error*>(gpr_atm_acq_load(&bctl->batch_error)) == - GRPC_ERROR_NONE) { + if (reinterpret_cast<grpc_error_handle>( + gpr_atm_acq_load(&bctl->batch_error)) == GRPC_ERROR_NONE) { gpr_atm_rel_store(&bctl->batch_error, reinterpret_cast<gpr_atm>(GRPC_ERROR_REF(error))); } @@ -1523,7 +1523,8 @@ static void receiving_initial_metadata_ready(void* bctlp, grpc_error* error) { finish_batch_step(bctl); } -static void receiving_trailing_metadata_ready(void* bctlp, grpc_error* error) { +static void receiving_trailing_metadata_ready(void* bctlp, + grpc_error_handle error) { batch_control* bctl = static_cast<batch_control*>(bctlp); grpc_call* call = bctl->call; GRPC_CALL_COMBINER_STOP(&call->call_combiner, "recv_trailing_metadata_ready"); @@ -1533,12 +1534,12 @@ static void receiving_trailing_metadata_ready(void* bctlp, grpc_error* error) { finish_batch_step(bctl); } -static void finish_batch(void* bctlp, grpc_error* error) { +static void finish_batch(void* bctlp, grpc_error_handle error) { batch_control* bctl = static_cast<batch_control*>(bctlp); grpc_call* call = bctl->call; GRPC_CALL_COMBINER_STOP(&call->call_combiner, "on_complete"); - if (reinterpret_cast<grpc_error*>(gpr_atm_acq_load(&bctl->batch_error)) == - GRPC_ERROR_NONE) { + if (reinterpret_cast<grpc_error_handle>( + gpr_atm_acq_load(&bctl->batch_error)) == GRPC_ERROR_NONE) { gpr_atm_rel_store(&bctl->batch_error, reinterpret_cast<gpr_atm>(GRPC_ERROR_REF(error))); } @@ -1755,7 +1756,7 @@ static grpc_call_error call_start_batch(grpc_call* call, const grpc_op* ops, call->send_extra_metadata_count = 1; call->send_extra_metadata[0].md = grpc_get_reffed_status_elem( op->data.send_status_from_server.status); - grpc_error* status_error = + grpc_error_handle status_error = op->data.send_status_from_server.status == GRPC_STATUS_OK ? GRPC_ERROR_NONE : grpc_error_set_int( diff --git a/grpc/src/core/lib/surface/call.h b/grpc/src/core/lib/surface/call.h index 34d01db9..a6ad3cae 100644 --- a/grpc/src/core/lib/surface/call.h +++ b/grpc/src/core/lib/surface/call.h @@ -55,8 +55,8 @@ typedef struct grpc_call_create_args { /* Create a new call based on \a args. Regardless of success or failure, always returns a valid new call into *call */ -grpc_error* grpc_call_create(const grpc_call_create_args* args, - grpc_call** call); +grpc_error_handle grpc_call_create(const grpc_call_create_args* args, + grpc_call** call); void grpc_call_set_completion_queue(grpc_call* call, grpc_completion_queue* cq); diff --git a/grpc/src/core/lib/surface/channel.cc b/grpc/src/core/lib/surface/channel.cc index d68f43fc..d3552c87 100644 --- a/grpc/src/core/lib/surface/channel.cc +++ b/grpc/src/core/lib/surface/channel.cc @@ -54,11 +54,11 @@ * (OK, Cancelled, Unknown). */ #define NUM_CACHED_STATUS_ELEMS 3 -static void destroy_channel(void* arg, grpc_error* error); +static void destroy_channel(void* arg, grpc_error_handle error); grpc_channel* grpc_channel_create_with_builder( grpc_channel_stack_builder* builder, - grpc_channel_stack_type channel_stack_type, grpc_error** error) { + grpc_channel_stack_type channel_stack_type, grpc_error_handle* error) { char* target = gpr_strdup(grpc_channel_stack_builder_get_target(builder)); grpc_channel_args* args = grpc_channel_args_copy( grpc_channel_stack_builder_get_channel_arguments(builder)); @@ -70,12 +70,12 @@ grpc_channel* grpc_channel_create_with_builder( } else { GRPC_STATS_INC_CLIENT_CHANNELS_CREATED(); } - grpc_error* builder_error = grpc_channel_stack_builder_finish( + grpc_error_handle builder_error = grpc_channel_stack_builder_finish( builder, sizeof(grpc_channel), 1, destroy_channel, nullptr, reinterpret_cast<void**>(&channel)); if (builder_error != GRPC_ERROR_NONE) { gpr_log(GPR_ERROR, "channel stack builder failed: %s", - grpc_error_string(builder_error)); + grpc_error_std_string(builder_error).c_str()); GPR_ASSERT(channel == nullptr); if (error != nullptr) { *error = builder_error; @@ -225,7 +225,7 @@ grpc_channel* grpc_channel_create(const char* target, grpc_channel_stack_type channel_stack_type, grpc_transport* optional_transport, grpc_resource_user* resource_user, - grpc_error** error) { + grpc_error_handle* error) { // We need to make sure that grpc_shutdown() does not shut things down // until after the channel is destroyed. However, the channel may not // actually be destroyed by the time grpc_channel_destroy() returns, @@ -497,7 +497,7 @@ grpc_call* grpc_channel_create_registered_call( return call; } -static void destroy_channel(void* arg, grpc_error* /*error*/) { +static void destroy_channel(void* arg, grpc_error_handle /*error*/) { grpc_channel* channel = static_cast<grpc_channel*>(arg); if (channel->channelz_node != nullptr) { channel->channelz_node->AddTraceEvent( diff --git a/grpc/src/core/lib/surface/channel.h b/grpc/src/core/lib/surface/channel.h index 659bc8e1..8a14a72d 100644 --- a/grpc/src/core/lib/surface/channel.h +++ b/grpc/src/core/lib/surface/channel.h @@ -35,7 +35,7 @@ grpc_channel* grpc_channel_create(const char* target, grpc_channel_stack_type channel_stack_type, grpc_transport* optional_transport, grpc_resource_user* resource_user = nullptr, - grpc_error** error = nullptr); + grpc_error_handle* error = nullptr); /** The same as grpc_channel_destroy, but doesn't create an ExecCtx, and so * is safe to use from within core. */ @@ -43,7 +43,8 @@ void grpc_channel_destroy_internal(grpc_channel* channel); grpc_channel* grpc_channel_create_with_builder( grpc_channel_stack_builder* builder, - grpc_channel_stack_type channel_stack_type, grpc_error** error = nullptr); + grpc_channel_stack_type channel_stack_type, + grpc_error_handle* error = nullptr); /** Create a call given a grpc_channel, in order to call \a method. Progress is tied to activity on \a pollset_set. The returned call object is @@ -94,9 +95,9 @@ struct CallRegistrationTable { // The map key should be owned strings rather than unowned char*'s to // guarantee that it outlives calls on the core channel (which may outlast the // C++ or other wrapped language Channel that registered these calls). - std::map<std::pair<std::string, std::string>, RegisteredCall> - map /* GUARDED_BY(mu) */; - int method_registration_attempts /* GUARDED_BY(mu) */ = 0; + std::map<std::pair<std::string, std::string>, RegisteredCall> map + ABSL_GUARDED_BY(mu); + int method_registration_attempts ABSL_GUARDED_BY(mu) = 0; }; } // namespace grpc_core diff --git a/grpc/src/core/lib/surface/channel_ping.cc b/grpc/src/core/lib/surface/channel_ping.cc index 82e55219..a6e53ec4 100644 --- a/grpc/src/core/lib/surface/channel_ping.cc +++ b/grpc/src/core/lib/surface/channel_ping.cc @@ -38,7 +38,7 @@ static void ping_destroy(void* arg, grpc_cq_completion* /*storage*/) { gpr_free(arg); } -static void ping_done(void* arg, grpc_error* error) { +static void ping_done(void* arg, grpc_error_handle error) { ping_result* pr = static_cast<ping_result*>(arg); grpc_cq_end_op(pr->cq, pr->tag, GRPC_ERROR_REF(error), ping_destroy, pr, &pr->completion_storage); diff --git a/grpc/src/core/lib/surface/completion_queue.cc b/grpc/src/core/lib/surface/completion_queue.cc index 02ac5067..2b889e0d 100644 --- a/grpc/src/core/lib/surface/completion_queue.cc +++ b/grpc/src/core/lib/surface/completion_queue.cc @@ -70,10 +70,10 @@ struct cq_poller_vtable { bool can_listen; size_t (*size)(void); void (*init)(grpc_pollset* pollset, gpr_mu** mu); - grpc_error* (*kick)(grpc_pollset* pollset, - grpc_pollset_worker* specific_worker); - grpc_error* (*work)(grpc_pollset* pollset, grpc_pollset_worker** worker, - grpc_millis deadline); + grpc_error_handle (*kick)(grpc_pollset* pollset, + grpc_pollset_worker* specific_worker); + grpc_error_handle (*work)(grpc_pollset* pollset, grpc_pollset_worker** worker, + grpc_millis deadline); void (*shutdown)(grpc_pollset* pollset, grpc_closure* closure); void (*destroy)(grpc_pollset* pollset); }; @@ -103,9 +103,9 @@ void non_polling_poller_destroy(grpc_pollset* pollset) { gpr_mu_destroy(&npp->mu); } -grpc_error* non_polling_poller_work(grpc_pollset* pollset, - grpc_pollset_worker** worker, - grpc_millis deadline) { +grpc_error_handle non_polling_poller_work(grpc_pollset* pollset, + grpc_pollset_worker** worker, + grpc_millis deadline) { non_polling_poller* npp = reinterpret_cast<non_polling_poller*>(pollset); if (npp->shutdown) return GRPC_ERROR_NONE; if (npp->kicked_without_poller) { @@ -145,8 +145,8 @@ grpc_error* non_polling_poller_work(grpc_pollset* pollset, return GRPC_ERROR_NONE; } -grpc_error* non_polling_poller_kick(grpc_pollset* pollset, - grpc_pollset_worker* specific_worker) { +grpc_error_handle non_polling_poller_kick( + grpc_pollset* pollset, grpc_pollset_worker* specific_worker) { non_polling_poller* p = reinterpret_cast<non_polling_poller*>(pollset); if (specific_worker == nullptr) { specific_worker = reinterpret_cast<grpc_pollset_worker*>(p->root); @@ -202,7 +202,7 @@ struct cq_vtable { void (*shutdown)(grpc_completion_queue* cq); void (*destroy)(void* data); bool (*begin_op)(grpc_completion_queue* cq, void* tag); - void (*end_op)(grpc_completion_queue* cq, void* tag, grpc_error* error, + void (*end_op)(grpc_completion_queue* cq, void* tag, grpc_error_handle error, void (*done)(void* done_arg, grpc_cq_completion* storage), void* done_arg, grpc_cq_completion* storage, bool internal); grpc_event (*next)(grpc_completion_queue* cq, gpr_timespec deadline, @@ -376,17 +376,17 @@ static bool cq_begin_op_for_callback(grpc_completion_queue* cq, void* tag); // safe to free up that storage. The storage MUST NOT be freed until the // done callback is invoked. static void cq_end_op_for_next( - grpc_completion_queue* cq, void* tag, grpc_error* error, + grpc_completion_queue* cq, void* tag, grpc_error_handle error, void (*done)(void* done_arg, grpc_cq_completion* storage), void* done_arg, grpc_cq_completion* storage, bool internal); static void cq_end_op_for_pluck( - grpc_completion_queue* cq, void* tag, grpc_error* error, + grpc_completion_queue* cq, void* tag, grpc_error_handle error, void (*done)(void* done_arg, grpc_cq_completion* storage), void* done_arg, grpc_cq_completion* storage, bool internal); static void cq_end_op_for_callback( - grpc_completion_queue* cq, void* tag, grpc_error* error, + grpc_completion_queue* cq, void* tag, grpc_error_handle error, void (*done)(void* done_arg, grpc_cq_completion* storage), void* done_arg, grpc_cq_completion* storage, bool internal); @@ -439,7 +439,7 @@ grpc_core::TraceFlag grpc_cq_pluck_trace(false, "queue_pluck"); } \ } while (0) -static void on_pollset_shutdown_done(void* arg, grpc_error* error); +static void on_pollset_shutdown_done(void* arg, grpc_error_handle error); void grpc_cq_global_init() { gpr_tls_init(&g_cached_event); @@ -604,7 +604,7 @@ void grpc_cq_internal_ref(grpc_completion_queue* cq) { cq->owning_refs.Ref(debug_location, reason); } -static void on_pollset_shutdown_done(void* arg, grpc_error* /*error*/) { +static void on_pollset_shutdown_done(void* arg, grpc_error_handle /*error*/) { grpc_completion_queue* cq = static_cast<grpc_completion_queue*>(arg); GRPC_CQ_INTERNAL_UNREF(cq, "pollset_destroy"); } @@ -690,7 +690,7 @@ bool grpc_cq_begin_op(grpc_completion_queue* cq, void* tag) { * completion * type of GRPC_CQ_NEXT) */ static void cq_end_op_for_next( - grpc_completion_queue* cq, void* tag, grpc_error* error, + grpc_completion_queue* cq, void* tag, grpc_error_handle error, void (*done)(void* done_arg, grpc_cq_completion* storage), void* done_arg, grpc_cq_completion* storage, bool /*internal*/) { GPR_TIMER_SCOPE("cq_end_op_for_next", 0); @@ -698,14 +698,15 @@ static void cq_end_op_for_next( if (GRPC_TRACE_FLAG_ENABLED(grpc_api_trace) || (GRPC_TRACE_FLAG_ENABLED(grpc_trace_operation_failures) && error != GRPC_ERROR_NONE)) { - const char* errmsg = grpc_error_string(error); + std::string errmsg = grpc_error_std_string(error); GRPC_API_TRACE( "cq_end_op_for_next(cq=%p, tag=%p, error=%s, " "done=%p, done_arg=%p, storage=%p)", - 6, (cq, tag, errmsg, done, done_arg, storage)); + 6, (cq, tag, errmsg.c_str(), done, done_arg, storage)); if (GRPC_TRACE_FLAG_ENABLED(grpc_trace_operation_failures) && error != GRPC_ERROR_NONE) { - gpr_log(GPR_ERROR, "Operation failed: tag=%p, error=%s", tag, errmsg); + gpr_log(GPR_INFO, "Operation failed: tag=%p, error=%s", tag, + errmsg.c_str()); } } cq_next_data* cqd = static_cast<cq_next_data*> DATA_FROM_CQ(cq); @@ -736,13 +737,13 @@ static void cq_end_op_for_next( /* Only kick if this is the first item queued */ if (is_first) { gpr_mu_lock(cq->mu); - grpc_error* kick_error = + grpc_error_handle kick_error = cq->poller_vtable->kick(POLLSET_FROM_CQ(cq), nullptr); gpr_mu_unlock(cq->mu); if (kick_error != GRPC_ERROR_NONE) { - const char* msg = grpc_error_string(kick_error); - gpr_log(GPR_ERROR, "Kick failed: %s", msg); + gpr_log(GPR_ERROR, "Kick failed: %s", + grpc_error_std_string(kick_error).c_str()); GRPC_ERROR_UNREF(kick_error); } } @@ -771,7 +772,7 @@ static void cq_end_op_for_next( * completion * type of GRPC_CQ_PLUCK) */ static void cq_end_op_for_pluck( - grpc_completion_queue* cq, void* tag, grpc_error* error, + grpc_completion_queue* cq, void* tag, grpc_error_handle error, void (*done)(void* done_arg, grpc_cq_completion* storage), void* done_arg, grpc_cq_completion* storage, bool /*internal*/) { GPR_TIMER_SCOPE("cq_end_op_for_pluck", 0); @@ -782,14 +783,15 @@ static void cq_end_op_for_pluck( if (GRPC_TRACE_FLAG_ENABLED(grpc_api_trace) || (GRPC_TRACE_FLAG_ENABLED(grpc_trace_operation_failures) && error != GRPC_ERROR_NONE)) { - const char* errmsg = grpc_error_string(error); + std::string errmsg = grpc_error_std_string(error).c_str(); GRPC_API_TRACE( "cq_end_op_for_pluck(cq=%p, tag=%p, error=%s, " "done=%p, done_arg=%p, storage=%p)", - 6, (cq, tag, errmsg, done, done_arg, storage)); + 6, (cq, tag, errmsg.c_str(), done, done_arg, storage)); if (GRPC_TRACE_FLAG_ENABLED(grpc_trace_operation_failures) && error != GRPC_ERROR_NONE) { - gpr_log(GPR_ERROR, "Operation failed: tag=%p, error=%s", tag, errmsg); + gpr_log(GPR_ERROR, "Operation failed: tag=%p, error=%s", tag, + errmsg.c_str()); } } @@ -820,15 +822,12 @@ static void cq_end_op_for_pluck( } } - grpc_error* kick_error = + grpc_error_handle kick_error = cq->poller_vtable->kick(POLLSET_FROM_CQ(cq), pluck_worker); - gpr_mu_unlock(cq->mu); - if (kick_error != GRPC_ERROR_NONE) { - const char* msg = grpc_error_string(kick_error); - gpr_log(GPR_ERROR, "Kick failed: %s", msg); - + gpr_log(GPR_ERROR, "Kick failed: %s", + grpc_error_std_string(kick_error).c_str()); GRPC_ERROR_UNREF(kick_error); } } @@ -836,14 +835,14 @@ static void cq_end_op_for_pluck( GRPC_ERROR_UNREF(error); } -static void functor_callback(void* arg, grpc_error* error) { +static void functor_callback(void* arg, grpc_error_handle error) { auto* functor = static_cast<grpc_experimental_completion_queue_functor*>(arg); functor->functor_run(functor, error == GRPC_ERROR_NONE); } /* Complete an event on a completion queue of type GRPC_CQ_CALLBACK */ static void cq_end_op_for_callback( - grpc_completion_queue* cq, void* tag, grpc_error* error, + grpc_completion_queue* cq, void* tag, grpc_error_handle error, void (*done)(void* done_arg, grpc_cq_completion* storage), void* done_arg, grpc_cq_completion* storage, bool internal) { GPR_TIMER_SCOPE("cq_end_op_for_callback", 0); @@ -853,14 +852,15 @@ static void cq_end_op_for_callback( if (GRPC_TRACE_FLAG_ENABLED(grpc_api_trace) || (GRPC_TRACE_FLAG_ENABLED(grpc_trace_operation_failures) && error != GRPC_ERROR_NONE)) { - const char* errmsg = grpc_error_string(error); + std::string errmsg = grpc_error_std_string(error); GRPC_API_TRACE( "cq_end_op_for_callback(cq=%p, tag=%p, error=%s, " "done=%p, done_arg=%p, storage=%p)", - 6, (cq, tag, errmsg, done, done_arg, storage)); + 6, (cq, tag, errmsg.c_str(), done, done_arg, storage)); if (GRPC_TRACE_FLAG_ENABLED(grpc_trace_operation_failures) && error != GRPC_ERROR_NONE) { - gpr_log(GPR_ERROR, "Operation failed: tag=%p, error=%s", tag, errmsg); + gpr_log(GPR_ERROR, "Operation failed: tag=%p, error=%s", tag, + errmsg.c_str()); } } @@ -896,7 +896,8 @@ static void cq_end_op_for_callback( GRPC_CLOSURE_CREATE(functor_callback, functor, nullptr), error); } -void grpc_cq_end_op(grpc_completion_queue* cq, void* tag, grpc_error* error, +void grpc_cq_end_op(grpc_completion_queue* cq, void* tag, + grpc_error_handle error, void (*done)(void* done_arg, grpc_cq_completion* storage), void* done_arg, grpc_cq_completion* storage, bool internal) { @@ -1056,14 +1057,13 @@ static grpc_event cq_next(grpc_completion_queue* cq, gpr_timespec deadline, /* The main polling work happens in grpc_pollset_work */ gpr_mu_lock(cq->mu); cq->num_polls++; - grpc_error* err = cq->poller_vtable->work(POLLSET_FROM_CQ(cq), nullptr, - iteration_deadline); + grpc_error_handle err = cq->poller_vtable->work( + POLLSET_FROM_CQ(cq), nullptr, iteration_deadline); gpr_mu_unlock(cq->mu); if (err != GRPC_ERROR_NONE) { - const char* msg = grpc_error_string(err); - gpr_log(GPR_ERROR, "Completion queue next failed: %s", msg); - + gpr_log(GPR_ERROR, "Completion queue next failed: %s", + grpc_error_std_string(err).c_str()); GRPC_ERROR_UNREF(err); ret.type = GRPC_QUEUE_TIMEOUT; ret.success = 0; @@ -1299,14 +1299,13 @@ static grpc_event cq_pluck(grpc_completion_queue* cq, void* tag, break; } cq->num_polls++; - grpc_error* err = + grpc_error_handle err = cq->poller_vtable->work(POLLSET_FROM_CQ(cq), &worker, deadline_millis); if (err != GRPC_ERROR_NONE) { del_plucker(cq, tag, &worker); gpr_mu_unlock(cq->mu); - const char* msg = grpc_error_string(err); - gpr_log(GPR_ERROR, "Completion queue pluck failed: %s", msg); - + gpr_log(GPR_ERROR, "Completion queue pluck failed: %s", + grpc_error_std_string(err).c_str()); GRPC_ERROR_UNREF(err); ret.type = GRPC_QUEUE_TIMEOUT; ret.success = 0; diff --git a/grpc/src/core/lib/surface/completion_queue.h b/grpc/src/core/lib/surface/completion_queue.h index 59116d43..2bf91faf 100644 --- a/grpc/src/core/lib/surface/completion_queue.h +++ b/grpc/src/core/lib/surface/completion_queue.h @@ -77,7 +77,8 @@ bool grpc_cq_begin_op(grpc_completion_queue* cq, void* tag); /* Queue a GRPC_OP_COMPLETED operation; tag must correspond to the tag passed to grpc_cq_begin_op */ -void grpc_cq_end_op(grpc_completion_queue* cq, void* tag, grpc_error* error, +void grpc_cq_end_op(grpc_completion_queue* cq, void* tag, + grpc_error_handle error, void (*done)(void* done_arg, grpc_cq_completion* storage), void* done_arg, grpc_cq_completion* storage, bool internal = false); diff --git a/grpc/src/core/lib/surface/init.cc b/grpc/src/core/lib/surface/init.cc index 0b2151b7..41866f12 100644 --- a/grpc/src/core/lib/surface/init.cc +++ b/grpc/src/core/lib/surface/init.cc @@ -63,16 +63,15 @@ extern void grpc_register_built_in_plugins(void); #define MAX_PLUGINS 128 static gpr_once g_basic_init = GPR_ONCE_INIT; -static gpr_mu g_init_mu; +static grpc_core::Mutex* g_init_mu; static int g_initializations; -static gpr_cv* g_shutting_down_cv; +static grpc_core::CondVar* g_shutting_down_cv; static bool g_shutting_down; static void do_basic_init(void) { gpr_log_verbosity_init(); - gpr_mu_init(&g_init_mu); - g_shutting_down_cv = static_cast<gpr_cv*>(malloc(sizeof(gpr_cv))); - gpr_cv_init(g_shutting_down_cv); + g_init_mu = new grpc_core::Mutex(); + g_shutting_down_cv = new grpc_core::CondVar(); g_shutting_down = false; grpc_register_built_in_plugins(); grpc_cq_global_init(); @@ -130,11 +129,11 @@ void grpc_init(void) { int i; gpr_once_init(&g_basic_init, do_basic_init); - grpc_core::MutexLock lock(&g_init_mu); + grpc_core::MutexLock lock(g_init_mu); if (++g_initializations == 1) { if (g_shutting_down) { g_shutting_down = false; - gpr_cv_broadcast(g_shutting_down_cv); + g_shutting_down_cv->SignalAll(); } grpc_core::Fork::GlobalInit(); grpc_fork_handlers_auto_register(); @@ -196,14 +195,14 @@ void grpc_shutdown_internal_locked(void) { grpc_core::ExecCtx::GlobalShutdown(); grpc_core::ApplicationCallbackExecCtx::GlobalShutdown(); g_shutting_down = false; - gpr_cv_broadcast(g_shutting_down_cv); + g_shutting_down_cv->SignalAll(); // Absolute last action will be to delete static metadata context. grpc_destroy_static_metadata_ctx(); } void grpc_shutdown_internal(void* /*ignored*/) { GRPC_API_TRACE("grpc_shutdown_internal", 0, ()); - grpc_core::MutexLock lock(&g_init_mu); + grpc_core::MutexLock lock(g_init_mu); // We have released lock from the shutdown thread and it is possible that // another grpc_init has been called, and do nothing if that is the case. if (--g_initializations != 0) { @@ -214,7 +213,7 @@ void grpc_shutdown_internal(void* /*ignored*/) { void grpc_shutdown(void) { GRPC_API_TRACE("grpc_shutdown(void)", 0, ()); - grpc_core::MutexLock lock(&g_init_mu); + grpc_core::MutexLock lock(g_init_mu); if (--g_initializations == 0) { grpc_core::ApplicationCallbackExecCtx* acec = @@ -243,7 +242,7 @@ void grpc_shutdown(void) { void grpc_shutdown_blocking(void) { GRPC_API_TRACE("grpc_shutdown_blocking(void)", 0, ()); - grpc_core::MutexLock lock(&g_init_mu); + grpc_core::MutexLock lock(g_init_mu); if (--g_initializations == 0) { g_shutting_down = true; grpc_shutdown_internal_locked(); @@ -253,16 +252,15 @@ void grpc_shutdown_blocking(void) { int grpc_is_initialized(void) { int r; gpr_once_init(&g_basic_init, do_basic_init); - grpc_core::MutexLock lock(&g_init_mu); + grpc_core::MutexLock lock(g_init_mu); r = g_initializations > 0; return r; } void grpc_maybe_wait_for_async_shutdown(void) { gpr_once_init(&g_basic_init, do_basic_init); - grpc_core::MutexLock lock(&g_init_mu); + grpc_core::MutexLock lock(g_init_mu); while (g_shutting_down) { - gpr_cv_wait(g_shutting_down_cv, &g_init_mu, - gpr_inf_future(GPR_CLOCK_REALTIME)); + g_shutting_down_cv->Wait(g_init_mu); } } diff --git a/grpc/src/core/lib/surface/lame_client.cc b/grpc/src/core/lib/surface/lame_client.cc index d32cc28e..65e659ac 100644 --- a/grpc/src/core/lib/surface/lame_client.cc +++ b/grpc/src/core/lib/surface/lame_client.cc @@ -35,15 +35,23 @@ #include "src/core/lib/transport/connectivity_state.h" #include "src/core/lib/transport/static_metadata.h" +#define GRPC_ARG_LAME_FILTER_ERROR "grpc.lame_filter_error" + namespace grpc_core { namespace { struct ChannelData { - ChannelData() : state_tracker("lame_channel", GRPC_CHANNEL_SHUTDOWN) {} + explicit ChannelData(grpc_channel_element_args* args) + : state_tracker("lame_channel", GRPC_CHANNEL_SHUTDOWN) { + grpc_error_handle err = grpc_channel_args_find_pointer<grpc_error>( + args->channel_args, GRPC_ARG_LAME_FILTER_ERROR); + if (err != nullptr) error = GRPC_ERROR_REF(err); + } + ~ChannelData() { GRPC_ERROR_UNREF(error); } - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; Mutex mu; ConnectivityStateTracker state_tracker; }; @@ -90,8 +98,8 @@ static void lame_start_transport_op(grpc_channel_element* elem, } } -static grpc_error* lame_init_call_elem(grpc_call_element* elem, - const grpc_call_element_args* args) { +static grpc_error_handle lame_init_call_elem( + grpc_call_element* elem, const grpc_call_element_args* args) { CallData* calld = static_cast<CallData*>(elem->call_data); calld->call_combiner = args->call_combiner; return GRPC_ERROR_NONE; @@ -103,11 +111,9 @@ static void lame_destroy_call_elem(grpc_call_element* /*elem*/, ExecCtx::Run(DEBUG_LOCATION, then_schedule_closure, GRPC_ERROR_NONE); } -static grpc_error* lame_init_channel_elem(grpc_channel_element* elem, - grpc_channel_element_args* args) { - GPR_ASSERT(args->is_first); - GPR_ASSERT(args->is_last); - new (elem->channel_data) ChannelData; +static grpc_error_handle lame_init_channel_elem( + grpc_channel_element* elem, grpc_channel_element_args* args) { + new (elem->channel_data) ChannelData(args); return GRPC_ERROR_NONE; } @@ -116,12 +122,25 @@ static void lame_destroy_channel_elem(grpc_channel_element* elem) { chand->~ChannelData(); } +// Channel arg vtable for a grpc_error_handle. +void* ErrorCopy(void* p) { + grpc_error_handle error = static_cast<grpc_error_handle>(p); + return GRPC_ERROR_REF(error); +} +void ErrorDestroy(void* p) { + grpc_error_handle error = static_cast<grpc_error_handle>(p); + GRPC_ERROR_UNREF(error); +} +int ErrorCompare(void* p, void* q) { return GPR_ICMP(p, q); } +const grpc_arg_pointer_vtable kLameFilterErrorArgVtable = { + ErrorCopy, ErrorDestroy, ErrorCompare}; + } // namespace -void SetLameFilterError(grpc_channel_element* elem, grpc_error* error) { - GPR_ASSERT(elem->filter == &grpc_lame_filter); - auto chand = static_cast<grpc_core::ChannelData*>(elem->channel_data); - chand->error = error; +grpc_arg MakeLameClientErrorArg(grpc_error_handle error) { + return grpc_channel_arg_pointer_create( + const_cast<char*>(GRPC_ARG_LAME_FILTER_ERROR), error, + &kLameFilterErrorArgVtable); } } // namespace grpc_core @@ -146,20 +165,20 @@ grpc_channel* grpc_lame_client_channel_create(const char* target, grpc_status_code error_code, const char* error_message) { grpc_core::ExecCtx exec_ctx; - grpc_channel_element* elem; - grpc_channel* channel = - grpc_channel_create(target, nullptr, GRPC_CLIENT_LAME_CHANNEL, nullptr); - elem = grpc_channel_stack_element(grpc_channel_get_channel_stack(channel), 0); GRPC_API_TRACE( "grpc_lame_client_channel_create(target=%s, error_code=%d, " "error_message=%s)", 3, (target, (int)error_code, error_message)); - grpc_core::SetLameFilterError( - elem, grpc_error_set_str( - grpc_error_set_int( - GRPC_ERROR_CREATE_FROM_STATIC_STRING("lame client channel"), - GRPC_ERROR_INT_GRPC_STATUS, error_code), - GRPC_ERROR_STR_GRPC_MESSAGE, - grpc_slice_from_static_string(error_message))); + grpc_error_handle error = grpc_error_set_str( + grpc_error_set_int( + GRPC_ERROR_CREATE_FROM_STATIC_STRING("lame client channel"), + GRPC_ERROR_INT_GRPC_STATUS, error_code), + GRPC_ERROR_STR_GRPC_MESSAGE, + grpc_slice_from_static_string(error_message)); + grpc_arg error_arg = grpc_core::MakeLameClientErrorArg(error); + grpc_channel_args args = {1, &error_arg}; + grpc_channel* channel = + grpc_channel_create(target, &args, GRPC_CLIENT_LAME_CHANNEL, nullptr); + GRPC_ERROR_UNREF(error); return channel; } diff --git a/grpc/src/core/lib/surface/lame_client.h b/grpc/src/core/lib/surface/lame_client.h index 8fd3f4eb..41759cbb 100644 --- a/grpc/src/core/lib/surface/lame_client.h +++ b/grpc/src/core/lib/surface/lame_client.h @@ -23,10 +23,11 @@ #include "src/core/lib/channel/channel_stack.h" -extern const grpc_channel_filter grpc_lame_filter; - namespace grpc_core { -void SetLameFilterError(grpc_channel_element* elem, grpc_error* error); +// Does NOT take ownership of error. +grpc_arg MakeLameClientErrorArg(grpc_error_handle error); } // namespace grpc_core +extern const grpc_channel_filter grpc_lame_filter; + #endif /* GRPC_CORE_LIB_SURFACE_LAME_CLIENT_H */ diff --git a/grpc/src/core/lib/surface/server.cc b/grpc/src/core/lib/surface/server.cc index 852c93d0..a8b4aaae 100644 --- a/grpc/src/core/lib/surface/server.cc +++ b/grpc/src/core/lib/surface/server.cc @@ -159,7 +159,7 @@ class Server::RequestMatcherInterface { // Mark all application-requested RPCs failed if they have not been matched to // an incoming RPC. The error parameter indicates why the RPCs are being // failed (always server shutdown in all current implementations). - virtual void KillRequests(grpc_error* error) = 0; + virtual void KillRequests(grpc_error_handle error) = 0; // How many request queues are supported by this matcher. This is an abstract // concept that essentially maps to gRPC completion queues. @@ -211,7 +211,7 @@ class Server::RealRequestMatcher : public RequestMatcherInterface { } } - void KillRequests(grpc_error* error) override { + void KillRequests(grpc_error_handle error) override { for (size_t i = 0; i < requests_per_cq_.size(); i++) { RequestedCall* rc; while ((rc = reinterpret_cast<RequestedCall*>( @@ -318,7 +318,8 @@ class Server::RealRequestMatcher : public RequestMatcherInterface { // advance or queue up any incoming RPC for later match. Instead, MatchOrQueue // will call out to an allocation function passed in at the construction of the // object. These request matchers are designed for the C++ callback API, so they -// only support 1 completion queue (passed in at the constructor). +// only support 1 completion queue (passed in at the constructor). They are also +// used for the sync API. class Server::AllocatingRequestMatcherBase : public RequestMatcherInterface { public: AllocatingRequestMatcherBase(Server* server, grpc_completion_queue* cq) @@ -335,7 +336,9 @@ class Server::AllocatingRequestMatcherBase : public RequestMatcherInterface { void ZombifyPending() override {} - void KillRequests(grpc_error* error) override { GRPC_ERROR_UNREF(error); } + void KillRequests(grpc_error_handle error) override { + GRPC_ERROR_UNREF(error); + } size_t request_queue_count() const override { return 0; } @@ -370,15 +373,20 @@ class Server::AllocatingRequestMatcherBatch void MatchOrQueue(size_t /*start_request_queue_index*/, CallData* calld) override { - BatchCallAllocation call_info = allocator_(); - GPR_ASSERT(server()->ValidateServerRequest( - cq(), static_cast<void*>(call_info.tag), nullptr, nullptr) == - GRPC_CALL_OK); - RequestedCall* rc = new RequestedCall( - static_cast<void*>(call_info.tag), cq(), call_info.call, - call_info.initial_metadata, call_info.details); - calld->SetState(CallData::CallState::ACTIVATED); - calld->Publish(cq_idx(), rc); + if (server()->ShutdownRefOnRequest()) { + BatchCallAllocation call_info = allocator_(); + GPR_ASSERT(server()->ValidateServerRequest( + cq(), static_cast<void*>(call_info.tag), nullptr, + nullptr) == GRPC_CALL_OK); + RequestedCall* rc = new RequestedCall( + static_cast<void*>(call_info.tag), call_info.cq, call_info.call, + call_info.initial_metadata, call_info.details); + calld->SetState(CallData::CallState::ACTIVATED); + calld->Publish(cq_idx(), rc); + } else { + calld->FailCallCreation(); + } + server()->ShutdownUnrefOnRequest(); } private: @@ -398,17 +406,21 @@ class Server::AllocatingRequestMatcherRegistered void MatchOrQueue(size_t /*start_request_queue_index*/, CallData* calld) override { - RegisteredCallAllocation call_info = allocator_(); - GPR_ASSERT( - server()->ValidateServerRequest(cq(), static_cast<void*>(call_info.tag), - call_info.optional_payload, - registered_method_) == GRPC_CALL_OK); - RequestedCall* rc = new RequestedCall( - static_cast<void*>(call_info.tag), cq(), call_info.call, - call_info.initial_metadata, registered_method_, call_info.deadline, - call_info.optional_payload); - calld->SetState(CallData::CallState::ACTIVATED); - calld->Publish(cq_idx(), rc); + if (server()->ShutdownRefOnRequest()) { + RegisteredCallAllocation call_info = allocator_(); + GPR_ASSERT(server()->ValidateServerRequest( + cq(), call_info.tag, call_info.optional_payload, + registered_method_) == GRPC_CALL_OK); + RequestedCall* rc = + new RequestedCall(call_info.tag, call_info.cq, call_info.call, + call_info.initial_metadata, registered_method_, + call_info.deadline, call_info.optional_payload); + calld->SetState(CallData::CallState::ACTIVATED); + calld->Publish(cq_idx(), rc); + } else { + calld->FailCallCreation(); + } + server()->ShutdownUnrefOnRequest(); } private: @@ -434,7 +446,7 @@ class ChannelBroadcaster { } // Broadcasts a shutdown on each channel. - void BroadcastShutdown(bool send_goaway, grpc_error* force_disconnect) { + void BroadcastShutdown(bool send_goaway, grpc_error_handle force_disconnect) { for (grpc_channel* channel : channels_) { SendShutdown(channel, send_goaway, GRPC_ERROR_REF(force_disconnect)); GRPC_CHANNEL_INTERNAL_UNREF(channel, "broadcast"); @@ -449,14 +461,14 @@ class ChannelBroadcaster { grpc_slice slice; }; - static void ShutdownCleanup(void* arg, grpc_error* /*error*/) { + static void ShutdownCleanup(void* arg, grpc_error_handle /*error*/) { ShutdownCleanupArgs* a = static_cast<ShutdownCleanupArgs*>(arg); grpc_slice_unref_internal(a->slice); delete a; } static void SendShutdown(grpc_channel* channel, bool send_goaway, - grpc_error* send_disconnect) { + grpc_error_handle send_disconnect) { ShutdownCleanupArgs* sc = new ShutdownCleanupArgs; GRPC_CLOSURE_INIT(&sc->closure, ShutdownCleanup, sc, grpc_schedule_on_exec_ctx); @@ -513,7 +525,7 @@ grpc_resource_user* CreateDefaultResourceUser(const grpc_channel_args* args) { } RefCountedPtr<channelz::ServerNode> CreateChannelzNode( - Server* server, const grpc_channel_args* args) { + const grpc_channel_args* args) { RefCountedPtr<channelz::ServerNode> channelz_node; if (grpc_channel_args_find_bool(args, GRPC_ARG_ENABLE_CHANNELZ, GRPC_ENABLE_CHANNELZ_DEFAULT)) { @@ -534,7 +546,7 @@ RefCountedPtr<channelz::ServerNode> CreateChannelzNode( Server::Server(const grpc_channel_args* args) : channel_args_(grpc_channel_args_copy(args)), default_resource_user_(CreateDefaultResourceUser(args)), - channelz_node_(CreateChannelzNode(this, args)) {} + channelz_node_(CreateChannelzNode(args)) {} Server::~Server() { grpc_channel_args_destroy(channel_args_); @@ -597,13 +609,13 @@ void Server::Start() { starting_cv_.Signal(); } -grpc_error* Server::SetupTransport( +grpc_error_handle Server::SetupTransport( grpc_transport* transport, grpc_pollset* accepting_pollset, const grpc_channel_args* args, const RefCountedPtr<grpc_core::channelz::SocketNode>& socket_node, grpc_resource_user* resource_user) { // Create channel. - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; grpc_channel* channel = grpc_channel_create( nullptr, args, GRPC_SERVER_CHANNEL, transport, resource_user, &error); if (channel == nullptr) { @@ -700,7 +712,8 @@ void Server::DoneRequestEvent(void* req, grpc_cq_completion* /*c*/) { delete static_cast<RequestedCall*>(req); } -void Server::FailCall(size_t cq_idx, RequestedCall* rc, grpc_error* error) { +void Server::FailCall(size_t cq_idx, RequestedCall* rc, + grpc_error_handle error) { *rc->call = nullptr; rc->initial_metadata->count = 0; GPR_ASSERT(error != GRPC_ERROR_NONE); @@ -711,7 +724,7 @@ void Server::FailCall(size_t cq_idx, RequestedCall* rc, grpc_error* error) { // Before calling MaybeFinishShutdown(), we must hold mu_global_ and not // hold mu_call_. void Server::MaybeFinishShutdown() { - if (!shutdown_flag_.load(std::memory_order_acquire) || shutdown_published_) { + if (!ShutdownReady() || shutdown_published_) { return; } { @@ -740,7 +753,7 @@ void Server::MaybeFinishShutdown() { } } -void Server::KillPendingWorkLocked(grpc_error* error) { +void Server::KillPendingWorkLocked(grpc_error_handle error) { if (started_) { unregistered_request_matcher_->KillRequests(GRPC_ERROR_REF(error)); unregistered_request_matcher_->ZombifyPending(); @@ -762,7 +775,7 @@ std::vector<grpc_channel*> Server::GetChannelsLocked() const { return channels; } -void Server::ListenerDestroyDone(void* arg, grpc_error* /*error*/) { +void Server::ListenerDestroyDone(void* arg, grpc_error_handle /*error*/) { Server* server = static_cast<Server*>(arg); MutexLock lock(&server->mu_global_); server->listeners_destroyed_++; @@ -796,7 +809,7 @@ void Server::ShutdownAndNotify(grpc_completion_queue* cq, void* tag) { { // Wait for startup to be finished. Locks mu_global. MutexLock lock(&mu_global_); - starting_cv_.WaitUntil(&mu_global_, [this] { return !starting_; }); + WaitUntil(&starting_cv_, &mu_global_, [this] { return !starting_; }); // Stay locked, and gather up some stuff to do. GPR_ASSERT(grpc_cq_begin_op(cq, tag)); if (shutdown_published_) { @@ -805,19 +818,18 @@ void Server::ShutdownAndNotify(grpc_completion_queue* cq, void* tag) { return; } shutdown_tags_.emplace_back(tag, cq); - if (shutdown_flag_.load(std::memory_order_acquire)) { + if (ShutdownCalled()) { return; } last_shutdown_message_time_ = gpr_now(GPR_CLOCK_REALTIME); broadcaster.FillChannelsLocked(GetChannelsLocked()); - shutdown_flag_.store(true, std::memory_order_release); // Collect all unregistered then registered calls. { MutexLock lock(&mu_call_); KillPendingWorkLocked( GRPC_ERROR_CREATE_FROM_STATIC_STRING("Server Shutdown")); } - MaybeFinishShutdown(); + ShutdownUnrefOnShutdownCall(); } // Shutdown listeners. for (auto& listener : listeners_) { @@ -849,8 +861,7 @@ void Server::CancelAllCalls() { void Server::Orphan() { { MutexLock lock(&mu_global_); - GPR_ASSERT(shutdown_flag_.load(std::memory_order_acquire) || - listeners_.empty()); + GPR_ASSERT(ShutdownCalled() || listeners_.empty()); GPR_ASSERT(listeners_destroyed_ == listeners_.size()); } if (default_resource_user_ != nullptr) { @@ -869,7 +880,7 @@ grpc_call_error Server::ValidateServerRequest( (rm->payload_handling == GRPC_SRM_PAYLOAD_NONE)))) { return GRPC_CALL_ERROR_PAYLOAD_TYPE_MISMATCH; } - if (grpc_cq_begin_op(cq_for_notification, tag) == false) { + if (!grpc_cq_begin_op(cq_for_notification, tag)) { return GRPC_CALL_ERROR_COMPLETION_QUEUE_SHUTDOWN; } return GRPC_CALL_OK; @@ -897,7 +908,7 @@ grpc_call_error Server::ValidateServerRequestAndCq( } grpc_call_error Server::QueueRequestedCall(size_t cq_idx, RequestedCall* rc) { - if (shutdown_flag_.load(std::memory_order_acquire)) { + if (ShutdownCalled()) { FailCall(cq_idx, rc, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Server Shutdown")); return GRPC_CALL_OK; @@ -1066,7 +1077,7 @@ void Server::ChannelData::InitTransport(RefCountedPtr<Server> server, op->set_accept_stream_fn = AcceptStream; op->set_accept_stream_user_data = this; op->start_connectivity_watch = MakeOrphanable<ConnectivityWatcher>(this); - if (server_->shutdown_flag_.load(std::memory_order_acquire)) { + if (server_->ShutdownCalled()) { op->disconnect_with_error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("Server shutdown"); } @@ -1126,7 +1137,7 @@ void Server::ChannelData::AcceptStream(void* arg, grpc_transport* /*transport*/, args.add_initial_metadata_count = 0; args.send_deadline = GRPC_MILLIS_INF_FUTURE; grpc_call* call; - grpc_error* error = grpc_call_create(&args, &call); + grpc_error_handle error = grpc_call_create(&args, &call); grpc_call_element* elem = grpc_call_stack_element(grpc_call_get_call_stack(call), 0); auto* calld = static_cast<Server::CallData*>(elem->call_data); @@ -1138,7 +1149,8 @@ void Server::ChannelData::AcceptStream(void* arg, grpc_transport* /*transport*/, calld->Start(elem); } -void Server::ChannelData::FinishDestroy(void* arg, grpc_error* /*error*/) { +void Server::ChannelData::FinishDestroy(void* arg, + grpc_error_handle /*error*/) { auto* chand = static_cast<Server::ChannelData*>(arg); Server* server = chand->server_.get(); GRPC_CHANNEL_INTERNAL_UNREF(chand->channel_, "server"); @@ -1165,7 +1177,7 @@ void Server::ChannelData::Destroy() { op); } -grpc_error* Server::ChannelData::InitChannelElement( +grpc_error_handle Server::ChannelData::InitChannelElement( grpc_channel_element* elem, grpc_channel_element_args* args) { GPR_ASSERT(args->is_first); GPR_ASSERT(!args->is_last); @@ -1276,14 +1288,13 @@ void Server::CallData::Publish(size_t cq_idx, RequestedCall* rc) { rc, &rc->completion, true); } -void Server::CallData::PublishNewRpc(void* arg, grpc_error* error) { +void Server::CallData::PublishNewRpc(void* arg, grpc_error_handle error) { grpc_call_element* call_elem = static_cast<grpc_call_element*>(arg); auto* calld = static_cast<Server::CallData*>(call_elem->call_data); auto* chand = static_cast<Server::ChannelData*>(call_elem->channel_data); RequestMatcherInterface* rm = calld->matcher_; Server* server = rm->server(); - if (error != GRPC_ERROR_NONE || - server->shutdown_flag_.load(std::memory_order_acquire)) { + if (error != GRPC_ERROR_NONE || server->ShutdownCalled()) { calld->state_.Store(CallState::ZOMBIED, MemoryOrder::RELAXED); calld->KillZombie(); return; @@ -1293,7 +1304,7 @@ void Server::CallData::PublishNewRpc(void* arg, grpc_error* error) { namespace { -void KillZombieClosure(void* call, grpc_error* /*error*/) { +void KillZombieClosure(void* call, grpc_error_handle /*error*/) { grpc_call_unref(static_cast<grpc_call*>(call)); } @@ -1307,7 +1318,7 @@ void Server::CallData::KillZombie() { void Server::CallData::StartNewRpc(grpc_call_element* elem) { auto* chand = static_cast<ChannelData*>(elem->channel_data); - if (server_->shutdown_flag_.load(std::memory_order_acquire)) { + if (server_->ShutdownCalled()) { state_.Store(CallState::ZOMBIED, MemoryOrder::RELAXED); KillZombie(); return; @@ -1345,8 +1356,8 @@ void Server::CallData::StartNewRpc(grpc_call_element* elem) { } } -void Server::CallData::RecvInitialMetadataBatchComplete(void* arg, - grpc_error* error) { +void Server::CallData::RecvInitialMetadataBatchComplete( + void* arg, grpc_error_handle error) { grpc_call_element* elem = static_cast<grpc_call_element*>(arg); auto* calld = static_cast<Server::CallData*>(elem->call_data); if (error != GRPC_ERROR_NONE) { @@ -1378,7 +1389,8 @@ void Server::CallData::StartTransportStreamOpBatchImpl( grpc_call_next_op(elem, batch); } -void Server::CallData::RecvInitialMetadataReady(void* arg, grpc_error* error) { +void Server::CallData::RecvInitialMetadataReady(void* arg, + grpc_error_handle error) { grpc_call_element* elem = static_cast<grpc_call_element*>(arg); CallData* calld = static_cast<CallData*>(elem->call_data); grpc_millis op_deadline; @@ -1404,7 +1416,7 @@ void Server::CallData::RecvInitialMetadataReady(void* arg, grpc_error* error) { /* do nothing */ } else { /* Pass the error reference to calld->recv_initial_metadata_error */ - grpc_error* src_error = error; + grpc_error_handle src_error = error; error = GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Missing :authority or :path", &src_error, 1); GRPC_ERROR_UNREF(src_error); @@ -1421,7 +1433,8 @@ void Server::CallData::RecvInitialMetadataReady(void* arg, grpc_error* error) { Closure::Run(DEBUG_LOCATION, closure, error); } -void Server::CallData::RecvTrailingMetadataReady(void* arg, grpc_error* error) { +void Server::CallData::RecvTrailingMetadataReady(void* arg, + grpc_error_handle error) { grpc_call_element* elem = static_cast<grpc_call_element*>(arg); CallData* calld = static_cast<CallData*>(elem->call_data); if (calld->original_recv_initial_metadata_ready_ != nullptr) { @@ -1442,7 +1455,7 @@ void Server::CallData::RecvTrailingMetadataReady(void* arg, grpc_error* error) { error); } -grpc_error* Server::CallData::InitCallElement( +grpc_error_handle Server::CallData::InitCallElement( grpc_call_element* elem, const grpc_call_element_args* args) { auto* chand = static_cast<ChannelData*>(elem->channel_data); new (elem->call_data) Server::CallData(elem, *args, chand->server()); diff --git a/grpc/src/core/lib/surface/server.h b/grpc/src/core/lib/surface/server.h index 06bdd4d7..413a5a8a 100644 --- a/grpc/src/core/lib/surface/server.h +++ b/grpc/src/core/lib/surface/server.h @@ -22,6 +22,7 @@ #include <list> #include <vector> +#include "absl/status/statusor.h" #include "absl/types/optional.h" #include <grpc/grpc.h> @@ -31,6 +32,7 @@ #include "src/core/lib/channel/channelz.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/gprpp/atomic.h" +#include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/surface/completion_queue.h" #include "src/core/lib/transport/transport.h" @@ -49,21 +51,23 @@ class Server : public InternallyRefCounted<Server> { // An object to represent the most relevant characteristics of a // newly-allocated call object when using an AllocatingRequestMatcherBatch. struct BatchCallAllocation { - grpc_experimental_completion_queue_functor* tag; + void* tag; grpc_call** call; grpc_metadata_array* initial_metadata; grpc_call_details* details; + grpc_completion_queue* cq; }; // An object to represent the most relevant characteristics of a // newly-allocated call object when using an // AllocatingRequestMatcherRegistered. struct RegisteredCallAllocation { - grpc_experimental_completion_queue_functor* tag; + void* tag; grpc_call** call; grpc_metadata_array* initial_metadata; gpr_timespec* deadline; grpc_byte_buffer** optional_payload; + grpc_completion_queue* cq; }; /// Interface for listeners. @@ -90,7 +94,7 @@ class Server : public InternallyRefCounted<Server> { explicit Server(const grpc_channel_args* args); ~Server() override; - void Orphan() override; + void Orphan() ABSL_LOCKS_EXCLUDED(mu_global_) override; const grpc_channel_args* channel_args() const { return channel_args_; } grpc_resource_user* default_resource_user() const { @@ -112,7 +116,7 @@ class Server : public InternallyRefCounted<Server> { config_fetcher_ = std::move(config_fetcher); } - bool HasOpenConnections(); + bool HasOpenConnections() ABSL_LOCKS_EXCLUDED(mu_global_); // Adds a listener to the server. When the server starts, it will call // the listener's Start() method, and when it shuts down, it will orphan @@ -120,11 +124,11 @@ class Server : public InternallyRefCounted<Server> { void AddListener(OrphanablePtr<ListenerInterface> listener); // Starts listening for connections. - void Start(); + void Start() ABSL_LOCKS_EXCLUDED(mu_global_); // Sets up a transport. Creates a channel stack and binds the transport to // the server. Called from the listener when a new connection is accepted. - grpc_error* SetupTransport( + grpc_error_handle SetupTransport( grpc_transport* transport, grpc_pollset* accepting_pollset, const grpc_channel_args* args, const RefCountedPtr<channelz::SocketNode>& socket_node, @@ -158,9 +162,10 @@ class Server : public InternallyRefCounted<Server> { grpc_completion_queue* cq_bound_to_call, grpc_completion_queue* cq_for_notification, void* tag_new); - void ShutdownAndNotify(grpc_completion_queue* cq, void* tag); + void ShutdownAndNotify(grpc_completion_queue* cq, void* tag) + ABSL_LOCKS_EXCLUDED(mu_global_, mu_call_); - void CancelAllCalls(); + void CancelAllCalls() ABSL_LOCKS_EXCLUDED(mu_global_); private: struct RequestedCall; @@ -197,8 +202,8 @@ class Server : public InternallyRefCounted<Server> { bool is_idempotent); // Filter vtable functions. - static grpc_error* InitChannelElement(grpc_channel_element* elem, - grpc_channel_element_args* args); + static grpc_error_handle InitChannelElement( + grpc_channel_element* elem, grpc_channel_element_args* args); static void DestroyChannelElement(grpc_channel_element* elem); private: @@ -207,9 +212,9 @@ class Server : public InternallyRefCounted<Server> { static void AcceptStream(void* arg, grpc_transport* /*transport*/, const void* transport_server_data); - void Destroy(); + void Destroy() ABSL_EXCLUSIVE_LOCKS_REQUIRED(server_->mu_global_); - static void FinishDestroy(void* arg, grpc_error* error); + static void FinishDestroy(void* arg, grpc_error_handle error); RefCountedPtr<Server> server_; grpc_channel* channel_; @@ -259,8 +264,8 @@ class Server : public InternallyRefCounted<Server> { void FailCallCreation(); // Filter vtable functions. - static grpc_error* InitCallElement(grpc_call_element* elem, - const grpc_call_element_args* args); + static grpc_error_handle InitCallElement( + grpc_call_element* elem, const grpc_call_element_args* args); static void DestroyCallElement(grpc_call_element* elem, const grpc_call_final_info* /*final_info*/, grpc_closure* /*ignored*/); @@ -269,15 +274,16 @@ class Server : public InternallyRefCounted<Server> { private: // Helper functions for handling calls at the top of the call stack. - static void RecvInitialMetadataBatchComplete(void* arg, grpc_error* error); + static void RecvInitialMetadataBatchComplete(void* arg, + grpc_error_handle error); void StartNewRpc(grpc_call_element* elem); - static void PublishNewRpc(void* arg, grpc_error* error); + static void PublishNewRpc(void* arg, grpc_error_handle error); // Functions used inside the call stack. void StartTransportStreamOpBatchImpl(grpc_call_element* elem, grpc_transport_stream_op_batch* batch); - static void RecvInitialMetadataReady(void* arg, grpc_error* error); - static void RecvTrailingMetadataReady(void* arg, grpc_error* error); + static void RecvInitialMetadataReady(void* arg, grpc_error_handle error); + static void RecvTrailingMetadataReady(void* arg, grpc_error_handle error); RefCountedPtr<Server> server_; @@ -304,12 +310,12 @@ class Server : public InternallyRefCounted<Server> { uint32_t recv_initial_metadata_flags_ = 0; grpc_closure recv_initial_metadata_ready_; grpc_closure* original_recv_initial_metadata_ready_; - grpc_error* recv_initial_metadata_error_ = GRPC_ERROR_NONE; + grpc_error_handle recv_initial_metadata_error_ = GRPC_ERROR_NONE; bool seen_recv_trailing_metadata_ready_ = false; grpc_closure recv_trailing_metadata_ready_; grpc_closure* original_recv_trailing_metadata_ready_; - grpc_error* recv_trailing_metadata_error_ = GRPC_ERROR_NONE; + grpc_error_handle recv_trailing_metadata_error_ = GRPC_ERROR_NONE; grpc_closure publish_; @@ -331,7 +337,7 @@ class Server : public InternallyRefCounted<Server> { grpc_cq_completion completion; }; - static void ListenerDestroyDone(void* arg, grpc_error* error); + static void ListenerDestroyDone(void* arg, grpc_error_handle error); static void DoneShutdownEvent(void* server, grpc_cq_completion* /*completion*/) { @@ -340,12 +346,14 @@ class Server : public InternallyRefCounted<Server> { static void DoneRequestEvent(void* req, grpc_cq_completion* completion); - void FailCall(size_t cq_idx, RequestedCall* rc, grpc_error* error); + void FailCall(size_t cq_idx, RequestedCall* rc, grpc_error_handle error); grpc_call_error QueueRequestedCall(size_t cq_idx, RequestedCall* rc); - void MaybeFinishShutdown(); + void MaybeFinishShutdown() ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_global_) + ABSL_LOCKS_EXCLUDED(mu_call_); - void KillPendingWorkLocked(grpc_error* error); + void KillPendingWorkLocked(grpc_error_handle error) + ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_call_); static grpc_call_error ValidateServerRequest( grpc_completion_queue* cq_for_notification, void* tag, @@ -356,6 +364,39 @@ class Server : public InternallyRefCounted<Server> { std::vector<grpc_channel*> GetChannelsLocked() const; + // Take a shutdown ref for a request (increment by 2) and return if shutdown + // has already been called. + bool ShutdownRefOnRequest() { + int old_value = shutdown_refs_.FetchAdd(2, MemoryOrder::ACQ_REL); + return (old_value & 1) != 0; + } + + // Decrement the shutdown ref counter by either 1 (for shutdown call) or 2 + // (for in-flight request) and possibly call MaybeFinishShutdown if + // appropriate. + void ShutdownUnrefOnRequest() ABSL_LOCKS_EXCLUDED(mu_global_) { + if (shutdown_refs_.FetchSub(2, MemoryOrder::ACQ_REL) == 2) { + MutexLock lock(&mu_global_); + MaybeFinishShutdown(); + } + } + void ShutdownUnrefOnShutdownCall() ABSL_EXCLUSIVE_LOCKS_REQUIRED(mu_global_) { + if (shutdown_refs_.FetchSub(1, MemoryOrder::ACQ_REL) == 1) { + MaybeFinishShutdown(); + } + } + + bool ShutdownCalled() const { + return (shutdown_refs_.Load(MemoryOrder::ACQUIRE) & 1) == 0; + } + + // Returns whether there are no more shutdown refs, which means that shutdown + // has been called and all accepted requests have been published if using an + // AllocatingRequestMatcher. + bool ShutdownReady() const { + return shutdown_refs_.Load(MemoryOrder::ACQUIRE) == 0; + } + grpc_channel_args* const channel_args_; grpc_resource_user* default_resource_user_ = nullptr; RefCountedPtr<channelz::ServerNode> channelz_node_; @@ -385,9 +426,15 @@ class Server : public InternallyRefCounted<Server> { // Request matcher for unregistered methods. std::unique_ptr<RequestMatcherInterface> unregistered_request_matcher_; - std::atomic_bool shutdown_flag_{false}; - bool shutdown_published_ = false; - std::vector<ShutdownTag> shutdown_tags_; + // The shutdown refs counter tracks whether or not shutdown has been called + // and whether there are any AllocatingRequestMatcher requests that have been + // accepted but not yet started (+2 on each one). If shutdown has been called, + // the lowest bit will be 0 (defaults to 1) and the counter will be even. The + // server should not notify on shutdown until the counter is 0 (shutdown is + // called and there are no requests that are accepted but not started). + Atomic<int> shutdown_refs_{1}; + bool shutdown_published_ ABSL_GUARDED_BY(mu_global_) = false; + std::vector<ShutdownTag> shutdown_tags_ ABSL_GUARDED_BY(mu_global_); std::list<ChannelData*> channels_; @@ -412,15 +459,31 @@ struct grpc_server { // approaches here. struct grpc_server_config_fetcher { public: + class ConnectionManager : public grpc_core::RefCounted<ConnectionManager> { + public: + // Ownership of \a args is transfered. + virtual absl::StatusOr<grpc_channel_args*> UpdateChannelArgsForConnection( + grpc_channel_args* args, grpc_endpoint* tcp) = 0; + }; + class WatcherInterface { public: virtual ~WatcherInterface() = default; - virtual void UpdateConfig(grpc_channel_args* args) = 0; + // UpdateConnectionManager() is invoked by the config fetcher when a new + // config is available. Implementations should update the connection manager + // and start serving if not already serving. + virtual void UpdateConnectionManager( + grpc_core::RefCountedPtr<ConnectionManager> manager) = 0; + // Implementations should stop serving when this is called. Serving should + // only resume when UpdateConfig() is invoked. + virtual void StopServing() = 0; }; virtual ~grpc_server_config_fetcher() = default; + // Ownership of \a args is transferred. virtual void StartWatch(std::string listening_address, + grpc_channel_args* args, std::unique_ptr<WatcherInterface> watcher) = 0; virtual void CancelWatch(WatcherInterface* watcher) = 0; virtual grpc_pollset_set* interested_parties() = 0; diff --git a/grpc/src/core/lib/surface/validate_metadata.cc b/grpc/src/core/lib/surface/validate_metadata.cc index 138f5745..c1ec936e 100644 --- a/grpc/src/core/lib/surface/validate_metadata.cc +++ b/grpc/src/core/lib/surface/validate_metadata.cc @@ -30,9 +30,9 @@ #include "src/core/lib/slice/slice_string_helpers.h" #include "src/core/lib/surface/validate_metadata.h" -static grpc_error* conforms_to(const grpc_slice& slice, - const uint8_t* legal_bits, - const char* err_desc) { +static grpc_error_handle conforms_to(const grpc_slice& slice, + const uint8_t* legal_bits, + const char* err_desc) { const uint8_t* p = GRPC_SLICE_START_PTR(slice); const uint8_t* e = GRPC_SLICE_END_PTR(slice); for (; p != e; p++) { @@ -40,7 +40,7 @@ static grpc_error* conforms_to(const grpc_slice& slice, int byte = idx / 8; int bit = idx % 8; if ((legal_bits[byte] & (1 << bit)) == 0) { - grpc_error* error = grpc_error_set_str( + grpc_error_handle error = grpc_error_set_str( grpc_error_set_int(GRPC_ERROR_CREATE_FROM_COPIED_STRING(err_desc), GRPC_ERROR_INT_OFFSET, p - GRPC_SLICE_START_PTR(slice)), @@ -52,13 +52,13 @@ static grpc_error* conforms_to(const grpc_slice& slice, return GRPC_ERROR_NONE; } -static int error2int(grpc_error* error) { +static int error2int(grpc_error_handle error) { int r = (error == GRPC_ERROR_NONE); GRPC_ERROR_UNREF(error); return r; } -grpc_error* grpc_validate_header_key_is_legal(const grpc_slice& slice) { +grpc_error_handle grpc_validate_header_key_is_legal(const grpc_slice& slice) { static const uint8_t legal_header_bits[256 / 8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0xff, 0x03, 0x00, 0x00, 0x00, 0x80, 0xfe, 0xff, 0xff, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -82,7 +82,7 @@ int grpc_header_key_is_legal(grpc_slice slice) { return error2int(grpc_validate_header_key_is_legal(slice)); } -grpc_error* grpc_validate_header_nonbin_value_is_legal( +grpc_error_handle grpc_validate_header_nonbin_value_is_legal( const grpc_slice& slice) { static const uint8_t legal_header_bits[256 / 8] = { 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, diff --git a/grpc/src/core/lib/surface/validate_metadata.h b/grpc/src/core/lib/surface/validate_metadata.h index 07c802c9..daaaa1a3 100644 --- a/grpc/src/core/lib/surface/validate_metadata.h +++ b/grpc/src/core/lib/surface/validate_metadata.h @@ -27,8 +27,9 @@ #include "src/core/lib/iomgr/error.h" -grpc_error* grpc_validate_header_key_is_legal(const grpc_slice& slice); -grpc_error* grpc_validate_header_nonbin_value_is_legal(const grpc_slice& slice); +grpc_error_handle grpc_validate_header_key_is_legal(const grpc_slice& slice); +grpc_error_handle grpc_validate_header_nonbin_value_is_legal( + const grpc_slice& slice); int grpc_is_binary_header_internal(const grpc_slice& slice); inline int grpc_key_is_binary_header(const uint8_t* buf, size_t length) { diff --git a/grpc/src/core/lib/surface/version.cc b/grpc/src/core/lib/surface/version.cc index 03cb2eca..8061df0c 100644 --- a/grpc/src/core/lib/surface/version.cc +++ b/grpc/src/core/lib/surface/version.cc @@ -23,6 +23,8 @@ #include <grpc/grpc.h> -const char* grpc_version_string(void) { return "14.0.0"; } +const char* grpc_version_string(void) { return "16.0.0"; } -const char* grpc_g_stands_for(void) { return "gecko"; } +const char* grpc_g_stands_for(void) { + return "guadalupe_river_park_conservancy"; +} diff --git a/grpc/src/core/lib/transport/byte_stream.cc b/grpc/src/core/lib/transport/byte_stream.cc index 82f34ca1..3cc5275e 100644 --- a/grpc/src/core/lib/transport/byte_stream.cc +++ b/grpc/src/core/lib/transport/byte_stream.cc @@ -59,7 +59,7 @@ bool SliceBufferByteStream::Next(size_t /*max_size_hint*/, return true; } -grpc_error* SliceBufferByteStream::Pull(grpc_slice* slice) { +grpc_error_handle SliceBufferByteStream::Pull(grpc_slice* slice) { if (GPR_UNLIKELY(shutdown_error_ != GRPC_ERROR_NONE)) { return GRPC_ERROR_REF(shutdown_error_); } @@ -67,7 +67,7 @@ grpc_error* SliceBufferByteStream::Pull(grpc_slice* slice) { return GRPC_ERROR_NONE; } -void SliceBufferByteStream::Shutdown(grpc_error* error) { +void SliceBufferByteStream::Shutdown(grpc_error_handle error) { GRPC_ERROR_UNREF(shutdown_error_); shutdown_error_ = error; } @@ -117,7 +117,7 @@ bool ByteStreamCache::CachingByteStream::Next(size_t max_size_hint, return cache_->underlying_stream_->Next(max_size_hint, on_complete); } -grpc_error* ByteStreamCache::CachingByteStream::Pull(grpc_slice* slice) { +grpc_error_handle ByteStreamCache::CachingByteStream::Pull(grpc_slice* slice) { if (shutdown_error_ != GRPC_ERROR_NONE) { return GRPC_ERROR_REF(shutdown_error_); } @@ -128,7 +128,7 @@ grpc_error* ByteStreamCache::CachingByteStream::Pull(grpc_slice* slice) { return GRPC_ERROR_NONE; } GPR_ASSERT(cache_->underlying_stream_ != nullptr); - grpc_error* error = cache_->underlying_stream_->Pull(slice); + grpc_error_handle error = cache_->underlying_stream_->Pull(slice); if (error == GRPC_ERROR_NONE) { grpc_slice_buffer_add(&cache_->cache_buffer_, grpc_slice_ref_internal(*slice)); @@ -142,7 +142,7 @@ grpc_error* ByteStreamCache::CachingByteStream::Pull(grpc_slice* slice) { return error; } -void ByteStreamCache::CachingByteStream::Shutdown(grpc_error* error) { +void ByteStreamCache::CachingByteStream::Shutdown(grpc_error_handle error) { GRPC_ERROR_UNREF(shutdown_error_); shutdown_error_ = GRPC_ERROR_REF(error); if (cache_->underlying_stream_ != nullptr) { diff --git a/grpc/src/core/lib/transport/byte_stream.h b/grpc/src/core/lib/transport/byte_stream.h index e83fb626..09a30326 100644 --- a/grpc/src/core/lib/transport/byte_stream.h +++ b/grpc/src/core/lib/transport/byte_stream.h @@ -56,7 +56,7 @@ class ByteStream : public Orphanable { // indicated by Next(). // // Once a slice is returned into *slice, it is owned by the caller. - virtual grpc_error* Pull(grpc_slice* slice) = 0; + virtual grpc_error_handle Pull(grpc_slice* slice) = 0; // Shuts down the byte stream. // @@ -65,7 +65,7 @@ class ByteStream : public Orphanable { // // The next call to Pull() (if any) will return the error passed to // Shutdown(). - virtual void Shutdown(grpc_error* error) = 0; + virtual void Shutdown(grpc_error_handle error) = 0; uint32_t length() const { return length_; } uint32_t flags() const { return flags_; } @@ -97,11 +97,11 @@ class SliceBufferByteStream : public ByteStream { void Orphan() override; bool Next(size_t max_size_hint, grpc_closure* on_complete) override; - grpc_error* Pull(grpc_slice* slice) override; - void Shutdown(grpc_error* error) override; + grpc_error_handle Pull(grpc_slice* slice) override; + void Shutdown(grpc_error_handle error) override; private: - grpc_error* shutdown_error_ = GRPC_ERROR_NONE; + grpc_error_handle shutdown_error_ = GRPC_ERROR_NONE; grpc_slice_buffer backing_buffer_; }; @@ -131,8 +131,8 @@ class ByteStreamCache { void Orphan() override; bool Next(size_t max_size_hint, grpc_closure* on_complete) override; - grpc_error* Pull(grpc_slice* slice) override; - void Shutdown(grpc_error* error) override; + grpc_error_handle Pull(grpc_slice* slice) override; + void Shutdown(grpc_error_handle error) override; // Resets the byte stream to the start of the underlying stream. void Reset(); @@ -141,7 +141,7 @@ class ByteStreamCache { ByteStreamCache* cache_; size_t cursor_ = 0; size_t offset_ = 0; - grpc_error* shutdown_error_ = GRPC_ERROR_NONE; + grpc_error_handle shutdown_error_ = GRPC_ERROR_NONE; }; explicit ByteStreamCache(OrphanablePtr<ByteStream> underlying_stream); diff --git a/grpc/src/core/lib/transport/connectivity_state.cc b/grpc/src/core/lib/transport/connectivity_state.cc index c2008ab8..01a4f5cb 100644 --- a/grpc/src/core/lib/transport/connectivity_state.cc +++ b/grpc/src/core/lib/transport/connectivity_state.cc @@ -73,7 +73,7 @@ class AsyncConnectivityStateWatcherInterface::Notifier { } private: - static void SendNotification(void* arg, grpc_error* /*ignored*/) { + static void SendNotification(void* arg, grpc_error_handle /*ignored*/) { Notifier* self = static_cast<Notifier*>(arg); if (GRPC_TRACE_FLAG_ENABLED(grpc_connectivity_state_trace)) { gpr_log(GPR_INFO, "watcher %p: delivering async notification for %s (%s)", diff --git a/grpc/src/core/lib/transport/error_utils.cc b/grpc/src/core/lib/transport/error_utils.cc index c6ef8ae6..e8f05550 100644 --- a/grpc/src/core/lib/transport/error_utils.cc +++ b/grpc/src/core/lib/transport/error_utils.cc @@ -25,8 +25,8 @@ #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/transport/status_conversion.h" -static grpc_error* recursively_find_error_with_field(grpc_error* error, - grpc_error_ints which) { +static grpc_error_handle recursively_find_error_with_field( + grpc_error_handle error, grpc_error_ints which) { intptr_t unused; // If the error itself has a status code, return it. if (grpc_error_get_int(error, which, &unused)) { @@ -38,14 +38,15 @@ static grpc_error* recursively_find_error_with_field(grpc_error* error, while (slot != UINT8_MAX) { grpc_linked_error* lerr = reinterpret_cast<grpc_linked_error*>(error->arena + slot); - grpc_error* result = recursively_find_error_with_field(lerr->err, which); + grpc_error_handle result = + recursively_find_error_with_field(lerr->err, which); if (result) return result; slot = lerr->next; } return nullptr; } -void grpc_error_get_status(grpc_error* error, grpc_millis deadline, +void grpc_error_get_status(grpc_error_handle error, grpc_millis deadline, grpc_status_code* code, grpc_slice* slice, grpc_http2_error_code* http_error, const char** error_string) { @@ -71,7 +72,7 @@ void grpc_error_get_status(grpc_error* error, grpc_millis deadline, // Start with the parent error and recurse through the tree of children // until we find the first one that has a status code. - grpc_error* found_error = + grpc_error_handle found_error = recursively_find_error_with_field(error, GRPC_ERROR_INT_GRPC_STATUS); if (found_error == nullptr) { /// If no grpc-status exists, retry through the tree to find a http2 error @@ -96,7 +97,7 @@ void grpc_error_get_status(grpc_error* error, grpc_millis deadline, if (code != nullptr) *code = status; if (error_string != nullptr && status != GRPC_STATUS_OK) { - *error_string = gpr_strdup(grpc_error_string(error)); + *error_string = gpr_strdup(grpc_error_std_string(error).c_str()); } if (http_error != nullptr) { @@ -123,7 +124,7 @@ void grpc_error_get_status(grpc_error* error, grpc_millis deadline, } } -absl::Status grpc_error_to_absl_status(grpc_error* error) { +absl::Status grpc_error_to_absl_status(grpc_error_handle error) { grpc_status_code status; // TODO(yashykt): This should be updated once we decide on how to use the // absl::Status payload to capture all the contents of grpc_error. @@ -136,7 +137,17 @@ absl::Status grpc_error_to_absl_status(grpc_error* error) { GRPC_SLICE_LENGTH(message))); } -bool grpc_error_has_clear_grpc_status(grpc_error* error) { +grpc_error_handle absl_status_to_grpc_error(absl::Status status) { + // Special error checks + if (status.ok()) { + return GRPC_ERROR_NONE; + } + return grpc_error_set_int( + GRPC_ERROR_CREATE_FROM_STRING_VIEW(status.message()), + GRPC_ERROR_INT_GRPC_STATUS, static_cast<grpc_status_code>(status.code())); +} + +bool grpc_error_has_clear_grpc_status(grpc_error_handle error) { intptr_t unused; if (grpc_error_get_int(error, GRPC_ERROR_INT_GRPC_STATUS, &unused)) { return true; diff --git a/grpc/src/core/lib/transport/error_utils.h b/grpc/src/core/lib/transport/error_utils.h index c61320d4..777e6323 100644 --- a/grpc/src/core/lib/transport/error_utils.h +++ b/grpc/src/core/lib/transport/error_utils.h @@ -34,19 +34,25 @@ /// be populated with the entire error string. If any of the attributes (code, /// msg, http_status, error_string) are unneeded, they can be passed as /// NULL. -void grpc_error_get_status(grpc_error* error, grpc_millis deadline, +void grpc_error_get_status(grpc_error_handle error, grpc_millis deadline, grpc_status_code* code, grpc_slice* slice, grpc_http2_error_code* http_error, const char** error_string); -/// Utility Function to convert a grpc_error * \a error to an absl::Status. -/// Does NOT consume a ref to grpc_error. -absl::Status grpc_error_to_absl_status(grpc_error* error); +/// Utility Function to convert a grpc_error_handle \a error to an +/// absl::Status. Does NOT consume a ref to grpc_error. +absl::Status grpc_error_to_absl_status(grpc_error_handle error); + +/// Utility function to convert an absl::Status \a status to grpc_error. Note +/// that this method does not return "special case" errors such as +/// GRPC_ERROR_CANCELLED, with the exception of GRPC_ERROR_NONE returned for +/// \a absl::OkStatus(). +grpc_error_handle absl_status_to_grpc_error(absl::Status status); /// A utility function to check whether there is a clear status code that /// doesn't need to be guessed in \a error. This means that \a error or some /// child has GRPC_ERROR_INT_GRPC_STATUS set, or that it is GRPC_ERROR_NONE or /// GRPC_ERROR_CANCELLED -bool grpc_error_has_clear_grpc_status(grpc_error* error); +bool grpc_error_has_clear_grpc_status(grpc_error_handle error); #endif /* GRPC_CORE_LIB_TRANSPORT_ERROR_UTILS_H */ diff --git a/grpc/src/core/lib/transport/metadata.cc b/grpc/src/core/lib/transport/metadata.cc index 33d4d5ac..ef1e07d2 100644 --- a/grpc/src/core/lib/transport/metadata.cc +++ b/grpc/src/core/lib/transport/metadata.cc @@ -252,7 +252,7 @@ void grpc_mdctx_global_shutdown() { if (shard->count != 0) { gpr_log(GPR_ERROR, "WARNING: %" PRIuPTR " metadata elements were leaked", shard->count); - for (int i = 0; i < shard->capacity; i++) { + for (size_t i = 0; i < shard->capacity; i++) { for (InternedMetadata* md = shard->elems[i].next; md; md = md->bucket_next()) { char* key_str = grpc_slice_to_c_string(md->key()); @@ -596,7 +596,7 @@ static void* set_user_data(UserData* ud, void (*destroy_func)(void*), grpc_core::ReleasableMutexLock lock(&ud->mu_user_data); if (ud->destroy_user_data.Load(grpc_core::MemoryOrder::RELAXED)) { /* user data can only be set once */ - lock.Unlock(); + lock.Release(); if (destroy_func != nullptr) { destroy_func(data); } @@ -673,6 +673,10 @@ void grpc_mdelem_do_unref(grpc_mdelem gmd DEBUG_ARGS) { void grpc_mdelem_on_final_unref(grpc_mdelem_data_storage storage, void* ptr, uint32_t hash DEBUG_ARGS) { +#ifndef NDEBUG + (void)file; + (void)line; +#endif switch (storage) { case GRPC_MDELEM_STORAGE_EXTERNAL: case GRPC_MDELEM_STORAGE_STATIC: diff --git a/grpc/src/core/lib/transport/metadata_batch.cc b/grpc/src/core/lib/transport/metadata_batch.cc index 66749b67..e85b476c 100644 --- a/grpc/src/core/lib/transport/metadata_batch.cc +++ b/grpc/src/core/lib/transport/metadata_batch.cc @@ -23,6 +23,9 @@ #include <stdbool.h> #include <string.h> +#include "absl/container/inlined_vector.h" +#include "absl/strings/str_join.h" + #include <grpc/support/alloc.h> #include <grpc/support/log.h> @@ -91,22 +94,23 @@ void grpc_metadata_batch_destroy(grpc_metadata_batch* batch) { } } -grpc_error* grpc_attach_md_to_error(grpc_error* src, grpc_mdelem md) { - grpc_error* out = grpc_error_set_str( +grpc_error_handle grpc_attach_md_to_error(grpc_error_handle src, + grpc_mdelem md) { + grpc_error_handle out = grpc_error_set_str( grpc_error_set_str(src, GRPC_ERROR_STR_KEY, grpc_slice_ref_internal(GRPC_MDKEY(md))), GRPC_ERROR_STR_VALUE, grpc_slice_ref_internal(GRPC_MDVALUE(md))); return out; } -static grpc_error* GPR_ATTRIBUTE_NOINLINE error_with_md(grpc_mdelem md) { +static grpc_error_handle GPR_ATTRIBUTE_NOINLINE error_with_md(grpc_mdelem md) { return grpc_attach_md_to_error( GRPC_ERROR_CREATE_FROM_STATIC_STRING("Unallowed duplicate metadata"), md); } -static grpc_error* link_callout(grpc_metadata_batch* batch, - grpc_linked_mdelem* storage, - grpc_metadata_batch_callouts_index idx) { +static grpc_error_handle link_callout(grpc_metadata_batch* batch, + grpc_linked_mdelem* storage, + grpc_metadata_batch_callouts_index idx) { GPR_DEBUG_ASSERT(idx >= 0 && idx < GRPC_BATCH_CALLOUTS_COUNT); if (GPR_LIKELY(batch->idx.array[idx] == nullptr)) { ++batch->list.default_count; @@ -116,12 +120,12 @@ static grpc_error* link_callout(grpc_metadata_batch* batch, return error_with_md(storage->md); } -static grpc_error* maybe_link_callout(grpc_metadata_batch* batch, - grpc_linked_mdelem* storage) +static grpc_error_handle maybe_link_callout(grpc_metadata_batch* batch, + grpc_linked_mdelem* storage) GRPC_MUST_USE_RESULT; -static grpc_error* maybe_link_callout(grpc_metadata_batch* batch, - grpc_linked_mdelem* storage) { +static grpc_error_handle maybe_link_callout(grpc_metadata_batch* batch, + grpc_linked_mdelem* storage) { grpc_metadata_batch_callouts_index idx = GRPC_BATCH_INDEX_OF(GRPC_MDKEY(storage->md)); if (idx == GRPC_BATCH_CALLOUTS_COUNT) { @@ -142,9 +146,9 @@ static void maybe_unlink_callout(grpc_metadata_batch* batch, batch->idx.array[idx] = nullptr; } -grpc_error* grpc_metadata_batch_add_head(grpc_metadata_batch* batch, - grpc_linked_mdelem* storage, - grpc_mdelem elem_to_add) { +grpc_error_handle grpc_metadata_batch_add_head(grpc_metadata_batch* batch, + grpc_linked_mdelem* storage, + grpc_mdelem elem_to_add) { GPR_DEBUG_ASSERT(!GRPC_MDISNULL(elem_to_add)); storage->md = elem_to_add; return grpc_metadata_batch_link_head(batch, storage); @@ -166,10 +170,10 @@ static void link_head(grpc_mdelem_list* list, grpc_linked_mdelem* storage) { assert_valid_list(list); } -grpc_error* grpc_metadata_batch_link_head(grpc_metadata_batch* batch, - grpc_linked_mdelem* storage) { +grpc_error_handle grpc_metadata_batch_link_head(grpc_metadata_batch* batch, + grpc_linked_mdelem* storage) { assert_valid_callouts(batch); - grpc_error* err = maybe_link_callout(batch, storage); + grpc_error_handle err = maybe_link_callout(batch, storage); if (err != GRPC_ERROR_NONE) { assert_valid_callouts(batch); return err; @@ -182,12 +186,12 @@ grpc_error* grpc_metadata_batch_link_head(grpc_metadata_batch* batch, // TODO(arjunroy): Need to revisit this and see what guarantees exist between // C-core and the internal-metadata subsystem. E.g. can we ensure a particular // metadata is never added twice, even in the presence of user supplied data? -grpc_error* grpc_metadata_batch_link_head( +grpc_error_handle grpc_metadata_batch_link_head( grpc_metadata_batch* batch, grpc_linked_mdelem* storage, grpc_metadata_batch_callouts_index idx) { GPR_DEBUG_ASSERT(GRPC_BATCH_INDEX_OF(GRPC_MDKEY(storage->md)) == idx); assert_valid_callouts(batch); - grpc_error* err = link_callout(batch, storage, idx); + grpc_error_handle err = link_callout(batch, storage, idx); if (GPR_UNLIKELY(err != GRPC_ERROR_NONE)) { assert_valid_callouts(batch); return err; @@ -197,9 +201,9 @@ grpc_error* grpc_metadata_batch_link_head( return GRPC_ERROR_NONE; } -grpc_error* grpc_metadata_batch_add_tail(grpc_metadata_batch* batch, - grpc_linked_mdelem* storage, - grpc_mdelem elem_to_add) { +grpc_error_handle grpc_metadata_batch_add_tail(grpc_metadata_batch* batch, + grpc_linked_mdelem* storage, + grpc_mdelem elem_to_add) { GPR_DEBUG_ASSERT(!GRPC_MDISNULL(elem_to_add)); storage->md = elem_to_add; return grpc_metadata_batch_link_tail(batch, storage); @@ -221,10 +225,10 @@ static void link_tail(grpc_mdelem_list* list, grpc_linked_mdelem* storage) { assert_valid_list(list); } -grpc_error* grpc_metadata_batch_link_tail(grpc_metadata_batch* batch, - grpc_linked_mdelem* storage) { +grpc_error_handle grpc_metadata_batch_link_tail(grpc_metadata_batch* batch, + grpc_linked_mdelem* storage) { assert_valid_callouts(batch); - grpc_error* err = maybe_link_callout(batch, storage); + grpc_error_handle err = maybe_link_callout(batch, storage); if (err != GRPC_ERROR_NONE) { assert_valid_callouts(batch); return err; @@ -234,12 +238,12 @@ grpc_error* grpc_metadata_batch_link_tail(grpc_metadata_batch* batch, return GRPC_ERROR_NONE; } -grpc_error* grpc_metadata_batch_link_tail( +grpc_error_handle grpc_metadata_batch_link_tail( grpc_metadata_batch* batch, grpc_linked_mdelem* storage, grpc_metadata_batch_callouts_index idx) { GPR_DEBUG_ASSERT(GRPC_BATCH_INDEX_OF(GRPC_MDKEY(storage->md)) == idx); assert_valid_callouts(batch); - grpc_error* err = link_callout(batch, storage, idx); + grpc_error_handle err = link_callout(batch, storage, idx); if (GPR_UNLIKELY(err != GRPC_ERROR_NONE)) { assert_valid_callouts(batch); return err; @@ -296,11 +300,35 @@ void grpc_metadata_batch_set_value(grpc_linked_mdelem* storage, GRPC_MDELEM_UNREF(old_mdelem); } -grpc_error* grpc_metadata_batch_substitute(grpc_metadata_batch* batch, - grpc_linked_mdelem* storage, - grpc_mdelem new_mdelem) { +absl::optional<absl::string_view> grpc_metadata_batch_get_value( + grpc_metadata_batch* batch, absl::string_view target_key, + std::string* concatenated_value) { + // Find all values for the specified key. + GPR_DEBUG_ASSERT(batch != nullptr); + absl::InlinedVector<absl::string_view, 1> values; + for (grpc_linked_mdelem* md = batch->list.head; md != nullptr; + md = md->next) { + absl::string_view key = grpc_core::StringViewFromSlice(GRPC_MDKEY(md->md)); + absl::string_view value = + grpc_core::StringViewFromSlice(GRPC_MDVALUE(md->md)); + if (target_key == key) values.push_back(value); + } + // If none found, no match. + if (values.empty()) return absl::nullopt; + // If exactly one found, return it as-is. + if (values.size() == 1) return values.front(); + // If more than one found, concatenate the values, using + // *concatenated_values as a temporary holding place for the + // concatenated string. + *concatenated_value = absl::StrJoin(values, ","); + return *concatenated_value; +} + +grpc_error_handle grpc_metadata_batch_substitute(grpc_metadata_batch* batch, + grpc_linked_mdelem* storage, + grpc_mdelem new_mdelem) { assert_valid_callouts(batch); - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; grpc_mdelem old_mdelem = storage->md; if (!grpc_slice_eq(GRPC_MDKEY(new_mdelem), GRPC_MDKEY(old_mdelem))) { maybe_unlink_callout(batch, storage); @@ -337,7 +365,7 @@ size_t grpc_metadata_batch_size(grpc_metadata_batch* batch) { return size; } -static void add_error(grpc_error** composite, grpc_error* error, +static void add_error(grpc_error_handle* composite, grpc_error_handle error, const char* composite_error_string) { if (error == GRPC_ERROR_NONE) return; if (*composite == GRPC_ERROR_NONE) { @@ -346,12 +374,11 @@ static void add_error(grpc_error** composite, grpc_error* error, *composite = grpc_error_add_child(*composite, error); } -grpc_error* grpc_metadata_batch_filter(grpc_metadata_batch* batch, - grpc_metadata_batch_filter_func func, - void* user_data, - const char* composite_error_string) { +grpc_error_handle grpc_metadata_batch_filter( + grpc_metadata_batch* batch, grpc_metadata_batch_filter_func func, + void* user_data, const char* composite_error_string) { grpc_linked_mdelem* l = batch->list.head; - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; while (l) { grpc_linked_mdelem* next = l->next; grpc_filtered_mdelem new_mdelem = func(user_data, l->md); @@ -375,7 +402,7 @@ void grpc_metadata_batch_copy(grpc_metadata_batch* src, for (grpc_linked_mdelem* elem = src->list.head; elem != nullptr; elem = elem->next) { // Error unused in non-debug builds. - grpc_error* GRPC_UNUSED error = grpc_metadata_batch_add_tail( + grpc_error_handle GRPC_UNUSED error = grpc_metadata_batch_add_tail( dst, &storage[i++], GRPC_MDELEM_REF(elem->md)); // The only way that grpc_metadata_batch_add_tail() can fail is if // there's a duplicate entry for a callout. However, that can't be diff --git a/grpc/src/core/lib/transport/metadata_batch.h b/grpc/src/core/lib/transport/metadata_batch.h index 69864c1a..b72859fc 100644 --- a/grpc/src/core/lib/transport/metadata_batch.h +++ b/grpc/src/core/lib/transport/metadata_batch.h @@ -23,9 +23,12 @@ #include <stdbool.h> +#include "absl/types/optional.h" + #include <grpc/grpc.h> #include <grpc/slice.h> #include <grpc/support/time.h> + #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/transport/metadata.h" #include "src/core/lib/transport/static_metadata.h" @@ -71,22 +74,33 @@ void grpc_metadata_batch_remove(grpc_metadata_batch* batch, grpc_metadata_batch_callouts_index idx); /** Substitute a new mdelem for an old value */ -grpc_error* grpc_metadata_batch_substitute(grpc_metadata_batch* batch, - grpc_linked_mdelem* storage, - grpc_mdelem new_mdelem); +grpc_error_handle grpc_metadata_batch_substitute(grpc_metadata_batch* batch, + grpc_linked_mdelem* storage, + grpc_mdelem new_mdelem); void grpc_metadata_batch_set_value(grpc_linked_mdelem* storage, const grpc_slice& value); +/** Returns metadata value(s) for the specified key. + If the key is not present in the batch, returns absl::nullopt. + If the key is present exactly once in the batch, returns a string_view of + that value. + If the key is present more than once in the batch, constructs a + comma-concatenated string of all values in concatenated_value and returns a + string_view of that string. */ +absl::optional<absl::string_view> grpc_metadata_batch_get_value( + grpc_metadata_batch* batch, absl::string_view target_key, + std::string* concatenated_value); + /** Add \a storage to the beginning of \a batch. storage->md is assumed to be valid. \a storage is owned by the caller and must survive for the lifetime of batch. This usually means it should be around for the lifetime of the call. */ -grpc_error* grpc_metadata_batch_link_head(grpc_metadata_batch* batch, - grpc_linked_mdelem* storage) +grpc_error_handle grpc_metadata_batch_link_head(grpc_metadata_batch* batch, + grpc_linked_mdelem* storage) GRPC_MUST_USE_RESULT; -grpc_error* grpc_metadata_batch_link_head( +grpc_error_handle grpc_metadata_batch_link_head( grpc_metadata_batch* batch, grpc_linked_mdelem* storage, grpc_metadata_batch_callouts_index idx) GRPC_MUST_USE_RESULT; @@ -95,10 +109,10 @@ grpc_error* grpc_metadata_batch_link_head( \a storage is owned by the caller and must survive for the lifetime of batch. This usually means it should be around for the lifetime of the call. */ -grpc_error* grpc_metadata_batch_link_tail(grpc_metadata_batch* batch, - grpc_linked_mdelem* storage) +grpc_error_handle grpc_metadata_batch_link_tail(grpc_metadata_batch* batch, + grpc_linked_mdelem* storage) GRPC_MUST_USE_RESULT; -grpc_error* grpc_metadata_batch_link_tail( +grpc_error_handle grpc_metadata_batch_link_tail( grpc_metadata_batch* batch, grpc_linked_mdelem* storage, grpc_metadata_batch_callouts_index idx) GRPC_MUST_USE_RESULT; @@ -108,19 +122,19 @@ grpc_error* grpc_metadata_batch_link_tail( lifetime of batch. This usually means it should be around for the lifetime of the call. Takes ownership of \a elem_to_add */ -grpc_error* grpc_metadata_batch_add_head( +grpc_error_handle grpc_metadata_batch_add_head( grpc_metadata_batch* batch, grpc_linked_mdelem* storage, grpc_mdelem elem_to_add) GRPC_MUST_USE_RESULT; // TODO(arjunroy, roth): Remove redundant methods. // add/link_head/tail are almost identical. -inline grpc_error* GRPC_MUST_USE_RESULT grpc_metadata_batch_add_head( +inline grpc_error_handle GRPC_MUST_USE_RESULT grpc_metadata_batch_add_head( grpc_metadata_batch* batch, grpc_linked_mdelem* storage, grpc_metadata_batch_callouts_index idx) { return grpc_metadata_batch_link_head(batch, storage, idx); } -inline grpc_error* GRPC_MUST_USE_RESULT grpc_metadata_batch_add_head( +inline grpc_error_handle GRPC_MUST_USE_RESULT grpc_metadata_batch_add_head( grpc_metadata_batch* batch, grpc_linked_mdelem* storage, grpc_mdelem elem_to_add, grpc_metadata_batch_callouts_index idx) { GPR_DEBUG_ASSERT(!GRPC_MDISNULL(elem_to_add)); @@ -134,17 +148,17 @@ inline grpc_error* GRPC_MUST_USE_RESULT grpc_metadata_batch_add_head( lifetime of batch. This usually means it should be around for the lifetime of the call. Takes ownership of \a elem_to_add */ -grpc_error* grpc_metadata_batch_add_tail( +grpc_error_handle grpc_metadata_batch_add_tail( grpc_metadata_batch* batch, grpc_linked_mdelem* storage, grpc_mdelem elem_to_add) GRPC_MUST_USE_RESULT; -inline grpc_error* GRPC_MUST_USE_RESULT grpc_metadata_batch_add_tail( +inline grpc_error_handle GRPC_MUST_USE_RESULT grpc_metadata_batch_add_tail( grpc_metadata_batch* batch, grpc_linked_mdelem* storage, grpc_metadata_batch_callouts_index idx) { return grpc_metadata_batch_link_tail(batch, storage, idx); } -inline grpc_error* GRPC_MUST_USE_RESULT grpc_metadata_batch_add_tail( +inline grpc_error_handle GRPC_MUST_USE_RESULT grpc_metadata_batch_add_tail( grpc_metadata_batch* batch, grpc_linked_mdelem* storage, grpc_mdelem elem_to_add, grpc_metadata_batch_callouts_index idx) { GPR_DEBUG_ASSERT(!GRPC_MDISNULL(elem_to_add)); @@ -152,10 +166,11 @@ inline grpc_error* GRPC_MUST_USE_RESULT grpc_metadata_batch_add_tail( return grpc_metadata_batch_add_tail(batch, storage, idx); } -grpc_error* grpc_attach_md_to_error(grpc_error* src, grpc_mdelem md); +grpc_error_handle grpc_attach_md_to_error(grpc_error_handle src, + grpc_mdelem md); struct grpc_filtered_mdelem { - grpc_error* error; + grpc_error_handle error; grpc_mdelem md; }; #define GRPC_FILTERED_ERROR(error) \ @@ -167,7 +182,7 @@ struct grpc_filtered_mdelem { typedef grpc_filtered_mdelem (*grpc_metadata_batch_filter_func)( void* user_data, grpc_mdelem elem); -grpc_error* grpc_metadata_batch_filter( +grpc_error_handle grpc_metadata_batch_filter( grpc_metadata_batch* batch, grpc_metadata_batch_filter_func func, void* user_data, const char* composite_error_string) GRPC_MUST_USE_RESULT; diff --git a/grpc/src/core/lib/transport/transport.cc b/grpc/src/core/lib/transport/transport.cc index dccab66d..36060a6b 100644 --- a/grpc/src/core/lib/transport/transport.cc +++ b/grpc/src/core/lib/transport/transport.cc @@ -177,7 +177,7 @@ grpc_endpoint* grpc_transport_get_endpoint(grpc_transport* transport) { // though it lives in lib, it handles transport stream ops sure // it's grpc_transport_stream_op_batch_finish_with_failure void grpc_transport_stream_op_batch_finish_with_failure( - grpc_transport_stream_op_batch* batch, grpc_error* error, + grpc_transport_stream_op_batch* batch, grpc_error_handle error, grpc_core::CallCombiner* call_combiner) { if (batch->send_message) { batch->payload->send_message.send_message.reset(); @@ -219,7 +219,7 @@ struct made_transport_op { } }; -static void destroy_made_transport_op(void* arg, grpc_error* error) { +static void destroy_made_transport_op(void* arg, grpc_error_handle error) { made_transport_op* op = static_cast<made_transport_op*>(arg); grpc_core::ExecCtx::Run(DEBUG_LOCATION, op->inner_on_complete, GRPC_ERROR_REF(error)); @@ -241,7 +241,8 @@ struct made_transport_stream_op { grpc_transport_stream_op_batch op; grpc_transport_stream_op_batch_payload payload; }; -static void destroy_made_transport_stream_op(void* arg, grpc_error* error) { +static void destroy_made_transport_stream_op(void* arg, + grpc_error_handle error) { made_transport_stream_op* op = static_cast<made_transport_stream_op*>(arg); grpc_closure* c = op->inner_on_complete; gpr_free(op); diff --git a/grpc/src/core/lib/transport/transport.h b/grpc/src/core/lib/transport/transport.h index 40760485..7372b389 100644 --- a/grpc/src/core/lib/transport/transport.h +++ b/grpc/src/core/lib/transport/transport.h @@ -319,7 +319,7 @@ struct grpc_transport_stream_op_batch_payload { struct { // Error contract: the transport that gets this op must cause cancel_error // to be unref'ed after processing it - grpc_error* cancel_error = GRPC_ERROR_NONE; + grpc_error_handle cancel_error = GRPC_ERROR_NONE; } cancel_stream; /* Indexes correspond to grpc_context_index enum values */ @@ -339,11 +339,11 @@ typedef struct grpc_transport_op { /** should the transport be disconnected * Error contract: the transport that gets this op must cause * disconnect_with_error to be unref'ed after processing it */ - grpc_error* disconnect_with_error = nullptr; + grpc_error_handle disconnect_with_error = GRPC_ERROR_NONE; /** what should the goaway contain? * Error contract: the transport that gets this op must cause * goaway_error to be unref'ed after processing it */ - grpc_error* goaway_error = nullptr; + grpc_error_handle goaway_error = GRPC_ERROR_NONE; /** set the callback for accepting new streams; this is a permanent callback, unlike the other one-shot closures. If true, the callback is set to set_accept_stream_fn, with its @@ -411,7 +411,7 @@ void grpc_transport_destroy_stream(grpc_transport* transport, grpc_closure* then_schedule_closure); void grpc_transport_stream_op_batch_finish_with_failure( - grpc_transport_stream_op_batch* batch, grpc_error* error, + grpc_transport_stream_op_batch* batch, grpc_error_handle error, grpc_core::CallCombiner* call_combiner); std::string grpc_transport_stream_op_batch_string( diff --git a/grpc/src/core/lib/transport/transport_op_string.cc b/grpc/src/core/lib/transport/transport_op_string.cc index 722a64ec..49dec384 100644 --- a/grpc/src/core/lib/transport/transport_op_string.cc +++ b/grpc/src/core/lib/transport/transport_op_string.cc @@ -109,7 +109,7 @@ std::string grpc_transport_stream_op_batch_string( if (op->cancel_stream) { out.push_back(absl::StrCat( " CANCEL:", - grpc_error_string(op->payload->cancel_stream.cancel_error))); + grpc_error_std_string(op->payload->cancel_stream.cancel_error))); } return absl::StrJoin(out, ""); @@ -131,13 +131,13 @@ std::string grpc_transport_op_string(grpc_transport_op* op) { } if (op->disconnect_with_error != GRPC_ERROR_NONE) { - out.push_back(absl::StrCat(" DISCONNECT:", - grpc_error_string(op->disconnect_with_error))); + out.push_back(absl::StrCat( + " DISCONNECT:", grpc_error_std_string(op->disconnect_with_error))); } if (op->goaway_error) { - out.push_back( - absl::StrCat(" SEND_GOAWAY:%s", grpc_error_string(op->goaway_error))); + out.push_back(absl::StrCat(" SEND_GOAWAY:%s", + grpc_error_std_string(op->goaway_error))); } if (op->set_accept_stream) { diff --git a/grpc/src/core/plugin_registry/grpc_plugin_registry.cc b/grpc/src/core/plugin_registry/grpc_plugin_registry.cc index ae3993af..d3def27e 100644 --- a/grpc/src/core/plugin_registry/grpc_plugin_registry.cc +++ b/grpc/src/core/plugin_registry/grpc_plugin_registry.cc @@ -60,6 +60,10 @@ void grpc_client_authority_filter_init(void); void grpc_client_authority_filter_shutdown(void); void grpc_workaround_cronet_compression_filter_init(void); void grpc_workaround_cronet_compression_filter_shutdown(void); +namespace grpc_core { +void FaultInjectionFilterInit(void); +void FaultInjectionFilterShutdown(void); +} // namespace grpc_core #ifndef GRPC_NO_XDS namespace grpc_core { @@ -82,6 +86,10 @@ void grpc_lb_policy_xds_cluster_manager_init(void); void grpc_lb_policy_xds_cluster_manager_shutdown(void); void grpc_resolver_xds_init(void); void grpc_resolver_xds_shutdown(void); +namespace grpc_core { +void GoogleCloud2ProdResolverInit(); +void GoogleCloud2ProdResolverShutdown(); +} #endif void grpc_register_built_in_plugins(void) { @@ -119,6 +127,8 @@ void grpc_register_built_in_plugins(void) { grpc_max_age_filter_shutdown); grpc_register_plugin(grpc_message_size_filter_init, grpc_message_size_filter_shutdown); + grpc_register_plugin(grpc_core::FaultInjectionFilterInit, + grpc_core::FaultInjectionFilterShutdown); grpc_register_plugin(grpc_service_config_channel_arg_filter_init, grpc_service_config_channel_arg_filter_shutdown); grpc_register_plugin(grpc_client_authority_filter_init, @@ -142,5 +152,7 @@ void grpc_register_built_in_plugins(void) { grpc_lb_policy_xds_cluster_manager_shutdown); grpc_register_plugin(grpc_resolver_xds_init, grpc_resolver_xds_shutdown); + grpc_register_plugin(grpc_core::GoogleCloud2ProdResolverInit, + grpc_core::GoogleCloud2ProdResolverShutdown); #endif } diff --git a/grpc/src/core/plugin_registry/grpc_unsecure_plugin_registry.cc b/grpc/src/core/plugin_registry/grpc_unsecure_plugin_registry.cc index fd9bf9c1..5e745293 100644 --- a/grpc/src/core/plugin_registry/grpc_unsecure_plugin_registry.cc +++ b/grpc/src/core/plugin_registry/grpc_unsecure_plugin_registry.cc @@ -54,6 +54,10 @@ void grpc_max_age_filter_init(void); void grpc_max_age_filter_shutdown(void); void grpc_message_size_filter_init(void); void grpc_message_size_filter_shutdown(void); +namespace grpc_core { +void FaultInjectionFilterInit(void); +void FaultInjectionFilterShutdown(void); +} // namespace grpc_core void grpc_service_config_channel_arg_filter_init(void); void grpc_service_config_channel_arg_filter_shutdown(void); void grpc_client_authority_filter_init(void); @@ -96,6 +100,8 @@ void grpc_register_built_in_plugins(void) { grpc_max_age_filter_shutdown); grpc_register_plugin(grpc_message_size_filter_init, grpc_message_size_filter_shutdown); + grpc_register_plugin(grpc_core::FaultInjectionFilterInit, + grpc_core::FaultInjectionFilterShutdown); grpc_register_plugin(grpc_service_config_channel_arg_filter_init, grpc_service_config_channel_arg_filter_shutdown); grpc_register_plugin(grpc_client_authority_filter_init, diff --git a/grpc/src/core/tsi/alts/crypt/gsec.h b/grpc/src/core/tsi/alts/crypt/gsec.h index 4d65caa9..c330ca69 100644 --- a/grpc/src/core/tsi/alts/crypt/gsec.h +++ b/grpc/src/core/tsi/alts/crypt/gsec.h @@ -21,16 +21,20 @@ #include <grpc/support/port_platform.h> +#include <grpc/event_engine/port.h> + #include <assert.h> #include <stdint.h> #include <stdlib.h> #include <grpc/grpc.h> +#ifndef GRPC_EVENT_ENGINE_POSIX struct iovec { void* iov_base; size_t iov_len; }; +#endif // GRPC_EVENT_ENGINE_POSIX /** * A gsec interface for AEAD encryption schemes. The API is thread-compatible. diff --git a/grpc/src/core/tsi/alts/handshaker/alts_handshaker_client.cc b/grpc/src/core/tsi/alts/handshaker/alts_handshaker_client.cc index 845b23fe..ed70d812 100644 --- a/grpc/src/core/tsi/alts/handshaker/alts_handshaker_client.cc +++ b/grpc/src/core/tsi/alts/handshaker/alts_handshaker_client.cc @@ -69,9 +69,9 @@ typedef struct alts_grpc_handshaker_client { grpc_closure on_handshaker_service_resp_recv; /* Buffers containing information to be sent (or received) to (or from) the * handshaker service. */ - grpc_byte_buffer* send_buffer; - grpc_byte_buffer* recv_buffer; - grpc_status_code status; + grpc_byte_buffer* send_buffer = nullptr; + grpc_byte_buffer* recv_buffer = nullptr; + grpc_status_code status = GRPC_STATUS_OK; /* Initial metadata to be received from handshaker service. */ grpc_metadata_array recv_initial_metadata; /* A callback function provided by an application to be invoked when response @@ -95,15 +95,15 @@ typedef struct alts_grpc_handshaker_client { /** callback for receiving handshake call status */ grpc_closure on_status_received; /** gRPC status code of handshake call */ - grpc_status_code handshake_status_code; + grpc_status_code handshake_status_code = GRPC_STATUS_OK; /** gRPC status details of handshake call */ grpc_slice handshake_status_details; /* mu synchronizes all fields below including their internal fields. */ - gpr_mu mu; + grpc_core::Mutex mu; /* indicates if the handshaker call's RECV_STATUS_ON_CLIENT op is done. */ - bool receive_status_finished; + bool receive_status_finished = false; /* if non-null, contains arguments to complete a TSI next callback. */ - recv_message_result* pending_recv_message_result; + recv_message_result* pending_recv_message_result = nullptr; /* Maximum frame size used by frame protector. */ size_t max_frame_size; } alts_grpc_handshaker_client; @@ -117,10 +117,7 @@ static void handshaker_client_send_buffer_destroy( static bool is_handshake_finished_properly(grpc_gcp_HandshakerResp* resp) { GPR_ASSERT(resp != nullptr); - if (grpc_gcp_HandshakerResp_result(resp)) { - return true; - } - return false; + return grpc_gcp_HandshakerResp_result(resp) != nullptr; } static void alts_grpc_handshaker_client_unref( @@ -140,8 +137,7 @@ static void alts_grpc_handshaker_client_unref( grpc_alts_credentials_options_destroy(client->options); gpr_free(client->buffer); grpc_slice_unref_internal(client->handshake_status_details); - gpr_mu_destroy(&client->mu); - gpr_free(client); + delete client; } } @@ -443,7 +439,7 @@ static tsi_result make_grpc_call(alts_handshaker_client* c, bool is_start) { } } -static void on_status_received(void* arg, grpc_error* error) { +static void on_status_received(void* arg, grpc_error_handle error) { alts_grpc_handshaker_client* client = static_cast<alts_grpc_handshaker_client*>(arg); if (client->handshake_status_code != GRPC_STATUS_OK) { @@ -455,7 +451,7 @@ static void on_status_received(void* arg, grpc_error* error) { "alts_grpc_handshaker_client:%p on_status_received " "status:%d details:|%s| error:|%s|", client, client->handshake_status_code, status_details, - grpc_error_string(error)); + grpc_error_std_string(error).c_str()); gpr_free(status_details); } maybe_complete_tsi_next(client, true /* receive_status_finished */, @@ -646,7 +642,7 @@ static void handshaker_client_shutdown(alts_handshaker_client* c) { } } -static void handshaker_call_unref(void* arg, grpc_error* /* error */) { +static void handshaker_call_unref(void* arg, grpc_error_handle /* error */) { grpc_call* call = static_cast<grpc_call*>(arg); grpc_call_unref(call); } @@ -695,24 +691,24 @@ alts_handshaker_client* alts_grpc_handshaker_client_create( gpr_log(GPR_ERROR, "Invalid arguments to alts_handshaker_client_create()"); return nullptr; } - alts_grpc_handshaker_client* client = - static_cast<alts_grpc_handshaker_client*>(gpr_zalloc(sizeof(*client))); - gpr_mu_init(&client->mu); + alts_grpc_handshaker_client* client = new alts_grpc_handshaker_client(); + memset(&client->base, 0, sizeof(client->base)); + client->base.vtable = + vtable_for_testing == nullptr ? &vtable : vtable_for_testing; gpr_ref_init(&client->refs, 1); - client->grpc_caller = grpc_call_start_batch_and_execute; client->handshaker = handshaker; + client->grpc_caller = grpc_call_start_batch_and_execute; + grpc_metadata_array_init(&client->recv_initial_metadata); client->cb = cb; client->user_data = user_data; - client->send_buffer = nullptr; - client->recv_buffer = nullptr; client->options = grpc_alts_credentials_options_copy(options); client->target_name = grpc_slice_copy(target_name); - client->recv_bytes = grpc_empty_slice(); - grpc_metadata_array_init(&client->recv_initial_metadata); client->is_client = is_client; - client->max_frame_size = max_frame_size; + client->recv_bytes = grpc_empty_slice(); client->buffer_size = TSI_ALTS_INITIAL_BUFFER_SIZE; client->buffer = static_cast<unsigned char*>(gpr_zalloc(client->buffer_size)); + client->handshake_status_details = grpc_empty_slice(); + client->max_frame_size = max_frame_size; grpc_slice slice = grpc_slice_from_copied_string(handshaker_service_url); client->call = strcmp(handshaker_service_url, ALTS_HANDSHAKER_SERVICE_URL_FOR_TESTING) == @@ -722,8 +718,6 @@ alts_handshaker_client* alts_grpc_handshaker_client_create( channel, nullptr, GRPC_PROPAGATE_DEFAULTS, interested_parties, grpc_slice_from_static_string(ALTS_SERVICE_METHOD), &slice, GRPC_MILLIS_INF_FUTURE, nullptr); - client->base.vtable = - vtable_for_testing == nullptr ? &vtable : vtable_for_testing; GRPC_CLOSURE_INIT(&client->on_handshaker_service_resp_recv, grpc_cb, client, grpc_schedule_on_exec_ctx); GRPC_CLOSURE_INIT(&client->on_status_received, on_status_received, client, @@ -844,7 +838,8 @@ void alts_handshaker_client_ref_for_testing(alts_handshaker_client* c) { } void alts_handshaker_client_on_status_received_for_testing( - alts_handshaker_client* c, grpc_status_code status, grpc_error* error) { + alts_handshaker_client* c, grpc_status_code status, + grpc_error_handle error) { // We first make sure that the handshake queue has been initialized // here because there are tests that use this API that mock out // other parts of the alts_handshaker_client in such a way that the diff --git a/grpc/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc b/grpc/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc index 19f41fe6..9cca8ab4 100644 --- a/grpc/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc +++ b/grpc/src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc @@ -48,23 +48,23 @@ struct alts_tsi_handshaker { tsi_handshaker base; grpc_slice target_name; bool is_client; - bool has_sent_start_message; - bool has_created_handshaker_client; + bool has_sent_start_message = false; + bool has_created_handshaker_client = false; char* handshaker_service_url; grpc_pollset_set* interested_parties; grpc_alts_credentials_options* options; - alts_handshaker_client_vtable* client_vtable_for_testing; - grpc_channel* channel; + alts_handshaker_client_vtable* client_vtable_for_testing = nullptr; + grpc_channel* channel = nullptr; bool use_dedicated_cq; // mu synchronizes all fields below. Note these are the // only fields that can be concurrently accessed (due to // potential concurrency of tsi_handshaker_shutdown and // tsi_handshaker_next). - gpr_mu mu; - alts_handshaker_client* client; + grpc_core::Mutex mu; + alts_handshaker_client* client = nullptr; // shutdown effectively follows base.handshake_shutdown, // but is synchronized by the mutex of this object. - bool shutdown; + bool shutdown = false; // Maximum frame size used by frame protector. size_t max_frame_size; }; @@ -372,7 +372,8 @@ tsi_result alts_tsi_handshaker_result_create(grpc_gcp_HandshakerResp* resp, } /* gRPC provided callback used when gRPC thread model is applied. */ -static void on_handshaker_service_resp_recv(void* arg, grpc_error* error) { +static void on_handshaker_service_resp_recv(void* arg, + grpc_error_handle error) { alts_handshaker_client* client = static_cast<alts_handshaker_client*>(arg); if (client == nullptr) { gpr_log(GPR_ERROR, "ALTS handshaker client is nullptr"); @@ -382,7 +383,7 @@ static void on_handshaker_service_resp_recv(void* arg, grpc_error* error) { if (error != GRPC_ERROR_NONE) { gpr_log(GPR_ERROR, "ALTS handshaker on_handshaker_service_resp_recv error: %s", - grpc_error_string(error)); + grpc_error_std_string(error).c_str()); success = false; } alts_handshaker_client_handle_response(client, success); @@ -390,8 +391,8 @@ static void on_handshaker_service_resp_recv(void* arg, grpc_error* error) { /* gRPC provided callback used when dedicatd CQ and thread are used. * It serves to safely bring the control back to application. */ -static void on_handshaker_service_resp_recv_dedicated(void* arg, - grpc_error* /*error*/) { +static void on_handshaker_service_resp_recv_dedicated( + void* arg, grpc_error_handle /*error*/) { alts_shared_resource_dedicated* resource = grpc_alts_get_shared_resource_dedicated(); grpc_cq_end_op( @@ -480,8 +481,8 @@ struct alts_tsi_handshaker_continue_handshaker_next_args { grpc_closure closure; }; -static void alts_tsi_handshaker_create_channel(void* arg, - grpc_error* /* unused_error */) { +static void alts_tsi_handshaker_create_channel( + void* arg, grpc_error_handle /* unused_error */) { alts_tsi_handshaker_continue_handshaker_next_args* next_args = static_cast<alts_tsi_handshaker_continue_handshaker_next_args*>(arg); alts_tsi_handshaker* handshaker = next_args->handshaker; @@ -592,8 +593,7 @@ static void handshaker_destroy(tsi_handshaker* self) { grpc_channel_destroy_internal(handshaker->channel); } gpr_free(handshaker->handshaker_service_url); - gpr_mu_destroy(&handshaker->mu); - gpr_free(handshaker); + delete handshaker; } static const tsi_handshaker_vtable handshaker_vtable = { @@ -628,26 +628,22 @@ tsi_result alts_tsi_handshaker_create( gpr_log(GPR_ERROR, "Invalid arguments to alts_tsi_handshaker_create()"); return TSI_INVALID_ARGUMENT; } - alts_tsi_handshaker* handshaker = - static_cast<alts_tsi_handshaker*>(gpr_zalloc(sizeof(*handshaker))); - gpr_mu_init(&handshaker->mu); - handshaker->use_dedicated_cq = interested_parties == nullptr; - handshaker->client = nullptr; - handshaker->is_client = is_client; - handshaker->has_sent_start_message = false; + bool use_dedicated_cq = interested_parties == nullptr; + alts_tsi_handshaker* handshaker = new alts_tsi_handshaker(); + memset(&handshaker->base, 0, sizeof(handshaker->base)); + handshaker->base.vtable = + use_dedicated_cq ? &handshaker_vtable_dedicated : &handshaker_vtable; handshaker->target_name = target_name == nullptr ? grpc_empty_slice() : grpc_slice_from_static_string(target_name); - handshaker->interested_parties = interested_parties; - handshaker->has_created_handshaker_client = false; + handshaker->is_client = is_client; handshaker->handshaker_service_url = gpr_strdup(handshaker_service_url); + handshaker->interested_parties = interested_parties; handshaker->options = grpc_alts_credentials_options_copy(options); + handshaker->use_dedicated_cq = use_dedicated_cq; handshaker->max_frame_size = user_specified_max_frame_size != 0 ? user_specified_max_frame_size : kTsiAltsMaxFrameSize; - handshaker->base.vtable = handshaker->use_dedicated_cq - ? &handshaker_vtable_dedicated - : &handshaker_vtable; *self = &handshaker->base; return TSI_OK; } diff --git a/grpc/src/core/tsi/alts/handshaker/alts_tsi_handshaker.h b/grpc/src/core/tsi/alts/handshaker/alts_tsi_handshaker.h index e1ae985a..1c3605af 100644 --- a/grpc/src/core/tsi/alts/handshaker/alts_tsi_handshaker.h +++ b/grpc/src/core/tsi/alts/handshaker/alts_tsi_handshaker.h @@ -41,7 +41,7 @@ const size_t kTsiAltsNumOfPeerProperties = 5; // Frame size negotiation extends send frame size range to // [kTsiAltsMinFrameSize, kTsiAltsMaxFrameSize]. const size_t kTsiAltsMinFrameSize = 16 * 1024; -const size_t kTsiAltsMaxFrameSize = 128 * 1024; +const size_t kTsiAltsMaxFrameSize = 1024 * 1024; typedef struct alts_tsi_handshaker alts_tsi_handshaker; diff --git a/grpc/src/core/tsi/alts/handshaker/alts_tsi_handshaker_private.h b/grpc/src/core/tsi/alts/handshaker/alts_tsi_handshaker_private.h index cb99fdcc..d5ab14dc 100644 --- a/grpc/src/core/tsi/alts/handshaker/alts_tsi_handshaker_private.h +++ b/grpc/src/core/tsi/alts/handshaker/alts_tsi_handshaker_private.h @@ -78,7 +78,8 @@ grpc_closure* alts_handshaker_client_get_closure_for_testing( alts_handshaker_client* client); void alts_handshaker_client_on_status_received_for_testing( - alts_handshaker_client* client, grpc_status_code status, grpc_error* error); + alts_handshaker_client* client, grpc_status_code status, + grpc_error_handle error); void alts_handshaker_client_ref_for_testing(alts_handshaker_client* c); diff --git a/grpc/src/core/tsi/alts/handshaker/transport_security_common_api.cc b/grpc/src/core/tsi/alts/handshaker/transport_security_common_api.cc index a0462b2d..402bf131 100644 --- a/grpc/src/core/tsi/alts/handshaker/transport_security_common_api.cc +++ b/grpc/src/core/tsi/alts/handshaker/transport_security_common_api.cc @@ -214,9 +214,7 @@ bool grpc_gcp_rpc_protocol_versions_check( ? &local_versions->min_rpc_version : &peer_versions->min_rpc_version; bool result = grpc_core::internal::grpc_gcp_rpc_protocol_version_compare( - max_common_version, min_common_version) >= 0 - ? true - : false; + max_common_version, min_common_version) >= 0; if (result && highest_common_version != nullptr) { memcpy(highest_common_version, max_common_version, sizeof(grpc_gcp_rpc_protocol_versions_version)); diff --git a/grpc/src/core/tsi/fake_transport_security.cc b/grpc/src/core/tsi/fake_transport_security.cc index 0b256a1f..5e63f11a 100644 --- a/grpc/src/core/tsi/fake_transport_security.cc +++ b/grpc/src/core/tsi/fake_transport_security.cc @@ -474,12 +474,21 @@ static void fake_zero_copy_grpc_protector_destroy( gpr_free(impl); } +static tsi_result fake_zero_copy_grpc_protector_max_frame_size( + tsi_zero_copy_grpc_protector* self, size_t* max_frame_size) { + if (self == nullptr || max_frame_size == nullptr) return TSI_INVALID_ARGUMENT; + tsi_fake_zero_copy_grpc_protector* impl = + reinterpret_cast<tsi_fake_zero_copy_grpc_protector*>(self); + *max_frame_size = impl->max_frame_size; + return TSI_OK; +} + static const tsi_zero_copy_grpc_protector_vtable zero_copy_grpc_protector_vtable = { fake_zero_copy_grpc_protector_protect, fake_zero_copy_grpc_protector_unprotect, fake_zero_copy_grpc_protector_destroy, - nullptr /* fake_zero_copy_grpc_protector_max_frame_size */ + fake_zero_copy_grpc_protector_max_frame_size, }; /* --- tsi_handshaker_result methods implementation. ---*/ @@ -490,7 +499,7 @@ struct fake_handshaker_result { size_t unused_bytes_size; }; static tsi_result fake_handshaker_result_extract_peer( - const tsi_handshaker_result* self, tsi_peer* peer) { + const tsi_handshaker_result* /*self*/, tsi_peer* peer) { /* Construct a tsi_peer with 1 property: certificate type, security_level. */ tsi_result result = tsi_construct_peer(2, peer); if (result != TSI_OK) return result; diff --git a/grpc/src/core/tsi/ssl/session_cache/ssl_session.h b/grpc/src/core/tsi/ssl/session_cache/ssl_session.h index 69a91add..108c0cd1 100644 --- a/grpc/src/core/tsi/ssl/session_cache/ssl_session.h +++ b/grpc/src/core/tsi/ssl/session_cache/ssl_session.h @@ -23,12 +23,9 @@ #include <grpc/slice.h> -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wmodule-import-in-extern-c" extern "C" { #include <openssl/ssl.h> } -#pragma clang diagnostic pop #include "src/core/lib/gprpp/ref_counted.h" diff --git a/grpc/src/core/tsi/ssl/session_cache/ssl_session_cache.cc b/grpc/src/core/tsi/ssl/session_cache/ssl_session_cache.cc index 6da4fb4e..9254dcee 100644 --- a/grpc/src/core/tsi/ssl/session_cache/ssl_session_cache.cc +++ b/grpc/src/core/tsi/ssl/session_cache/ssl_session_cache.cc @@ -84,7 +84,6 @@ class SslSessionLRUCache::Node { SslSessionLRUCache::SslSessionLRUCache(size_t capacity) : capacity_(capacity) { GPR_ASSERT(capacity > 0); - gpr_mu_init(&lock_); entry_by_key_ = grpc_avl_create(&cache_avl_vtable); } @@ -96,7 +95,6 @@ SslSessionLRUCache::~SslSessionLRUCache() { node = next; } grpc_avl_unref(entry_by_key_, nullptr); - gpr_mu_destroy(&lock_); } size_t SslSessionLRUCache::Size() { diff --git a/grpc/src/core/tsi/ssl/session_cache/ssl_session_cache.h b/grpc/src/core/tsi/ssl/session_cache/ssl_session_cache.h index fcdc8b67..0aa3f169 100644 --- a/grpc/src/core/tsi/ssl/session_cache/ssl_session_cache.h +++ b/grpc/src/core/tsi/ssl/session_cache/ssl_session_cache.h @@ -24,16 +24,14 @@ #include <grpc/slice.h> #include <grpc/support/sync.h> -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wmodule-import-in-extern-c" extern "C" { #include <openssl/ssl.h> } -#pragma clang diagnostic pop #include "src/core/lib/avl/avl.h" #include "src/core/lib/gprpp/memory.h" #include "src/core/lib/gprpp/ref_counted.h" +#include "src/core/lib/gprpp/sync.h" #include "src/core/tsi/ssl/session_cache/ssl_session.h" /// Cache for SSL sessions for sessions resumption. @@ -79,7 +77,7 @@ class SslSessionLRUCache : public grpc_core::RefCounted<SslSessionLRUCache> { void PushFront(Node* node); void AssertInvariants(); - gpr_mu lock_; + grpc_core::Mutex lock_; size_t capacity_; Node* use_order_list_head_ = nullptr; diff --git a/grpc/src/core/tsi/ssl_transport_security.cc b/grpc/src/core/tsi/ssl_transport_security.cc index 7f8749ce..4241b6f6 100644 --- a/grpc/src/core/tsi/ssl_transport_security.cc +++ b/grpc/src/core/tsi/ssl_transport_security.cc @@ -45,8 +45,6 @@ #include "absl/strings/match.h" #include "absl/strings/string_view.h" -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wmodule-import-in-extern-c" extern "C" { #include <openssl/bio.h> #include <openssl/crypto.h> /* For OPENSSL_free */ @@ -57,7 +55,6 @@ extern "C" { #include <openssl/x509.h> #include <openssl/x509v3.h> } -#pragma clang diagnostic pop #include "src/core/lib/gpr/useful.h" #include "src/core/tsi/ssl/session_cache/ssl_session_cache.h" @@ -360,13 +357,17 @@ static tsi_result add_subject_alt_names_properties_to_peer( subject_alt_name->type == GEN_URI) { unsigned char* name = nullptr; int name_size; + std::string property_name; if (subject_alt_name->type == GEN_DNS) { name_size = ASN1_STRING_to_UTF8(&name, subject_alt_name->d.dNSName); + property_name = TSI_X509_DNS_PEER_PROPERTY; } else if (subject_alt_name->type == GEN_EMAIL) { name_size = ASN1_STRING_to_UTF8(&name, subject_alt_name->d.rfc822Name); + property_name = TSI_X509_EMAIL_PEER_PROPERTY; } else { name_size = ASN1_STRING_to_UTF8( &name, subject_alt_name->d.uniformResourceIdentifier); + property_name = TSI_X509_URI_PEER_PROPERTY; } if (name_size < 0) { gpr_log(GPR_ERROR, "Could not get utf8 from asn1 string."); @@ -381,12 +382,10 @@ static tsi_result add_subject_alt_names_properties_to_peer( OPENSSL_free(name); break; } - if (subject_alt_name->type == GEN_URI) { - result = tsi_construct_string_peer_property( - TSI_X509_URI_PEER_PROPERTY, reinterpret_cast<const char*>(name), - static_cast<size_t>(name_size), - &peer->properties[(*current_insert_index)++]); - } + result = tsi_construct_string_peer_property( + property_name.c_str(), reinterpret_cast<const char*>(name), + static_cast<size_t>(name_size), + &peer->properties[(*current_insert_index)++]); OPENSSL_free(name); } else if (subject_alt_name->type == GEN_IPADD) { char ntop_buf[INET6_ADDRSTRLEN]; @@ -412,6 +411,10 @@ static tsi_result add_subject_alt_names_properties_to_peer( result = tsi_construct_string_peer_property_from_cstring( TSI_X509_SUBJECT_ALTERNATIVE_NAME_PEER_PROPERTY, name, &peer->properties[(*current_insert_index)++]); + if (result != TSI_OK) break; + result = tsi_construct_string_peer_property_from_cstring( + TSI_X509_IP_PEER_PROPERTY, name, + &peer->properties[(*current_insert_index)++]); } else { result = tsi_construct_string_peer_property_from_cstring( TSI_X509_SUBJECT_ALTERNATIVE_NAME_PEER_PROPERTY, "other types of SAN", @@ -441,7 +444,14 @@ static tsi_result peer_from_x509(X509* cert, int include_certificate_type, for (int i = 0; i < subject_alt_name_count; i++) { GENERAL_NAME* subject_alt_name = sk_GENERAL_NAME_value(subject_alt_names, TSI_SIZE_AS_SIZE(i)); - if (subject_alt_name->type == GEN_URI) { + // TODO(zhenlian): Clean up tsi_peer to avoid duplicate entries. + // URI, DNS, email and ip address SAN fields are plumbed to tsi_peer, in + // addition to all SAN fields (results in duplicate values). This code + // snippet updates property_count accordingly. + if (subject_alt_name->type == GEN_URI || + subject_alt_name->type == GEN_DNS || + subject_alt_name->type == GEN_EMAIL || + subject_alt_name->type == GEN_IPADD) { property_count += 1; } } @@ -1914,14 +1924,16 @@ tsi_result tsi_create_ssl_client_handshaker_factory_with_options( #else ssl_context = SSL_CTX_new(TLSv1_2_method()); #endif - result = tsi_set_min_and_max_tls_versions( - ssl_context, options->min_tls_version, options->max_tls_version); - if (result != TSI_OK) return result; if (ssl_context == nullptr) { + log_ssl_error_stack(); gpr_log(GPR_ERROR, "Could not create ssl context."); return TSI_INVALID_ARGUMENT; } + result = tsi_set_min_and_max_tls_versions( + ssl_context, options->min_tls_version, options->max_tls_version); + if (result != TSI_OK) return result; + impl = static_cast<tsi_ssl_client_handshaker_factory*>( gpr_zalloc(sizeof(*impl))); tsi_ssl_handshaker_factory_init(&impl->base); @@ -2081,15 +2093,18 @@ tsi_result tsi_create_ssl_server_handshaker_factory_with_options( #else impl->ssl_contexts[i] = SSL_CTX_new(TLSv1_2_method()); #endif - result = tsi_set_min_and_max_tls_versions(impl->ssl_contexts[i], - options->min_tls_version, - options->max_tls_version); - if (result != TSI_OK) return result; if (impl->ssl_contexts[i] == nullptr) { + log_ssl_error_stack(); gpr_log(GPR_ERROR, "Could not create ssl context."); result = TSI_OUT_OF_RESOURCES; break; } + + result = tsi_set_min_and_max_tls_versions(impl->ssl_contexts[i], + options->min_tls_version, + options->max_tls_version); + if (result != TSI_OK) return result; + result = populate_ssl_context(impl->ssl_contexts[i], &options->pem_key_cert_pairs[i], options->cipher_suites); diff --git a/grpc/src/core/tsi/ssl_transport_security.h b/grpc/src/core/tsi/ssl_transport_security.h index f25e067c..c3d30a88 100644 --- a/grpc/src/core/tsi/ssl_transport_security.h +++ b/grpc/src/core/tsi/ssl_transport_security.h @@ -25,12 +25,9 @@ #include "absl/strings/string_view.h" #include "src/core/tsi/transport_security_interface.h" -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wmodule-import-in-extern-c" extern "C" { #include <openssl/x509.h> } -#pragma clang diagnostic pop /* Value for the TSI_CERTIFICATE_TYPE_PEER_PROPERTY property for X509 certs. */ #define TSI_X509_CERTIFICATE_TYPE "X509" @@ -40,14 +37,13 @@ extern "C" { #define TSI_X509_SUBJECT_ALTERNATIVE_NAME_PEER_PROPERTY \ "x509_subject_alternative_name" #define TSI_SSL_SESSION_REUSED_PEER_PROPERTY "ssl_session_reused" - #define TSI_X509_PEM_CERT_PROPERTY "x509_pem_cert" - #define TSI_X509_PEM_CERT_CHAIN_PROPERTY "x509_pem_cert_chain" - #define TSI_SSL_ALPN_SELECTED_PROTOCOL "ssl_alpn_selected_protocol" - +#define TSI_X509_DNS_PEER_PROPERTY "x509_dns" #define TSI_X509_URI_PEER_PROPERTY "x509_uri" +#define TSI_X509_EMAIL_PEER_PROPERTY "x509_email" +#define TSI_X509_IP_PEER_PROPERTY "x509_ip" /* --- tsi_ssl_root_certs_store object --- diff --git a/grpc/src/core/tsi/test_creds/multi-domain-openssl.cnf b/grpc/src/core/tsi/test_creds/multi-domain-openssl.cnf index 265950f5..33ecc9d9 100644 --- a/grpc/src/core/tsi/test_creds/multi-domain-openssl.cnf +++ b/grpc/src/core/tsi/test_creds/multi-domain-openssl.cnf @@ -28,3 +28,6 @@ URI.2 = https://bar.test.domain.com/test URI.3 = spiffe://foo.com/bar/baz email.1 = foo@test.domain.com email.2 = bar@test.domain.com +IP.1 = 192.168.7.1 +IP.2 = 13::17 +RID.1 = 1.2.3.4 diff --git a/grpc/src/core/tsi/test_creds/multi-domain.key b/grpc/src/core/tsi/test_creds/multi-domain.key index b5789e92..2b9cce0b 100644 --- a/grpc/src/core/tsi/test_creds/multi-domain.key +++ b/grpc/src/core/tsi/test_creds/multi-domain.key @@ -1,28 +1,28 @@ -----BEGIN PRIVATE KEY----- -MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCuGVBYD3P/D2eT -nhBhZ0izP+nuozNCEO/iQu/kyy6ZCzIEFvykt0aPzJVLcsCHCaWcNJVFPSqVDVRm -9S5ZHUyLlnSl53mKUltZI4tDDVMcEdr7KpfXeBc86lm/93DqFDgAYDkvebekRr/8 -B1OJhVJRGowXjAU9sYABzuUqjkra522BleIik3m+7DborGHS4Io5X/8D8VjlXjeB -Vht6QA8ij5JVfHvO6DsZr99EITPpha6i182O6S6lO2t1V+bdWP+EPjiOQJktrmvM -QYTFjmjYkRKLCZI1xxSfCK8t7ia5sLPFOF6uDH91ck8mXmuHs96nSOyB1i/LdBy9 -XdInSRGXAgMBAAECggEAWoqZqSJoPfah9DhY5n8TZP1RSKUhTDOIvc/3+LHeSwNy -gIP/4h3amYBZCELmc5QFx8Xk93xG//tNsLnD396H53RYt8s4/0GzdhkxHK76UPfM -PaE6FHnFBA4QnPAvjdzz/uYL92/CnLGauJSK0lM+qyU2RCyysRH1s3sI3Wfg8BRd -C9Xik+YzYirhCEGlYKju2D2As/tB2L0b/PRpM9FWeqd/YGCj8pUpceNrbvU8udc7 -4xQS6ssgMI2H1xGc50kJVDjoZix5OLiTaHDO4oRBZT+QdPTtfkam0/y2yZ9oX6UN -Byl+ybtUpxsmsvl+I7bb/fZsILrXE3GHXtcsCMi5iQKBgQDmKi1HfmQo6KeDSnjp -R+yIMc77QpZpLuzjPlKWGxY915KlL77GOUYR2cm0rPP9CPGN2Nj5IyuR32u6uHtI -WKewR7cn69prxZI3VSNFQmsatWKBoR7dwyJ4j93cN54naEuBLA1BJQ0uXgYJtgwT -x5KP97LcudpoDNVsh+FUopon8wKBgQDBpBMeDoc+7YVLnlx4FRJudzVfWWb4bPCL -2cusycOVAlN2E0VsrD2vbVWoinpVPIeOfGgD0RZZLtVQL5Ui8mZcANmuoRXtEqaS -sQ6VxkdC62uDXgrsi+i/0nsxvACmfde4sxALu3DZ7rjNlWUW7amJt34CsDBMlVeL -eDAmD0WczQKBgQCHzSLiKATYzkzn/izRF4rL4PeK8ILmlLVYbxEzV9ALtQHlTQJ2 -2pwpNCL644EiLwC2/NcoSEQQ0Y4yoV68FPL745SBjXtWU0AuPaGN395p59OzQGmB -1vyjvd7dbEN4ZOUH1gIMCdx5Gyjc2fjOQtaK808pRM9EzS2v14xv73CdWQKBgC/8 -qiQrs4Z7tCm+L+ouRqgLcLWVYTg1PxNZQOksAwT9U5OSSQUaVhsQPEcNMi3HV0yP -NfOkMCafvYsmj43ehlFMgKWPE/DxS0hVCmlBfs1tq/IdLxXZwi8vSQpVLdAUpY4H -CfXuWJQZXcDMwgWBlh8j0t11rjJ8W/qbKUt1Q2oNAoGBALdy/RpspFttVvthzFbg -FLHUAwUhEsK1VSi26AYy4L0ZHw/KLnbIGEzKCEFWqn6nfWOlb9Rw5C7QlGx/1UCC -Tnn9KnZoziK4JDQw6SEl/3hNQ5+FYI8y7QGsqAm1W9dobbgl0a1IfmbtBeEOZt+e -7oFnqaxVruVmNr56M9IMCwA1 +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDAg51YU8NkgC7w +Hx7Jf9Zj+wjHcLxedY6czsFjhl9wUlYRkQ+wdt3suH998TrbdVMc38tpI460pGk7 +gGBpMkbZgo1YNnwz/U1jAOR11EVGHN1QDy3H0BI2E5RYtl/vTWQLFo1khIaKK4eS +3ptrPd+1XB6L25E4ISOVgd3yn4b5eTMGRbEei+wrkZIyZAVgCIw8d6BHHwldWz3A +ljKRErMPzKtnyVL+ctp0Kx6ObppiBPPOWhNNTtMkmLgfeZQK3U7cPN5WI13Fso05 +FA3wVo/w6sXTtz4inIT14Y57E34V6sWZezrBbTtAI0yN3DqXSKTBgGjOQUbjqVxS +i/JzRbZpAgMBAAECggEAXJMt59qn3D1T1P5yFJ2X4A5Io3eP7bCEOt2l25EzddTy +NJJYRBh1Ea+LB2ooTn410G3B6DZEGpPxUr6iHhQiQ9hm1eOliG6ndxNnyU2hXlzl +A+m4rxxclYqGzL4ulenWUQqwRYUBGZJjKHpJrKFdYV4CBmk4hRBSh0OjElgqVO5g +nliMl3fC+GgUXtdMDGoPnC6MwD8q0RSJxbzpd8r+yREgX6KveEfPTfgSLAUieJrf +2qqEk0Prdrwzsu0iyDYCaWLOq0cUstnHCo3e5synV4VzAFnaqxMT7lCVuUHgFpHj +62rTwBCG/n3s+IVAp9CGBe37+SiJPRE8t5PDr65F3QKBgQDovkKLWzXxVJauTF/E +tFRA+HqNDzYC3yiN0MIBmcF7IntdwCHznMyqydkaSE6WYn+NKglbH3c4RD5Hmdxc +PUta8wgpmTg264568Svgna5jhwoqStrzh7qeBPXHmJvK4MkWALH4ukr3hIsWzsAh +881ebstQDke8uHzyNZBY/URebwKBgQDTwEP6hgcgDOaf9yzipeMhtsArIm7zXn+r +1RknpKUA8wM6fpEMpdUTgReu9tdJDgrcKac6imSZoNM6DBoOb/Hdj6FourHiTTvE +dXAOjAzkDz/c86HFuDNoz27usoMPu/3iJPwuLQSO0IlflccLuOirhnnY8yVxIuy2 ++9g+2iOkpwKBgE/Kin3EM2YdHdt7i4mgWRI9HaamhFnPr9OOsjRiRha0555odDtU +kkYrFScRiv+7nQcEVljLHNBJdSCO+yEUUnVHxJCeWstZTmuPqv9Cj7rHXRDKwO2k +prHt+WUISMDw9393lYw0MedRpW2YS/5X2xx413MGsklc5lkTS/12Nq45AoGAaVCf +vrL4Sj2AWqEhxtwAmlz9OLbYfdxLHVhQOYJOuqkiuu4GEEdOMXQsJk4IhwIf7p4c +2SXJoQr241DviKyum6Z6/c6U+Fu3VR+fiuym4Kqg9bCKjf7uOruojbllK+cw/0+r +yP+E287l9A9XPwJJXj30zi0oOxvGpb+eLqxpu9MCgYEAxIgVhzyfRvoAdNYk7FE7 +JDig38EGC4m9grh/9G0tMvWT/E+F1Hb5V9NDK/iWA25dD3hOASxza1Hqkt1dP5on +FMZrmP2T9Ov0wgfVuRIf8/c3YyiS1wJXb3wROVaJJDSvE5c2UszR5pfqvNE5C1YV +zpc3ITQSAX66LK6ImkHb9Jw= -----END PRIVATE KEY----- diff --git a/grpc/src/core/tsi/test_creds/multi-domain.pem b/grpc/src/core/tsi/test_creds/multi-domain.pem index d4ff936f..727b8ff4 100644 --- a/grpc/src/core/tsi/test_creds/multi-domain.pem +++ b/grpc/src/core/tsi/test_creds/multi-domain.pem @@ -1,24 +1,24 @@ -----BEGIN CERTIFICATE----- -MIID/jCCAuagAwIBAgIUV2eOzlQQj1U+++TDdNyRHjRNamQwDQYJKoZIhvcNAQEL +MIIEGzCCAwOgAwIBAgIUVwCmP2zKfeoWdaMbn32PjFgpdRswDQYJKoZIhvcNAQEL BQAwSjELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQswCQYDVQQHDAJTRjEPMA0G -A1UECwwGR29vZ2xlMRAwDgYDVQQDDAd4cGlnb3JzMB4XDTIwMDYwNzIyNTk1MFoX -DTMwMDYwNTIyNTk1MFowSjELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQswCQYD +A1UECwwGR29vZ2xlMRAwDgYDVQQDDAd4cGlnb3JzMB4XDTIxMDQwOTE5MzgxOVoX +DTMxMDQwNzE5MzgxOVowSjELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMQswCQYD VQQHDAJTRjEPMA0GA1UECwwGR29vZ2xlMRAwDgYDVQQDDAd4cGlnb3JzMIIBIjAN -BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArhlQWA9z/w9nk54QYWdIsz/p7qMz -QhDv4kLv5MsumQsyBBb8pLdGj8yVS3LAhwmlnDSVRT0qlQ1UZvUuWR1Mi5Z0ped5 -ilJbWSOLQw1THBHa+yqX13gXPOpZv/dw6hQ4AGA5L3m3pEa//AdTiYVSURqMF4wF -PbGAAc7lKo5K2udtgZXiIpN5vuw26Kxh0uCKOV//A/FY5V43gVYbekAPIo+SVXx7 -zug7Ga/fRCEz6YWuotfNjukupTtrdVfm3Vj/hD44jkCZLa5rzEGExY5o2JESiwmS -NccUnwivLe4mubCzxThergx/dXJPJl5rh7Pep0jsgdYvy3QcvV3SJ0kRlwIDAQAB -o4HbMIHYMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMIG9BgNVHREEgbUwgbKCE2Zv +BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwIOdWFPDZIAu8B8eyX/WY/sIx3C8 +XnWOnM7BY4ZfcFJWEZEPsHbd7Lh/ffE623VTHN/LaSOOtKRpO4BgaTJG2YKNWDZ8 +M/1NYwDkddRFRhzdUA8tx9ASNhOUWLZf701kCxaNZISGiiuHkt6baz3ftVwei9uR +OCEjlYHd8p+G+XkzBkWxHovsK5GSMmQFYAiMPHegRx8JXVs9wJYykRKzD8yrZ8lS +/nLadCsejm6aYgTzzloTTU7TJJi4H3mUCt1O3DzeViNdxbKNORQN8FaP8OrF07c+ +IpyE9eGOexN+FerFmXs6wW07QCNMjdw6l0ikwYBozkFG46lcUovyc0W2aQIDAQAB +o4H4MIH1MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMIHaBgNVHREEgdIwgc+CE2Zv by50ZXN0LmRvbWFpbi5jb22CE2Jhci50ZXN0LmRvbWFpbi5jb22GIGh0dHBzOi8v Zm9vLnRlc3QuZG9tYWluLmNvbS90ZXN0hiBodHRwczovL2Jhci50ZXN0LmRvbWFp bi5jb20vdGVzdIYYc3BpZmZlOi8vZm9vLmNvbS9iYXIvYmF6gRNmb29AdGVzdC5k -b21haW4uY29tgRNiYXJAdGVzdC5kb21haW4uY29tMA0GCSqGSIb3DQEBCwUAA4IB -AQBlLNl/uXN01VARQFd5CNFMhwez879uB5N3s/pGBjzE8Z+NA9YjsBFkBSQlebFM -5UP304rsvG2opHwcSkblG9a3TbpQVNaYjcHgudip3FqLTJ3NhYtx1A3uCBp4ABeP -+AVlCcsNVysGwGvMzXlN++Y++U0A9BbfrP85VBslLaKn4rYpfB5pAdzu277ICdEy -nyFZ+jo2OS1lbv7kE7IW6slCXbCFaxPIKvjPbpGFngsLt44sZ9VvSJCeKhDglMfn -HKkhd4/UMnRn+8tZZ6eH/C5tpeKAChMUF+bkuwk3dBwnHq484KbBAKd2cwzZhTB7 -8unku1S1GumvoEYAgbG1P4gC +b21haW4uY29tgRNiYXJAdGVzdC5kb21haW4uY29thwTAqAcBhxAAEwAAAAAAAAAA +AAAAAAAXiAMqAwQwDQYJKoZIhvcNAQELBQADggEBAIHzi/MWANQDYqpNDGVA6HGg +vYPnwxjLXL/8apVf1ZMHzS/R6Eudu8ugppnnEL7Cjsd4oA0r/sJLjBvhaZtf0r4S +GguWdmai2RR1ghwkCLPF/HlCqiBKwUfWrjTxq8GOwwodhW7lk4hLPzhFRzh/I93g +uN5/ugPKcloWQ7X/0okMdkdPmk8uLpMckXNKj13Lupl/0BgDggghVXRTA2t0ujhx +TvRWfYi5H1eJtNcj824PaIDifPiSOpzeXZi+na2XzzVmCz5n/e2H4nlTMVcN6YGG +M3U3uJqjjjpKkCrrdNAJJpqqJpln4P6fVvO2ND1QmyE5YIKV3tZ8p38AJOheUcw= -----END CERTIFICATE----- |